fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 02:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Uncrustified tests

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-25 22:49:31 +04:00
parent 57de608bf0
commit d1278b5ed3
28 changed files with 185 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/node/global_data_type_registry.cpp
+6 -3
View File
@@ -173,17 +173,20 @@ TEST(GlobalDataTypeRegistry, Basic)
ASSERT_FALSE(GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindService, "my_namespace.DataTypeB"));
ASSERT_FALSE(GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindService, 42));
ASSERT_TRUE((pdtd = GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindMessage, "my_namespace.DataTypeB")));
ASSERT_TRUE((pdtd = GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindMessage,
"my_namespace.DataTypeB")));
ASSERT_EQ(extractDescriptor<DataTypeB>(741), *pdtd);
ASSERT_TRUE((pdtd = GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindMessage, 741)));
ASSERT_EQ(extractDescriptor<DataTypeB>(741), *pdtd);
ASSERT_TRUE((pdtd = GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindMessage, "my_namespace.DataTypeA")));
ASSERT_TRUE((pdtd = GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindMessage,
"my_namespace.DataTypeA")));
ASSERT_EQ(extractDescriptor<DataTypeAMessage>(), *pdtd);
ASSERT_TRUE((pdtd = GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindMessage, uavcan::DataTypeID(0))));
ASSERT_EQ(extractDescriptor<DataTypeAMessage>(), *pdtd);
ASSERT_TRUE((pdtd = GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindService, "my_namespace.DataTypeA")));
ASSERT_TRUE((pdtd = GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindService,
"my_namespace.DataTypeA")));
ASSERT_EQ(extractDescriptor<DataTypeAService>(147), *pdtd);
ASSERT_TRUE((pdtd = GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindService, 147)));
ASSERT_EQ(extractDescriptor<DataTypeAService>(147), *pdtd);
libuavcan/test/node/publisher.cpp
+2 -1
View File
@@ -67,7 +67,8 @@ TEST(Publisher, Basic)
// Second shot - checking the transfer ID
ASSERT_LT(0, publisher.broadcast(msg));
expected_frame = uavcan::Frame(uavcan::mavlink::Message::DefaultDataTypeID, uavcan::TransferTypeMessageBroadcast,
expected_frame = uavcan::Frame(uavcan::mavlink::Message::DefaultDataTypeID,
uavcan::TransferTypeMessageBroadcast,
node.getNodeID(), uavcan::NodeID::Broadcast, 0, 1, true);
expected_frame.setPayload(expected_transfer_payload, 7);
ASSERT_TRUE(expected_frame.compile(expected_can_frame));
libuavcan/test/node/scheduler.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ struct TimerCallCounter
void callA(const uavcan::TimerEvent& ev) { events_a.push_back(ev); }
void callB(const uavcan::TimerEvent& ev) { events_b.push_back(ev); }
typedef uavcan::MethodBinder<TimerCallCounter*, void(TimerCallCounter::*)(const uavcan::TimerEvent&)> Binder;
typedef uavcan::MethodBinder<TimerCallCounter*, void (TimerCallCounter::*)(const uavcan::TimerEvent&)> Binder;
Binder bindA() { return Binder(this, &TimerCallCounter::callA); }
Binder bindB() { return Binder(this, &TimerCallCounter::callB); }
libuavcan/test/node/service_client.cpp
+2 -2
View File
@@ -39,7 +39,7 @@ struct ServiceCallResultHandler
}
typedef uavcan::MethodBinder<ServiceCallResultHandler*,
void (ServiceCallResultHandler::*)(const uavcan::ServiceCallResult<DataType>&)> Binder;
void (ServiceCallResultHandler::*)(const uavcan::ServiceCallResult<DataType>&)> Binder;
Binder bind() { return Binder(this, &ServiceCallResultHandler::handleResponse); }
};
@@ -69,7 +69,7 @@ TEST(ServiceClient, Basic)
// Caller
typedef uavcan::ServiceCallResult<root_ns_a::StringService> ResultType;
typedef uavcan::ServiceClient<root_ns_a::StringService,
typename ServiceCallResultHandler<root_ns_a::StringService>::Binder > ClientType;
typename ServiceCallResultHandler<root_ns_a::StringService>::Binder > ClientType;
ServiceCallResultHandler<root_ns_a::StringService> handler;
ClientType client1(nodes.b);
libuavcan/test/node/subscriber.cpp
+8 -8
View File
@@ -28,13 +28,13 @@ struct SubscriptionListener
DataType msg;
ReceivedDataStructureCopy(const ReceivedDataStructure& s)
: ts_monotonic(s.getMonotonicTimestamp())
, ts_utc(s.getUtcTimestamp())
, transfer_type(s.getTransferType())
, transfer_id(s.getTransferID())
, src_node_id(s.getSrcNodeID())
, iface_index(s.getIfaceIndex())
, msg(s)
: ts_monotonic(s.getMonotonicTimestamp())
, ts_utc(s.getUtcTimestamp())
, transfer_type(s.getTransferType())
, transfer_id(s.getTransferID())
, src_node_id(s.getSrcNodeID())
, iface_index(s.getIfaceIndex())
, msg(s)
{ }
};
@@ -111,7 +111,7 @@ TEST(Subscriber, Basic)
{
uavcan::TransferType tt = (i & 1) ? uavcan::TransferTypeMessageUnicast : uavcan::TransferTypeMessageBroadcast;
uavcan::NodeID dni = (tt == uavcan::TransferTypeMessageBroadcast) ?
uavcan::NodeID::Broadcast : node.getDispatcher().getNodeID();
uavcan::NodeID::Broadcast : node.getDispatcher().getNodeID();
// uint_fast16_t data_type_id, TransferType transfer_type, NodeID src_node_id, NodeID dst_node_id,
// uint_fast8_t frame_index, TransferID transfer_id, bool last_frame
uavcan::Frame frame(uavcan::mavlink::Message::DefaultDataTypeID, tt, uavcan::NodeID(i + 100), dni, 0, i, true);