Remove stopwatch second and adapt tests (#247)

* Remove stopwatch second and adapt tests * Add timer debug * Add more time to test stop watch * 10% time margin
thibault-martinez · Mar 6, 2018 · d738e2d · d738e2d
1 parent e49c2ad
commit d738e2d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 44 deletions.
diff --git a/include/iota/utils/stop_watch.hpp b/include/iota/utils/stop_watch.hpp
@@ -60,12 +60,7 @@ class StopWatch {
   /**
    * @return Elapsed time in milliseconds.
    */
-  std::chrono::milliseconds getElapsedTimeMilliSeconds() const;
-
-  /**
-   * @return Elapsed time in seconds.
-   */
-  std::chrono::seconds getElapsedTimeSeconds() const;
+  std::chrono::milliseconds getElapsedTime() const;
 
 public:
   /**

diff --git a/source/api/extended.cpp b/source/api/extended.cpp
@@ -80,7 +80,7 @@ Extended::getInputs(const Models::Seed& seed, const int32_t& start, const int32_
   auto    res         = getBalancesAndFormat(addresses, threshold);
 
   //! update duration
-  res.setDuration(stopWatch.getElapsedTimeMilliSeconds().count());
+  res.setDuration(stopWatch.getElapsedTime().count());
 
   return res;
 }
@@ -128,7 +128,7 @@ Extended::getBalancesAndFormat(const std::vector<Models::Address>& addresses,
     throw Errors::IllegalState("Not enough balance");
   }
 
-  return { inputs, totalBalance, stopWatch.getElapsedTimeMilliSeconds().count() };
+  return { inputs, totalBalance, stopWatch.getElapsedTime().count() };
 }
 
 Responses::GetNewAddresses
@@ -165,7 +165,7 @@ Extended::getNewAddresses(const Models::Seed& seed, const uint32_t& index, const
     allAddresses.erase(std::begin(allAddresses), std::end(allAddresses) - 1);
   }
 
-  return { allAddresses, stopWatch.getElapsedTimeMilliSeconds().count() };
+  return { allAddresses, stopWatch.getElapsedTime().count() };
 }
 
 Models::Bundle
@@ -563,7 +563,7 @@ Extended::getBundle(const Types::Trytes& transaction) const {
   //! verify bundle integrity
   verifyBundle(bundle);
 
-  return { bundle.getTransactions(), stopWatch.getElapsedTimeMilliSeconds().count() };
+  return { bundle.getTransactions(), stopWatch.getElapsedTime().count() };
 }
 
 void
@@ -655,7 +655,7 @@ Extended::getTransfers(const Models::Seed& seed, int start, int end, bool inclus
   const auto gna     = getNewAddresses(seed, start, end - start, true);
   const auto bundles = bundlesFromAddresses(gna.getAddresses(), inclusionStates);
 
-  return { bundles, stopWatch.getElapsedTimeMilliSeconds().count() };
+  return { bundles, stopWatch.getElapsedTime().count() };
 }
 
 Responses::SendTransfer
@@ -675,7 +675,7 @@ Extended::sendTransfer(const Models::Seed& seed, int depth, int minWeightMagnitu
     successful.push_back(!response.getHashes().empty());
   }
 
-  return { successful, stopWatch.getElapsedTimeMilliSeconds().count() };
+  return { successful, stopWatch.getElapsedTime().count() };
 }
 
 std::vector<Models::Transaction>
@@ -735,7 +735,7 @@ Extended::getAccountData(const Models::Seed& seed, int start, int end, bool incl
   const auto balances  = getBalancesAndFormat(addresses.getAddresses(), threshold);
 
   return { addresses.getAddresses(), transfers, balances.getTotalBalance(),
-           stopWatch.getElapsedTimeMilliSeconds().count() };
+           stopWatch.getElapsedTime().count() };
 }
 
 std::vector<Types::Trytes>
@@ -800,7 +800,7 @@ Extended::replayBundle(const Types::Trytes& transaction, int depth, int minWeigh
     successful.push_back(!response.getHashes().empty());
   }
 
-  return { successful, stopWatch.getElapsedTimeMilliSeconds().count() };
+  return { successful, stopWatch.getElapsedTime().count() };
 }
 
 std::vector<Models::Transaction>

diff --git a/source/utils/stop_watch.cpp b/source/utils/stop_watch.cpp
@@ -51,7 +51,7 @@ StopWatch::pause() {
     return;
   }
 
-  currentTime_ = getElapsedTimeMilliSeconds();
+  currentTime_ = getElapsedTime();
   running_     = false;
 }
 
@@ -66,19 +66,14 @@ StopWatch::resume() {
 }
 
 std::chrono::milliseconds
-StopWatch::getElapsedTimeMilliSeconds() const {
+StopWatch::getElapsedTime() const {
   if (running_) {
     return now() - startTime_;
   }
 
   return currentTime_;
 }
 
-std::chrono::seconds
-StopWatch::getElapsedTimeSeconds() const {
-  return std::chrono::duration_cast<std::chrono::seconds>(getElapsedTimeMilliSeconds());
-}
-
 }  // namespace Utils
 
 }  // namespace IOTA
diff --git a/test/source/utils/stop_watch_test.cpp b/test/source/utils/stop_watch_test.cpp
@@ -34,7 +34,8 @@ TEST(StopWatch, CtorShouldStartTimer) {
 
   std::this_thread::sleep_for(std::chrono::seconds(1));
 
-  EXPECT_EQ(s.getElapsedTimeSeconds().count(), 1);
+  EXPECT_TRUE(s.getElapsedTime().count() >= 900);
+  EXPECT_TRUE(s.getElapsedTime().count() <= 1100);
 }
 
 TEST(StopWatch, NowShouldReturnCurrentTime) {
@@ -67,7 +68,8 @@ TEST(StopWatch, RestartShouldRestartTimer) {
   s.restart();
   std::this_thread::sleep_for(std::chrono::seconds(1));
 
-  EXPECT_EQ(s.getElapsedTimeSeconds().count(), 1);
+  EXPECT_TRUE(s.getElapsedTime().count() >= 900);
+  EXPECT_TRUE(s.getElapsedTime().count() <= 1100);
 }
 
 TEST(StopWatch, PauseShouldStopTimer) {
@@ -77,7 +79,8 @@ TEST(StopWatch, PauseShouldStopTimer) {
   s.pause();
   std::this_thread::sleep_for(std::chrono::seconds(1));
 
-  EXPECT_EQ(s.getElapsedTimeSeconds().count(), 1);
+  EXPECT_TRUE(s.getElapsedTime().count() >= 900);
+  EXPECT_TRUE(s.getElapsedTime().count() <= 1100);
 }
 
 TEST(StopWatch, MultiplePauseShouldNotReset) {
@@ -89,7 +92,8 @@ TEST(StopWatch, MultiplePauseShouldNotReset) {
   s.pause();
   std::this_thread::sleep_for(std::chrono::seconds(1));
 
-  EXPECT_EQ(s.getElapsedTimeSeconds().count(), 1);
+  EXPECT_TRUE(s.getElapsedTime().count() >= 900);
+  EXPECT_TRUE(s.getElapsedTime().count() <= 1100);
 }
 
 TEST(StopWatch, ResumeShouldResumePausedTimer) {
@@ -101,7 +105,8 @@ TEST(StopWatch, ResumeShouldResumePausedTimer) {
   s.resume();
   std::this_thread::sleep_for(std::chrono::seconds(1));
 
-  EXPECT_EQ(s.getElapsedTimeSeconds().count(), 2);
+  EXPECT_TRUE(s.getElapsedTime().count() >= 1800);
+  EXPECT_TRUE(s.getElapsedTime().count() <= 2200);
 }
 
 TEST(StopWatch, ResumeShouldDoNothingIfRunning) {
@@ -111,22 +116,6 @@ TEST(StopWatch, ResumeShouldDoNothingIfRunning) {
   s.resume();
   std::this_thread::sleep_for(std::chrono::seconds(1));
 
-  EXPECT_EQ(s.getElapsedTimeSeconds().count(), 2);
-}
-
-TEST(StopWatch, GetElapsedTimeMiliSeconds) {
-  IOTA::Utils::StopWatch s;
-
-  std::this_thread::sleep_for(std::chrono::seconds(1));
-
-  EXPECT_TRUE(s.getElapsedTimeMilliSeconds().count() >= 1000);
-  EXPECT_TRUE(s.getElapsedTimeMilliSeconds().count() < 2000);
-}
-
-TEST(StopWatch, GetElapsedTimeSeconds) {
-  IOTA::Utils::StopWatch s;
-
-  std::this_thread::sleep_for(std::chrono::seconds(1));
-
-  EXPECT_EQ(s.getElapsedTimeSeconds().count(), 1);
+  EXPECT_TRUE(s.getElapsedTime().count() >= 1800);
+  EXPECT_TRUE(s.getElapsedTime().count() <= 2200);
 }