New tests.

spec/cpp/src/timing/CountdownTimer.hpp

@@ -17,7 +17,7 @@ class CountdownTimer
 {
 protected:
    /** beware if clock precision is terrible */
-   std::unique_ptr<Clock> clock;
+   TClock clock;
    /** nice precision timer */
    double mytime;
    /** object name */
@@ -27,8 +27,7 @@ class CountdownTimer
 
 public:
    explicit CountdownTimer(double _countdown, std::string _name = "", TClock _clock = nullptr)
-     : name(std::move(_name))
-     , clock(std::move(_clock))
+     : clock(std::move(_clock)), name(std::move(_name))
    {
       init(_countdown);
    }
@@ -69,8 +68,9 @@ class CountdownTimer
       double newtime = clock->getTime();
       double elapsed = newtime - mytime;
       double remaining = 1000000000.0; // INF
-      if (countdown >= 0.0)
+      if (countdown >= 0.0) {
          remaining = std::max(0.0, countdown - elapsed);
+      }
 
       return remaining == 0.0;
    }

spec/cpp/tests/dbft2/CMakeLists.txt

@@ -0,0 +1 @@
+ADD_TEST_ALL_FILES()

spec/cpp/tests/dbft2/dBFT2ContextTests.cpp

@@ -0,0 +1,13 @@
+#include <memory>
+#include <gtest/gtest.h>
+
+#include "dbft2/dBFT2Context.hpp"
+
+using namespace std;
+using namespace libbft;
+
+TEST(dbft2dBFT2Context, InternalValue) {
+   dBFT2Context dBft2Context(1, 2, 3, 4, 5);
+
+   EXPECT_EQ(1, dBft2Context.v);
+}

spec/cpp/tests/dbft2/dBFT2MachineTests.cpp

@@ -0,0 +1,13 @@
+#include <memory>
+#include <gtest/gtest.h>
+
+#include "dbft2/dBFT2Machine.hpp"
+
+using namespace std;
+using namespace libbft;
+
+TEST(dbft2dBFT2Machine, ToString) {
+   dBFT2Machine d2Machine;
+
+   EXPECT_EQ("Welcome to dBFT2Machine : { name = replicated_dBFT}", d2Machine.toString());
+}

spec/cpp/tests/dbft2/dBFT2RPCMachineTests.cpp

@@ -0,0 +1,13 @@
+#include <memory>
+#include <gtest/gtest.h>
+
+#include "dbft2/dBFT2RPCMachine.hpp"
+
+using namespace std;
+using namespace libbft;
+
+TEST(dbft2dBFT2RPCMachine, ToString) {
+//   dBFT2RPCMachine d2rpcMachine;
+
+//   EXPECT_EQ("Welcome to dBFT2Machine : { name = replicated_dBFT}", d2rpcMachine.toString());
+}

spec/cpp/tests/replicated/MachineContextTests.cpp

@@ -0,0 +1,17 @@
+#include <thread>
+#include <gtest/gtest.h>
+
+#include "single/SingleTimerStateMachine.hpp"
+#include "replicated/MultiContext.hpp"
+#include "replicated/MachineContext.hpp"
+
+using namespace std;
+using namespace libbft;
+
+TEST(ReplicatedMachineContext, ToString) {
+   MachineContext<int> machineContext(
+      std::shared_ptr<int>(new int{1}),
+      std::shared_ptr<SingleTimerStateMachine<MultiContext<int>>>(new SingleTimerStateMachine<MultiContext<int>>()));
+
+   EXPECT_EQ("STSM {#id = 0;Timer='Timer {name=''}';States=[]}", machineContext.machine->toString());
+}

spec/cpp/tests/timing/ClockNotifyTimerTests.cpp

@@ -0,0 +1,12 @@
+#include <thread>
+#include <gtest/gtest.h>
+
+#include "timing/CountdownNotifyTimer.hpp"
+
+using namespace std;
+using namespace libbft;
+
+TEST(TimingClockNotifyTimer, ToString) {
+   CountdownNotifyTimer clockNotifyTimer(1);
+   EXPECT_EQ("CountdownNotifyTimer {name=''}", clockNotifyTimer.toString());
+}

spec/cpp/tests/timing/CountdownTimerTests.cpp

@@ -0,0 +1,12 @@
+#include <thread>
+#include <gtest/gtest.h>
+
+#include "timing/CountdownTimer.hpp"
+
+using namespace std;
+using namespace libbft;
+
+TEST(TimingCountdownTimer, ToString) {
+   CountdownTimer countdownTimer(1);
+   EXPECT_EQ("CountdownTimer {name=''}", countdownTimer.toString());
+}

spec/cpp/tests/timing/TimerDelayableTests.cpp

@@ -0,0 +1,12 @@
+#include <thread>
+#include <gtest/gtest.h>
+
+#include "timing/TimerDelayable.hpp"
+
+using namespace std;
+using namespace libbft;
+
+TEST(TimingTimerDelayable, ToString) {
+   TimerDelayable timerDelayable;
+   EXPECT_EQ("Timer {name=''}", timerDelayable.toString());
+}