From 57de608bf0bda80e98fbc2d8f6bbee9bb2676c4c Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Tue, 25 Mar 2014 22:33:12 +0400 Subject: [PATCH] Few manual style fixes for tests --- .../dsdl_test/dsdl_uavcan_compilability.cpp | 3 +- libuavcan/test/marshal/array.cpp | 39 ++++++--- libuavcan/test/marshal/float_spec.cpp | 3 +- .../test/node/global_data_type_registry.cpp | 84 ++++++++++--------- libuavcan/test/node/scheduler.cpp | 9 +- libuavcan/test/transport/frame.cpp | 3 +- 6 files changed, 83 insertions(+), 58 deletions(-) diff --git a/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp b/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp index d8b0e05e74..b82f4c9d68 100644 --- a/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp +++ b/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp @@ -43,7 +43,8 @@ TEST(Dsdl, Streaming) ps.a.resize(2); os << ps << std::endl << "==========" << std::endl; - static const std::string Reference = "seq: 0\n" + static const std::string Reference = + "seq: 0\n" "sysid: 0\n" "compid: 0\n" "msgid: 0\n" diff --git a/libuavcan/test/marshal/array.cpp b/libuavcan/test/marshal/array.cpp index 62829aafe8..73fcbfbf6d 100644 --- a/libuavcan/test/marshal/array.cpp +++ b/libuavcan/test/marshal/array.cpp @@ -31,7 +31,11 @@ struct CustomType typename uavcan::StorageType::Type b; typename uavcan::StorageType::Type c; - CustomType() : a(), b(), c() { } + CustomType() + : a() + , b() + , c() + { } bool operator==(const CustomType& rhs) const { return a == rhs.a && b == rhs.b && c == rhs.c; } @@ -39,19 +43,21 @@ struct CustomType uavcan::TailArrayOptimizationMode tao_mode = uavcan::TailArrayOptEnabled) { int res = 0; - res = A::encode(obj.a, codec, uavcan::TailArrayOptDisabled); if (res <= 0) + { return res; - + } res = B::encode(obj.b, codec, uavcan::TailArrayOptDisabled); if (res <= 0) + { return res; - + } res = C::encode(obj.c, codec, tao_mode); if (res <= 0) + { return res; - + } return 1; } @@ -59,19 +65,21 @@ struct CustomType uavcan::TailArrayOptimizationMode tao_mode = uavcan::TailArrayOptEnabled) { int res = 0; - res = A::decode(obj.a, codec, uavcan::TailArrayOptDisabled); if (res <= 0) + { return res; - + } res = B::decode(obj.b, codec, uavcan::TailArrayOptDisabled); if (res <= 0) + { return res; - + } res = C::decode(obj.c, codec, tao_mode); if (res <= 0) + { return res; - + } return 1; } }; @@ -356,7 +364,10 @@ struct CustomType2 typename uavcan::StorageType::Type a; typename uavcan::StorageType::Type b; - CustomType2() : a(), b() { } + CustomType2() + : a() + , b() + { } bool operator==(const CustomType2& rhs) const { return a == rhs.a && b == rhs.b; } @@ -366,10 +377,14 @@ struct CustomType2 int res = 0; res = A::encode(obj.a, codec, uavcan::TailArrayOptDisabled); if (res <= 0) + { return res; + } res = B::encode(obj.b, codec, tao_mode); if (res <= 0) + { return res; + } return 1; } @@ -379,10 +394,14 @@ struct CustomType2 int res = 0; res = A::decode(obj.a, codec, uavcan::TailArrayOptDisabled); if (res <= 0) + { return res; + } res = B::decode(obj.b, codec, tao_mode); if (res <= 0) + { return res; + } return 1; } }; diff --git a/libuavcan/test/marshal/float_spec.cpp b/libuavcan/test/marshal/float_spec.cpp index 94ac657d7a..e66801e188 100644 --- a/libuavcan/test/marshal/float_spec.cpp +++ b/libuavcan/test/marshal/float_spec.cpp @@ -165,7 +165,8 @@ TEST(FloatSpec, Float16Representation) ASSERT_EQ(0, F16S::encode(0, sc_wr, uavcan::TailArrayOptDisabled)); // Out of buffer space now - static const std::string Reference = // Keep in mind that this is LITTLE ENDIAN representation + // Keep in mind that this is LITTLE ENDIAN representation + static const std::string Reference = "00000000 00000000 " // 0.0 "00000000 00111100 " // 1.0 "00000000 11000000 " // -2.0 diff --git a/libuavcan/test/node/global_data_type_registry.cpp b/libuavcan/test/node/global_data_type_registry.cpp index b0cc5e640f..ddc81aeb59 100644 --- a/libuavcan/test/node/global_data_type_registry.cpp +++ b/libuavcan/test/node/global_data_type_registry.cpp @@ -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 +uavcan::DataTypeDescriptor extractDescriptor(uint16_t dtid = Type::DefaultDataTypeID) +{ + return uavcan::DataTypeDescriptor(uavcan::DataTypeKind(Type::DataTypeKind), dtid, + Type::getDataTypeSignature(), Type::getDataTypeFullName()); +} - template - uavcan::DataTypeDescriptor extractDescriptor(uint16_t dtid = Type::DefaultDataTypeID) - { - return uavcan::DataTypeDescriptor(uavcan::DataTypeKind(Type::DataTypeKind), dtid, - Type::getDataTypeSignature(), Type::getDataTypeFullName()); - } } diff --git a/libuavcan/test/node/scheduler.cpp b/libuavcan/test/node/scheduler.cpp index 1ffb1e2bfd..5f8d10151c 100644 --- a/libuavcan/test/node/scheduler.cpp +++ b/libuavcan/test/node/scheduler.cpp @@ -18,6 +18,9 @@ struct TimerCallCounter void callB(const uavcan::TimerEvent& ev) { events_b.push_back(ev); } typedef uavcan::MethodBinder 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 - a(node, TimerCallCounter::Binder(&tcc, &TimerCallCounter::callA)); - uavcan::TimerEventForwarder - b(node, TimerCallCounter::Binder(&tcc, &TimerCallCounter::callB)); + uavcan::TimerEventForwarder a(node, tcc.bindA()); + uavcan::TimerEventForwarder b(node, tcc.bindB()); ASSERT_EQ(0, node.getScheduler().getDeadlineScheduler().getNumHandlers()); diff --git a/libuavcan/test/transport/frame.cpp b/libuavcan/test/transport/frame.cpp index 5435e72fb1..3c5b8252ba 100644 --- a/libuavcan/test/transport/frame.cpp +++ b/libuavcan/test/transport/frame.cpp @@ -179,7 +179,8 @@ TEST(Frame, RxFrameParse) // Valid can_rx_frame.ts_mono = uavcan::MonotonicTime::fromUSec(1); // Zero is not allowed - can_rx_frame.id = CanFrame::FlagEFF | + can_rx_frame.id = + CanFrame::FlagEFF | (2 << 0) | // Transfer ID (1 << 3) | // Last Frame (29 << 4) | // Frame Index