Fix broken CTS HttpCookie test

Added some test cases and corrected the test to conform
to the RI behavior.

Change-Id: Ib32baf2e923c50fca1a5a4cb7cbd7f55ed70e760
Bug: 13748507

1 files changed, 10 insertions, 2 deletions

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java
index faf0f2a..306e697 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java
@@ -590,8 +590,7 @@ public class HttpCookieTest extends TestCase {
         list = HttpCookie
                 .parse("Set-Cookie:name=test;max-age=-12345;");
         cookie = list.get(0);
-        // This currently fails, we accept a negative max-age.
-        assertEquals(0, cookie.getMaxAge());
+        assertEquals(-12345, cookie.getMaxAge());
         assertTrue(cookie.hasExpired());
 
         // Locale does not affect version 1 cookie.
@@ -695,6 +694,15 @@ public class HttpCookieTest extends TestCase {
         cookie = list.get(0);
         assertEquals(-1000, cookie.getMaxAge());
 
+        // TODO: Uncomment when Long.parseLong() accepts numbers with a leading +
+        // list = HttpCookie.parse("Set-Cookie:name=test;max-age=+12345;");
+        // cookie = list.get(0);
+        // assertEquals(12345, cookie.getMaxAge());
+
+        list = HttpCookie.parse("Set-Cookie:name=test;max-age=0;");
+        cookie = list.get(0);
+        assertEquals(0, cookie.getMaxAge());
+
         // Check portlist
         list = HttpCookie.parse("Set-Cookie:name=tes,t;port");
         cookie = list.get(0);