diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-06-09 03:04:38 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-06-09 03:15:10 +0900 |
| commit | b0f440e631efe18099ced96b604447b5fdce28d8 (patch) | |
| tree | d4a705616a58c314eab568772d5a3c4cc53bd69b /test/TimeTest.cc | |
| parent | 99cd73c0926f0c07d27777fde2f15816e8040030 (diff) | |
Rewrite Time with chrono
Diffstat (limited to 'test/TimeTest.cc')
| -rw-r--r-- | test/TimeTest.cc | 57 |
1 files changed, 9 insertions, 48 deletions
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 |