Refactored helper class InterlinkedTestNodes

libuavcan/test/node/service_client.cpp

@@ -55,7 +55,7 @@ static void stringServiceServerCallback(const uavcan::ReceivedDataStructure<root
 
 TEST(ServiceClient, Basic)
 {
-    InterlinkedTestNodes nodes;
+    InterlinkedTestNodesWithSysClock nodes;
 
     // Type registration
     uavcan::GlobalDataTypeRegistry::instance().reset();

libuavcan/test/node/test_node.hpp

@@ -120,28 +120,30 @@ struct PairableCanDriver : public uavcan::ICanDriver, public uavcan::ICanIface
 };
 
 
+template <typename ClockType>
 struct InterlinkedTestNodes
 {
-    SystemClockDriver clock;
+    ClockType clock_a;
+    ClockType clock_b;
     PairableCanDriver can_a;
     PairableCanDriver can_b;
     TestNode a;
     TestNode b;
 
     InterlinkedTestNodes(uavcan::NodeID nid_first, uavcan::NodeID nid_second)
-    : can_a(clock)
-    , can_b(clock)
-    , a(can_a, clock, nid_first)
-    , b(can_b, clock, nid_second)
+    : can_a(clock_a)
+    , can_b(clock_b)
+    , a(can_a, clock_a, nid_first)
+    , b(can_b, clock_b, nid_second)
     {
         can_a.linkTogether(&can_b);
     }
 
     InterlinkedTestNodes()
-    : can_a(clock)
-    , can_b(clock)
-    , a(can_a, clock, 1)
-    , b(can_b, clock, 2)
+    : can_a(clock_a)
+    , can_b(clock_b)
+    , a(can_a, clock_a, 1)
+    , b(can_b, clock_b, 2)
     {
         can_a.linkTogether(&can_b);
     }
@@ -164,3 +166,7 @@ struct InterlinkedTestNodes
         return 0;
     }
 };
+
+
+typedef InterlinkedTestNodes<SystemClockDriver> InterlinkedTestNodesWithSysClock;
+typedef InterlinkedTestNodes<SystemClockMock> InterlinkedTestNodesWithClockMock;

libuavcan/test/protocol/data_type_info_provider.cpp

@@ -38,7 +38,7 @@ static bool validateDataTypeInfoResponse(const std::auto_ptr<ServiceCallResult<G
 
 TEST(DataTypeInfoProvider, Basic)
 {
-    InterlinkedTestNodes nodes;
+    InterlinkedTestNodesWithSysClock nodes;
 
     DataTypeInfoProvider dtip(nodes.a);
 

libuavcan/test/protocol/logger.cpp

@@ -42,7 +42,7 @@ struct LogSink : public uavcan::ILogSink
 
 TEST(Logger, Basic)
 {
-    InterlinkedTestNodes nodes;
+    InterlinkedTestNodesWithSysClock nodes;
 
     uavcan::Logger logger(nodes.a);
 
@@ -105,7 +105,7 @@ TEST(Logger, Basic)
 
 TEST(Logger, Cpp11Formatting)
 {
-    InterlinkedTestNodes nodes;
+    InterlinkedTestNodesWithSysClock nodes;
 
     uavcan::Logger logger(nodes.a);
     logger.setLevel(uavcan::protocol::debug::LogLevel::DEBUG);

libuavcan/test/protocol/node_status_provider.cpp

@@ -9,7 +9,7 @@
 
 TEST(NodeStatusProvider, Basic)
 {
-    InterlinkedTestNodes nodes;
+    InterlinkedTestNodesWithSysClock nodes;
 
     uavcan::NodeStatusProvider nsp(nodes.a);
 

libuavcan/test/protocol/panic_broadcaster.cpp

@@ -9,7 +9,7 @@
 
 TEST(PanicBroadcaster, Basic)
 {
-    InterlinkedTestNodes nodes;
+    InterlinkedTestNodesWithSysClock nodes;
 
     uavcan::PanicBroadcaster panicker(nodes.a);
 

libuavcan/test/protocol/panic_listener.cpp

@@ -28,7 +28,7 @@ struct PanicHandler
 
 TEST(PanicListener, Basic)
 {
-    InterlinkedTestNodes nodes;
+    InterlinkedTestNodesWithSysClock nodes;
 
     uavcan::GlobalDataTypeRegistry::instance().reset();
     uavcan::DefaultDataTypeRegistrator<uavcan::protocol::Panic> _reg1;

libuavcan/test/protocol/restart_request_server.cpp

@@ -22,7 +22,7 @@ struct RestartHandler : public uavcan::IRestartRequestHandler
 
 TEST(RestartRequestServer, Basic)
 {
-    InterlinkedTestNodes nodes;
+    InterlinkedTestNodesWithSysClock nodes;
 
     uavcan::RestartRequestServer rrs(nodes.a);