Rewrite Time with chrono

6 files changed, 25 insertions, 65 deletions

diff --git a/test/DHTRoutingTableDeserializerTest.cc b/test/DHTRoutingTableDeserializerTest.cc
index 3a6ec170..e98b2a32 100644
--- a/test/DHTRoutingTableDeserializerTest.cc
+++ b/test/DHTRoutingTableDeserializerTest.cc
@@ -60,8 +60,6 @@ void DHTRoutingTableDeserializerTest::testDeserialize()
   CPPUNIT_ASSERT(memcmp(localNode->getID(), d.getLocalNode()->getID(),
                         DHT_ID_LENGTH) == 0);
 
-  std::cout << d.getSerializedTime().getTime() << std::endl;
-
   CPPUNIT_ASSERT_EQUAL((size_t)2, d.getNodes().size());
   const std::vector<std::shared_ptr<DHTNode> >& dsnodes = d.getNodes();
   CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), dsnodes[0]->getIPAddress());
@@ -97,8 +95,6 @@ void DHTRoutingTableDeserializerTest::testDeserialize6()
   CPPUNIT_ASSERT(memcmp(localNode->getID(), d.getLocalNode()->getID(),
                         DHT_ID_LENGTH) == 0);
 
-  std::cout << d.getSerializedTime().getTime() << std::endl;
-
   CPPUNIT_ASSERT_EQUAL((size_t)2, d.getNodes().size());
   const std::vector<std::shared_ptr<DHTNode> >& dsnodes = d.getNodes();
   CPPUNIT_ASSERT_EQUAL(std::string("2001::1001"), dsnodes[0]->getIPAddress());
diff --git a/test/FileTest.cc b/test/FileTest.cc
index e5ea9596..5125dba6 100644
--- a/test/FileTest.cc
+++ b/test/FileTest.cc
@@ -261,7 +261,7 @@ void FileTest::testUtime()
   a2_struct_stat buf;
   CPPUNIT_ASSERT(0 == a2stat(utf8ToWChar(f.getPath()).c_str(), &buf));
   CPPUNIT_ASSERT_EQUAL((time_t)atime, (time_t)buf.st_atime);
-  CPPUNIT_ASSERT_EQUAL((time_t)mtime, f.getModifiedTime().getTime());
+  CPPUNIT_ASSERT_EQUAL((time_t)mtime, f.getModifiedTime().getTimeFromEpoch());
 
   File notFound(A2_TEST_OUT_DIR"/aria2_FileTest_testUTime_notFound");
   notFound.remove();
diff --git a/test/FtpConnectionTest.cc b/test/FtpConnectionTest.cc
index e24cd918..ace44482 100644
--- a/test/FtpConnectionTest.cc
+++ b/test/FtpConnectionTest.cc
@@ -164,7 +164,7 @@ void FtpConnectionTest::testReceiveMdtmResponse()
     serverSocket_->writeData("\r\n");
     waitRead(clientSocket_);
     CPPUNIT_ASSERT_EQUAL(213, ftp_->receiveMdtmResponse(t));
