[Httpunit-commit] SF.net SVN: httpunit:[1033] trunk/httpunit/test/com/meterware/httpunit/ cookies/CookieTest.java

[<wol...@us...>]

Revision: 1033
          http://httpunit.svn.sourceforge.net/httpunit/?rev=1033&view=rev
Author:   wolfgang_fahl
Date:     2009-08-17 13:11:19 +0000 (Mon, 17 Aug 2009)

Log Message:
-----------
fix by James Courtney

Modified Paths:
--------------
    trunk/httpunit/test/com/meterware/httpunit/cookies/CookieTest.java

Modified: trunk/httpunit/test/com/meterware/httpunit/cookies/CookieTest.java
===================================================================
--- trunk/httpunit/test/com/meterware/httpunit/cookies/CookieTest.java	2009-08-17 12:58:51 UTC (rev 1032)
+++ trunk/httpunit/test/com/meterware/httpunit/cookies/CookieTest.java	2009-08-17 13:11:19 UTC (rev 1033)
@@ -180,17 +180,18 @@
                          "expires=Tue, 29-Mar-2005 19:30:42 GMT; Max-Age=2592000",
                          "Max-Age=2592000;expires=Tue, 29-Mar-2005 19:30:42 GMT",
                          "expires=Tue, 29-Mar-2005 19:30:42 GMT",
-                         "Expires=Wednesday, 01-Jan-1970 0:0:00 GMT"
+                         "Expires=Wednesday, 01-Jan-1970 00:00:00 GMT"
                          };
-        long expectedMilliSeconds[] = {System.currentTimeMillis() + 5000 * 1000,
-                                       System.currentTimeMillis() + 3000 * 1000,
+        long now=System.currentTimeMillis();
+        long expectedMilliSeconds[] = {now + 5000 * 1000,
+                                       now + 3000 * 1000,
+                                       now + 2592000 * 1000,
+                                       now + 2592000 * 1000,
                                        1112124642000l,
-                                       1112124642000l,
-                                       1112124642000l,
                                        0};
 
         for (int i = 0; i < ages.length; i++) {
-            String cookieName = "cookie" + i;
+            String cookieName = "cookie" + i ;
             String header = cookieName + "=cookievalue;" + ages[i];
             TestSource source = new TestSource( new URL( "http://www.somedomain.com/somepath/" ), header );
             CookieJar jar = new CookieJar( source );
@@ -199,10 +200,10 @@
 
             long expiredTime = cookie.getExpiredTime();
             int grace = 3000;
-            assertTrue( cookieName + " expiration expect on or after" +
+            assertTrue( cookieName + " '"+ages[i]+"' expiration expect on or after" +
             expectedMilliSeconds[i] + " but was " + expiredTime,
             expectedMilliSeconds[i] <= expiredTime );
-            assertTrue( cookieName + " expiration expect before " +
+            assertTrue( cookieName + " '"+ages[i]+"' expiration expect before " +
             (expectedMilliSeconds[i] + grace) + " but was " + expiredTime,
             (expectedMilliSeconds[i]) + grace > expiredTime );
             //  assertEquals( cookieName + " expiration", expiredTime, expectedMilliSeconds[i] );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.