Use user-defined literals for time units

8 files changed, 16 insertions, 16 deletions

diff --git a/test/DHTMessageTrackerEntryTest.cc b/test/DHTMessageTrackerEntryTest.cc
index 316e1e25..67147e66 100644
--- a/test/DHTMessageTrackerEntryTest.cc
+++ b/test/DHTMessageTrackerEntryTest.cc
@@ -43,7 +43,7 @@ void DHTMessageTrackerEntryTest::testMatch()
     DHTMessageTrackerEntry entry(msg1->getRemoteNode(),
                                  msg1->getTransactionID(),
                                  msg1->getMessageType(),
-                                 std::chrono::seconds(30));
+                                 30_s);
 
     CPPUNIT_ASSERT(entry.match(msg1->getTransactionID(),
                                msg1->getRemoteNode()->getIPAddress(),
diff --git a/test/DHTPeerAnnounceEntryTest.cc b/test/DHTPeerAnnounceEntryTest.cc
index 2d518bce..c2531d52 100644
--- a/test/DHTPeerAnnounceEntryTest.cc
+++ b/test/DHTPeerAnnounceEntryTest.cc
@@ -40,7 +40,7 @@ void DHTPeerAnnounceEntryTest::testRemoveStalePeerAddrEntry()
   entry.addPeerAddrEntry(PeerAddrEntry("192.168.0.3", 6883));
   entry.addPeerAddrEntry(PeerAddrEntry("192.168.0.4", 6884, Timer::zero()));
 
-  entry.removeStalePeerAddrEntry(std::chrono::seconds(10));
+  entry.removeStalePeerAddrEntry(10_s);
 
   CPPUNIT_ASSERT_EQUAL((size_t)2, entry.countPeerAddrEntry());
 
diff --git a/test/DefaultBtMessageDispatcherTest.cc b/test/DefaultBtMessageDispatcherTest.cc
index 5d49756a..ce792af7 100644
--- a/test/DefaultBtMessageDispatcherTest.cc
+++ b/test/DefaultBtMessageDispatcherTest.cc
@@ -209,7 +209,7 @@ void DefaultBtMessageDispatcherTest::testCheckRequestSlotAndDoNecessaryThing()
   CPPUNIT_ASSERT(piece->getMissingUnusedBlockIndex(index));
   CPPUNIT_ASSERT_EQUAL((size_t)0, index);
 
-  btMessageDispatcher->setRequestTimeout(std::chrono::minutes(1));
+  btMessageDispatcher->setRequestTimeout(1_min);
   btMessageDispatcher->addOutstandingRequest
     (make_unique<RequestSlot>(0, 0, MY_PIECE_LENGTH, 0, piece));
 
@@ -228,7 +228,7 @@ testCheckRequestSlotAndDoNecessaryThing_timeout() {
   CPPUNIT_ASSERT(piece->getMissingUnusedBlockIndex(index));
   CPPUNIT_ASSERT_EQUAL((size_t)0, index);
 
-  btMessageDispatcher->setRequestTimeout(std::chrono::minutes(1));
+  btMessageDispatcher->setRequestTimeout(1_min);
   auto slot = make_unique<RequestSlot>(0, 0, MY_PIECE_LENGTH, 0, piece);
   // make this slot timeout
   slot->setDispatchedTime(Timer::zero());
@@ -247,7 +247,7 @@ void DefaultBtMessageDispatcherTest::
 testCheckRequestSlotAndDoNecessaryThing_completeBlock() {
   auto piece = std::make_shared<Piece>(0, MY_PIECE_LENGTH);
   piece->completeBlock(0);
-  btMessageDispatcher->setRequestTimeout(std::chrono::minutes(1));
+  btMessageDispatcher->setRequestTimeout(1_min);
   btMessageDispatcher->addOutstandingRequest
     (make_unique<RequestSlot>(0, 0, MY_PIECE_LENGTH, 0, piece));
 
diff --git a/test/RpcMethodTest.cc b/test/RpcMethodTest.cc
index 96127ee4..a85c0119 100644
--- a/test/RpcMethodTest.cc
+++ b/test/RpcMethodTest.cc
@@ -915,7 +915,7 @@ void RpcMethodTest::testGatherStoppedDownload()
   d->fileEntries = fileEntries;
   d->inMemoryDownload = false;
   d->sessionDownloadLength = UINT64_MAX;
-  d->sessionTime = std::chrono::seconds(1);
+  d->sessionTime = 1_s;
   d->result = error_code::FINISHED;
   d->followedBy = followedBy;
   d->belongsTo = 2;
diff --git a/test/ServerStatManTest.cc b/test/ServerStatManTest.cc
index e87805e4..dd5bab15 100644
--- a/test/ServerStatManTest.cc
+++ b/test/ServerStatManTest.cc
@@ -159,7 +159,7 @@ void ServerStatManTest::testRemoveStaleServerStat()
   CPPUNIT_ASSERT(ssm.add(localhost_ftp));
   CPPUNIT_ASSERT(ssm.add(mirror));
 
-  ssm.removeStaleServerStat(std::chrono::hours(24));
+  ssm.removeStaleServerStat(24_h);
 
   CPPUNIT_ASSERT(ssm.find("localhost", "http"));
   CPPUNIT_ASSERT(!ssm.find("localhost", "ftp"));
diff --git a/test/TimeSeedCriteriaTest.cc b/test/TimeSeedCriteriaTest.cc
index aa751b26..2b6a124f 100644
--- a/test/TimeSeedCriteriaTest.cc
+++ b/test/TimeSeedCriteriaTest.cc
@@ -21,12 +21,12 @@ public:
 CPPUNIT_TEST_SUITE_REGISTRATION(TimeSeedCriteriaTest);
 
 void TimeSeedCriteriaTest::testEvaluate() {
-  TimeSeedCriteria cri(std::chrono::seconds(1));
+  TimeSeedCriteria cri(1_s);
   global::wallclock().reset();
-  global::wallclock().advance(std::chrono::seconds(2));
+  global::wallclock().advance(2_s);
   CPPUNIT_ASSERT(cri.evaluate());
   cri.reset();
-  cri.setDuration(std::chrono::seconds(10));
+  cri.setDuration(10_s);
   CPPUNIT_ASSERT(!cri.evaluate());
 }
 
diff --git a/test/UDPTrackerClientTest.cc b/test/UDPTrackerClientTest.cc
index f3604aef..423032a8 100644
--- a/test/UDPTrackerClientTest.cc
+++ b/test/UDPTrackerClientTest.cc
@@ -270,7 +270,7 @@ void UDPTrackerClientTest::testConnectFollowedByAnnounce()
   req4->infohash = "bittorrent-infohash4";
   tr.addRequest(req4);
   Timer future = now;
-  future.advance(std::chrono::hours(1));
+  future.advance(1_h);
   rv = tr.createRequest(data, sizeof(data), remoteAddr, remotePort,
                         future);
   // connection ID is stale because of the timeout
@@ -384,7 +384,7 @@ void UDPTrackerClientTest::testTimeout()
     CPPUNIT_ASSERT_EQUAL((int)UDPT_ACT_CONNECT,
                          (int)bittorrent::getIntParam(data, 8));
     tr.requestSent(now);
-    now.advance(std::chrono::seconds(20));
+    now.advance(20_s);
     // 15 seconds 1st stage timeout passed
     tr.handleTimeout(now);
     CPPUNIT_ASSERT(tr.getConnectRequests().empty());
@@ -396,7 +396,7 @@ void UDPTrackerClientTest::testTimeout()
     CPPUNIT_ASSERT_EQUAL((int)UDPT_ACT_CONNECT,
                          (int)bittorrent::getIntParam(data, 8));
     tr.requestSent(now);
-    now.advance(std::chrono::seconds(65));
+    now.advance(65_s);
     // 60 seconds 2nd stage timeout passed
     tr.handleTimeout(now);
     CPPUNIT_ASSERT(tr.getConnectRequests().empty());
@@ -428,7 +428,7 @@ void UDPTrackerClientTest::testTimeout()
     CPPUNIT_ASSERT_EQUAL((int)UDPT_ACT_ANNOUNCE,
                          (int)bittorrent::getIntParam(data, 8));
     tr.requestSent(now);
-    now.advance(std::chrono::seconds(20));
+    now.advance(20_s);
     // 15 seconds 1st stage timeout passed
     tr.handleTimeout(now);
     CPPUNIT_ASSERT(tr.getConnectRequests().empty());
@@ -439,7 +439,7 @@ void UDPTrackerClientTest::testTimeout()
     CPPUNIT_ASSERT_EQUAL((int)UDPT_ACT_ANNOUNCE,
                          (int)bittorrent::getIntParam(data, 8));
     tr.requestSent(now);
-    now.advance(std::chrono::seconds(65));
+    now.advance(65_s);
     // 60 seconds 2nd stage timeout passed
     tr.handleTimeout(now);
     CPPUNIT_ASSERT(tr.getConnectRequests().empty());
diff --git a/test/UTPexExtensionMessageTest.cc b/test/UTPexExtensionMessageTest.cc
index 9cf87690..cdb4910a 100644
--- a/test/UTPexExtensionMessageTest.cc
+++ b/test/UTPexExtensionMessageTest.cc
@@ -246,7 +246,7 @@ void UTPexExtensionMessageTest::testAddFreshPeer()
   std::shared_ptr<Peer> p1(new Peer("192.168.0.1", 6881));
   CPPUNIT_ASSERT(msg.addFreshPeer(p1));
   std::shared_ptr<Peer> p2(new Peer("10.1.1.2", 9999));
-  p2->setFirstContactTime(Timer(Timer().getTime() - std::chrono::seconds(61)));
+  p2->setFirstContactTime(Timer(Timer().getTime() - 61_s));
   CPPUNIT_ASSERT(!msg.addFreshPeer(p2));
   std::shared_ptr<Peer> p3(new Peer("10.1.1.3", 9999, true));
   CPPUNIT_ASSERT(!msg.addFreshPeer(p3));