-    CPPUNIT_ASSERT_EQUAL((time_t)1220877792, t.getTime());
+    CPPUNIT_ASSERT_EQUAL((time_t)1220877792, t.getTimeFromEpoch());
   }
   {
     // see milli second part is ignored
@@ -172,7 +172,7 @@ void FtpConnectionTest::testReceiveMdtmResponse()
     serverSocket_->writeData("213 20080908124312.014\r\n");
     waitRead(clientSocket_);
     CPPUNIT_ASSERT_EQUAL(213, ftp_->receiveMdtmResponse(t));
-    CPPUNIT_ASSERT_EQUAL((time_t)1220877792, t.getTime());
+    CPPUNIT_ASSERT_EQUAL((time_t)1220877792, t.getTimeFromEpoch());
   }
   {
     // hhmmss part is missing
@@ -190,10 +190,10 @@ void FtpConnectionTest::testReceiveMdtmResponse()
     CPPUNIT_ASSERT_EQUAL(213, ftp_->receiveMdtmResponse(t));
 #ifdef HAVE_TIMEGM
     // Time will be normalized. Wed Jul 8 12:43:12 2009
-    CPPUNIT_ASSERT_EQUAL((time_t)1247056992, t.getTime());
+    CPPUNIT_ASSERT_EQUAL((time_t)1247056992, t.getTimeFromEpoch());
 #else // !HAVE_TIMEGM
     // The replacement timegm does not normalize.
-    CPPUNIT_ASSERT_EQUAL((time_t)-1, t.getTime());
+    CPPUNIT_ASSERT_EQUAL((time_t)-1, t.getTimeFromEpoch());
 #endif // !HAVE_TIMEGM
   }
   {
diff --git a/test/MultiDiskAdaptorTest.cc b/test/MultiDiskAdaptorTest.cc
index 406a28f7..28d9f3f0 100644
--- a/test/MultiDiskAdaptorTest.cc
+++ b/test/MultiDiskAdaptorTest.cc
@@ -427,14 +427,17 @@ void MultiDiskAdaptorTest::testUtime()
 
   CPPUNIT_ASSERT_EQUAL((size_t)2, adaptor.utime(Time(atime), Time(mtime)));
 
-  CPPUNIT_ASSERT_EQUAL((time_t)mtime,
-                       File(entries[0]->getPath()).getModifiedTime().getTime());
+  CPPUNIT_ASSERT_EQUAL(
+      (time_t)mtime,
+      File(entries[0]->getPath()).getModifiedTime().getTimeFromEpoch());
 
-  CPPUNIT_ASSERT_EQUAL((time_t)mtime,
-                       File(entries[3]->getPath()).getModifiedTime().getTime());
+  CPPUNIT_ASSERT_EQUAL(
+      (time_t)mtime,
+      File(entries[3]->getPath()).getModifiedTime().getTimeFromEpoch());
 
-  CPPUNIT_ASSERT((time_t)mtime !=
-                 File(entries[2]->getPath()).getModifiedTime().getTime());
+  CPPUNIT_ASSERT(
+      (time_t)mtime !=
+      File(entries[2]->getPath()).getModifiedTime().getTimeFromEpoch());
 }
 
 void MultiDiskAdaptorTest::testWriteCache()
diff --git a/test/ServerStatManTest.cc b/test/ServerStatManTest.cc
index 8b016c85..e87805e4 100644
--- a/test/ServerStatManTest.cc
+++ b/test/ServerStatManTest.cc
@@ -132,7 +132,7 @@ void ServerStatManTest::testLoad()
   CPPUNIT_ASSERT_EQUAL(102, localhost_http->getMultiConnectionAvgSpeed());
   CPPUNIT_ASSERT_EQUAL(6, localhost_http->getCounter());
   CPPUNIT_ASSERT_EQUAL(static_cast<time_t>(1210000000),
-                       localhost_http->getLastUpdated().getTime());
+                       localhost_http->getLastUpdated().getTimeFromEpoch());
   CPPUNIT_ASSERT_EQUAL(ServerStat::OK, localhost_http->getStatus());
 
   std::shared_ptr<ServerStat> mirror = ssm.find("mirror", "http");
@@ -159,7 +159,7 @@ void ServerStatManTest::testRemoveStaleServerStat()
   CPPUNIT_ASSERT(ssm.add(localhost_ftp));
   CPPUNIT_ASSERT(ssm.add(mirror));
 
-  ssm.removeStaleServerStat(24*60*60);
+  ssm.removeStaleServerStat(std::chrono::hours(24));
 
   CPPUNIT_ASSERT(ssm.find("localhost", "http"));
   CPPUNIT_ASSERT(!ssm.find("localhost", "ftp"));
diff --git a/test/TimeTest.cc b/test/TimeTest.cc
index ceea6594..3deb8c10 100644
--- a/test/TimeTest.cc
+++ b/test/TimeTest.cc
@@ -18,7 +18,6 @@ class TimeTest:public CppUnit::TestFixture {
   CPPUNIT_TEST(testParseAsctime);
   CPPUNIT_TEST(testParseHTTPDate);
   CPPUNIT_TEST(testOperatorLess);
-  CPPUNIT_TEST(testElapsed);
   CPPUNIT_TEST(testToHTTPDate);
   CPPUNIT_TEST_SUITE_END();
 public:
@@ -33,7 +32,6 @@ public:
   void testParseAsctime();
   void testParseHTTPDate();
   void testOperatorLess();
-  void testElapsed();
   void testToHTTPDate();
 };
 
