diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-11-05 10:30:43 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-11-05 10:30:43 +0000 |
| commit | 4797b0e72dc8de97a04670f66a98a249065052fc (patch) | |
| tree | f02201df487cd117bcdd444f6ac484e87e4990fb /test | |
| parent | 7513095042eab655db052a7d2b2d0a934fc68261 (diff) | |
2008-11-05 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Handle date before epoch.
To create *bad* Time object, call Time::null().
* src/CookieParser.cc
* src/FtpConnection.cc
* src/FtpConnection.h
* src/FtpNegotiationCommand.cc
* src/RequestGroup.cc
* src/TimeA2.cc
* src/TimeA2.h
* test/CookieParserTest.cc
* test/FtpConnectionTest.cc
* test/TimeTest.cc
Diffstat (limited to 'test')
| -rw-r--r-- | test/CookieParserTest.cc | 5 | ||||
| -rw-r--r-- | test/FtpConnectionTest.cc | 4 | ||||
| -rw-r--r-- | test/TimeTest.cc | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/test/CookieParserTest.cc b/test/CookieParserTest.cc index 2f39f1fa..44c51383 100644 --- a/test/CookieParserTest.cc +++ b/test/CookieParserTest.cc @@ -52,10 +52,11 @@ void CookieParserTest::testParse() c = CookieParser().parse(str3); CPPUNIT_ASSERT(!c.good()); - std::string str4 = "UID=300; expires=Wed, 01-Jan-1890 00:00:00 GMT;"; + std::string str4 = "UID=300; expires=Wed, 01-Jan-1890 00:00:00 GMT"; c = CookieParser().parse(str4, "localhost", "/"); CPPUNIT_ASSERT(c.good()); - CPPUNIT_ASSERT(c.isSessionCookie()); + CPPUNIT_ASSERT(!c.isSessionCookie()); + CPPUNIT_ASSERT_EQUAL((time_t)-2524521600, c.getExpiry()); std::string str5 = "k=v; expires=Sun, 10-Jun-07 11:00:00 GMT"; c = CookieParser().parse(str5); diff --git a/test/FtpConnectionTest.cc b/test/FtpConnectionTest.cc index 2a4e4812..6fb9699b 100644 --- a/test/FtpConnectionTest.cc +++ b/test/FtpConnectionTest.cc @@ -149,14 +149,14 @@ void FtpConnectionTest::testReceiveMdtmResponse() Time t; _serverSocket->writeData("213 20080908\r\n"); CPPUNIT_ASSERT_EQUAL((unsigned int)213, _ftp->receiveMdtmResponse(t)); - CPPUNIT_ASSERT_EQUAL((time_t)-1, t.getTime()); + CPPUNIT_ASSERT(t.bad()); } { // invalid month: 19 Time t; _serverSocket->writeData("213 20081908124312\r\n"); CPPUNIT_ASSERT_EQUAL((unsigned int)213, _ftp->receiveMdtmResponse(t)); - CPPUNIT_ASSERT_EQUAL((time_t)-1, t.getTime()); + CPPUNIT_ASSERT(t.bad()); } { Time t; diff --git a/test/TimeTest.cc b/test/TimeTest.cc index 4b55e239..b51e7ce5 100644 --- a/test/TimeTest.cc +++ b/test/TimeTest.cc @@ -64,9 +64,8 @@ void TimeTest::testParseHTTPDate() CPPUNIT_ASSERT_EQUAL((time_t)1220714793, Time::parseHTTPDate ("Sat, 06-Sep-08 15:26:33 GMT").getTime()); - CPPUNIT_ASSERT_EQUAL((time_t)-1, - Time::parseHTTPDate - ("Sat, 2008-09-06 15:26:33 GMT").getTime()); + CPPUNIT_ASSERT(Time::parseHTTPDate + ("Sat, 2008-09-06 15:26:33 GMT").bad()); } void TimeTest::testOperatorLess() |