fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-07 17:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert case-insensitive ParamServer

Browse Source
This commit is contained in:
Pavel Kirienko
2015-03-21 13:40:08 +03:00
parent 8bab5c0f5d
commit 23dd75f1b0
3 changed files with 3 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/protocol/param_server.cpp
+2 -67
View File
@@ -91,7 +91,7 @@ TEST(ParamServer, Basic)
{
InterlinkedTestNodesWithSysClock nodes;
uavcan::ParamServer server(nodes.a, uavcan::ParamServer::ParamNameCaseConversionToLower);
uavcan::ParamServer server(nodes.a);
ParamServerTestManager mgr;
@@ -145,7 +145,7 @@ TEST(ParamServer, Basic)
// Get by name
get_set_rq = uavcan::protocol::param::GetSet::Request();
get_set_rq.name = "FOOBAR"; // Requesting in upper case
get_set_rq.name = "foobar";
doCall(get_set_cln, get_set_rq, nodes);
ASSERT_STREQ("foobar", get_set_cln.collector.result->response.name.c_str());
ASSERT_TRUE(get_set_cln.collector.result->response.value.value_bool.empty());
@@ -171,68 +171,3 @@ TEST(ParamServer, Basic)
ASSERT_STREQ("foobar", get_set_cln.collector.result->response.name.c_str());
ASSERT_FLOAT_EQ(424242, get_set_cln.collector.result->response.value.value_float[0]);
}
TEST(ParamServer, UpperCaseConversion)
{
InterlinkedTestNodesWithSysClock nodes;
uavcan::ParamServer server(nodes.a, uavcan::ParamServer::ParamNameCaseConversionToUpper);
ParamServerTestManager mgr;
uavcan::GlobalDataTypeRegistry::instance().reset();
uavcan::DefaultDataTypeRegistrator<uavcan::protocol::param::GetSet> _reg1;
uavcan::DefaultDataTypeRegistrator<uavcan::protocol::param::ExecuteOpcode> _reg2;
ASSERT_LE(0, server.start(&mgr));
ServiceClientWithCollector<uavcan::protocol::param::GetSet> get_set_cln(nodes.b);
mgr.kv["foobar"] = 0.0; // Will be ignored because not upper case
mgr.kv["FOOBAR"] = 123.456;
/*
* Get/set
*/
uavcan::protocol::param::GetSet::Request get_set_rq;
get_set_rq = uavcan::protocol::param::GetSet::Request();
get_set_rq.name = "foobar"; // Requesting in upper case
doCall(get_set_cln, get_set_rq, nodes);
ASSERT_STREQ("FOOBAR", get_set_cln.collector.result->response.name.c_str());
ASSERT_TRUE(get_set_cln.collector.result->response.value.value_bool.empty());
ASSERT_TRUE(get_set_cln.collector.result->response.value.value_int.empty());
ASSERT_FLOAT_EQ(123.456F, get_set_cln.collector.result->response.value.value_float[0]);
}
TEST(ParamServer, NoCaseConversion)
{
InterlinkedTestNodesWithSysClock nodes;
uavcan::ParamServer server(nodes.a);
ParamServerTestManager mgr;
uavcan::GlobalDataTypeRegistry::instance().reset();
uavcan::DefaultDataTypeRegistrator<uavcan::protocol::param::GetSet> _reg1;
uavcan::DefaultDataTypeRegistrator<uavcan::protocol::param::ExecuteOpcode> _reg2;
ASSERT_LE(0, server.start(&mgr));
ServiceClientWithCollector<uavcan::protocol::param::GetSet> get_set_cln(nodes.b);
mgr.kv["foobar"] = 0.0;
mgr.kv["FooBar"] = 123.456;
mgr.kv["FOOBAR"] = 0.0;
/*
* Get/set
*/
uavcan::protocol::param::GetSet::Request get_set_rq;
get_set_rq = uavcan::protocol::param::GetSet::Request();
get_set_rq.name = "FooBar";
doCall(get_set_cln, get_set_rq, nodes);
ASSERT_STREQ("FooBar", get_set_cln.collector.result->response.name.c_str());
ASSERT_TRUE(get_set_cln.collector.result->response.value.value_bool.empty());
ASSERT_TRUE(get_set_cln.collector.result->response.value.value_int.empty());
ASSERT_FLOAT_EQ(123.456F, get_set_cln.collector.result->response.value.value_float[0]);
}