@@ -43,47 +41,47 @@ CPPUNIT_TEST_SUITE_REGISTRATION(TimeTest);
 void TimeTest::testParseRFC1123()
 {
   Time t1 = Time::parseRFC1123("Sat, 06 Sep 2008 15:26:33 GMT");
-  CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTime());
+  CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTimeFromEpoch());
 }
 
 void TimeTest::testParseRFC1123Alt()
 {
   Time t1 = Time::parseRFC1123Alt("Sat, 06 Sep 2008 15:26:33 +0000");
-  CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTime());
+  CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTimeFromEpoch());
 }
 
 void TimeTest::testParseRFC850()
 {
   Time t1 = Time::parseRFC850("Saturday, 06-Sep-08 15:26:33 GMT");
-  CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTime());
+  CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTimeFromEpoch());
 }
 
 void TimeTest::testParseRFC850Ext()
 {
   Time t1 = Time::parseRFC850Ext("Saturday, 06-Sep-2008 15:26:33 GMT");
-  CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTime());
+  CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTimeFromEpoch());
 }
 
 void TimeTest::testParseAsctime()
 {
   Time t1 = Time::parseAsctime("Sun Sep  6 15:26:33 2008");
-  CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTime());
+  CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTimeFromEpoch());
 }
 
 void TimeTest::testParseHTTPDate()
 {
   CPPUNIT_ASSERT_EQUAL((time_t)1220714793,
                        Time::parseHTTPDate
-                       ("Sat, 06 Sep 2008 15:26:33 GMT").getTime());
+                       ("Sat, 06 Sep 2008 15:26:33 GMT").getTimeFromEpoch());
   CPPUNIT_ASSERT_EQUAL((time_t)1220714793,
                        Time::parseHTTPDate
-                       ("Sat, 06-Sep-2008 15:26:33 GMT").getTime());
+                       ("Sat, 06-Sep-2008 15:26:33 GMT").getTimeFromEpoch());
   CPPUNIT_ASSERT_EQUAL((time_t)1220714793,
                        Time::parseHTTPDate
-                       ("Sat, 06-Sep-08 15:26:33 GMT").getTime());
+                       ("Sat, 06-Sep-08 15:26:33 GMT").getTimeFromEpoch());
   CPPUNIT_ASSERT_EQUAL((time_t)1220714793,
                        Time::parseHTTPDate
-                       ("Sun Sep  6 15:26:33 2008").getTime());
+                       ("Sun Sep  6 15:26:33 2008").getTimeFromEpoch());
   CPPUNIT_ASSERT(Time::parseHTTPDate
                  ("Sat, 2008-09-06 15:26:33 GMT").bad());
 }
@@ -93,17 +91,6 @@ void TimeTest::testOperatorLess()
   CPPUNIT_ASSERT(Time(1) < Time(2));
   CPPUNIT_ASSERT(!(Time(1) < Time(1)));
   CPPUNIT_ASSERT(!(Time(2) < Time(1)));
-
-  struct timeval tv1;
-  tv1.tv_sec = 0;
-  tv1.tv_usec = 1;
-  struct timeval tv2;
-  tv2.tv_sec = 1;
-  tv2.tv_usec = 0;
-  CPPUNIT_ASSERT(Time(tv1) < Time(tv2));
-
-  tv2.tv_sec = 0;
-  CPPUNIT_ASSERT(Time(tv2) < Time(tv1));
 }
 
 void TimeTest::testToHTTPDate()
@@ -117,30 +104,4 @@ void TimeTest::testToHTTPDate()
 #endif // !__MINGW32__
 }
 
-void TimeTest::testElapsed()
-{
-  struct timeval now;
-  gettimeofday(&now, nullptr);
-  {
-    struct timeval tv = now;
-    CPPUNIT_ASSERT(!Time(tv).elapsed(1));
-  }
-  {
-    struct timeval tv;
-    suseconds_t usec = now.tv_usec+500000;
-    if(usec > 999999) {
-      tv.tv_sec = now.tv_sec+usec/1000000;
-      tv.tv_usec = usec%1000000;
-    } else {
-      tv.tv_sec = now.tv_sec;
-      tv.tv_usec = usec;
-    }
-    CPPUNIT_ASSERT(!Time(tv).elapsed(1));
-  }
-  {
-    struct timeval tv = { now.tv_sec-2, now.tv_usec };
-    CPPUNIT_ASSERT(Time(tv).elapsed(1));
-  }
-}
-
 } // namespace aria2