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

Few manual style fixes for tests

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-25 22:33:12 +04:00
parent d967eaf94d
commit 57de608bf0
6 changed files with 83 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/node/global_data_type_registry.cpp
+43 -41
View File
@@ -7,52 +7,54 @@
namespace
{
struct DataTypeAMessage
{
enum { DefaultDataTypeID = 0 };
enum { DataTypeKind = uavcan::DataTypeKindMessage };
static uavcan::DataTypeSignature getDataTypeSignature() { return uavcan::DataTypeSignature(123); }
static const char* getDataTypeFullName() { return "my_namespace.DataTypeA"; }
};
struct DataTypeAService
{
enum { DefaultDataTypeID = 0 };
enum { DataTypeKind = uavcan::DataTypeKindService };
static uavcan::DataTypeSignature getDataTypeSignature() { return uavcan::DataTypeSignature(789); }
static const char* getDataTypeFullName() { return "my_namespace.DataTypeA"; }
};
struct DataTypeAMessage
{
enum { DefaultDataTypeID = 0 };
enum { DataTypeKind = uavcan::DataTypeKindMessage };
static uavcan::DataTypeSignature getDataTypeSignature() { return uavcan::DataTypeSignature(123); }
static const char* getDataTypeFullName() { return "my_namespace.DataTypeA"; }
};
struct DataTypeB
{
enum { DefaultDataTypeID = 42 };
enum { DataTypeKind = uavcan::DataTypeKindMessage };
static uavcan::DataTypeSignature getDataTypeSignature() { return uavcan::DataTypeSignature(456); }
static const char* getDataTypeFullName() { return "my_namespace.DataTypeB"; }
};
struct DataTypeAService
{
enum { DefaultDataTypeID = 0 };
enum { DataTypeKind = uavcan::DataTypeKindService };
static uavcan::DataTypeSignature getDataTypeSignature() { return uavcan::DataTypeSignature(789); }
static const char* getDataTypeFullName() { return "my_namespace.DataTypeA"; }
};
struct DataTypeC
{
enum { DefaultDataTypeID = 1023 };
enum { DataTypeKind = uavcan::DataTypeKindMessage };
static uavcan::DataTypeSignature getDataTypeSignature() { return uavcan::DataTypeSignature(654); }
static const char* getDataTypeFullName() { return "foo.DataTypeC"; }
};
struct DataTypeB
{
enum { DefaultDataTypeID = 42 };
enum { DataTypeKind = uavcan::DataTypeKindMessage };
static uavcan::DataTypeSignature getDataTypeSignature() { return uavcan::DataTypeSignature(456); }
static const char* getDataTypeFullName() { return "my_namespace.DataTypeB"; }
};
struct DataTypeD
{
enum { DefaultDataTypeID = 43 };
enum { DataTypeKind = uavcan::DataTypeKindService };
static uavcan::DataTypeSignature getDataTypeSignature() { return uavcan::DataTypeSignature(987); }
static const char* getDataTypeFullName() { return "foo.DataTypeD"; }
};
struct DataTypeC
{
enum { DefaultDataTypeID = 1023 };
enum { DataTypeKind = uavcan::DataTypeKindMessage };
static uavcan::DataTypeSignature getDataTypeSignature() { return uavcan::DataTypeSignature(654); }
static const char* getDataTypeFullName() { return "foo.DataTypeC"; }
};
struct DataTypeD
{
enum { DefaultDataTypeID = 43 };
enum { DataTypeKind = uavcan::DataTypeKindService };
static uavcan::DataTypeSignature getDataTypeSignature() { return uavcan::DataTypeSignature(987); }
static const char* getDataTypeFullName() { return "foo.DataTypeD"; }
};
template <typename Type>
uavcan::DataTypeDescriptor extractDescriptor(uint16_t dtid = Type::DefaultDataTypeID)
{
return uavcan::DataTypeDescriptor(uavcan::DataTypeKind(Type::DataTypeKind), dtid,
Type::getDataTypeSignature(), Type::getDataTypeFullName());
}
template <typename Type>
uavcan::DataTypeDescriptor extractDescriptor(uint16_t dtid = Type::DefaultDataTypeID)
{
return uavcan::DataTypeDescriptor(uavcan::DataTypeKind(Type::DataTypeKind), dtid,
Type::getDataTypeSignature(), Type::getDataTypeFullName());
}
}
libuavcan/test/node/scheduler.cpp
+5 -4
View File
@@ -18,6 +18,9 @@ struct TimerCallCounter
void callB(const uavcan::TimerEvent& ev) { events_b.push_back(ev); }
typedef uavcan::MethodBinder<TimerCallCounter*, void(TimerCallCounter::*)(const uavcan::TimerEvent&)> Binder;
Binder bindA() { return Binder(this, &TimerCallCounter::callA); }
Binder bindB() { return Binder(this, &TimerCallCounter::callB); }
};
/*
@@ -34,10 +37,8 @@ TEST(Scheduler, Timers)
*/
{
TimerCallCounter tcc;
uavcan::TimerEventForwarder<TimerCallCounter::Binder>
a(node, TimerCallCounter::Binder(&tcc, &TimerCallCounter::callA));
uavcan::TimerEventForwarder<TimerCallCounter::Binder>
b(node, TimerCallCounter::Binder(&tcc, &TimerCallCounter::callB));
uavcan::TimerEventForwarder<TimerCallCounter::Binder> a(node, tcc.bindA());
uavcan::TimerEventForwarder<TimerCallCounter::Binder> b(node, tcc.bindB());
ASSERT_EQ(0, node.getScheduler().getDeadlineScheduler().getNumHandlers());