Index: C:/Documents and Settings/Ortwin/My Documents/code/HttpClient-3/src/test/org/apache/commons/httpclient/cookie/TestCookieRFC2109Spec.java =================================================================== --- C:/Documents and Settings/Ortwin/My Documents/code/HttpClient-3/src/test/org/apache/commons/httpclient/cookie/TestCookieRFC2109Spec.java (revision 240197) +++ C:/Documents and Settings/Ortwin/My Documents/code/HttpClient-3/src/test/org/apache/commons/httpclient/cookie/TestCookieRFC2109Spec.java (working copy) @@ -333,7 +333,7 @@ Cookie[] cookies = cookiespec.parse("myhost.mydomain.com", 80, "/", false, header ); cookiespec.validate("myhost.mydomain.com", 80, "/", false, cookies[0]); String s1 = cookiespec.formatCookie(cookies[0]); - assertEquals(s1, "$Version=\"1\"; name=\"value\"; $Domain=\".mydomain.com\"; $Path=\"/\""); + assertEquals(s1, "$Version=\"1\"; name=\"value\"; $Path=\"/\"; $Domain=\".mydomain.com\""); header = new Header( "Set-Cookie", "name=value; path=/; domain=.mydomain.com"); @@ -340,7 +340,7 @@ cookies = cookiespec.parse("myhost.mydomain.com", 80, "/", false, header ); cookiespec.validate("myhost.mydomain.com", 80, "/", false, cookies[0]); String s2 = cookiespec.formatCookie(cookies[0]); - assertEquals(s2, "$Version=0; name=value; $Domain=.mydomain.com; $Path=/"); + assertEquals(s2, "$Version=0; name=value; $Path=/; $Domain=.mydomain.com"); } public void testRFC2109CookiesFormatting() throws Exception { @@ -353,8 +353,8 @@ assertEquals(2, cookies.length); String s1 = cookiespec.formatCookies(cookies); assertEquals(s1, - "$Version=0; name1=value1; $Domain=.mydomain.com; $Path=/; " + - "name2=value2; $Domain=.mydomain.com; $Path=/"); + "$Version=0; name1=value1; $Path=/; $Domain=.mydomain.com; " + + "name2=value2; $Path=/; $Domain=.mydomain.com"); header = new Header("Set-Cookie", "name1=value1; version=1; path=/; domain=.mydomain.com, " + @@ -364,8 +364,8 @@ assertEquals(2, cookies.length); String s2 = cookiespec.formatCookies(cookies); assertEquals(s2, - "$Version=\"1\"; name1=\"value1\"; $Domain=\".mydomain.com\"; $Path=\"/\"; " + - "name2=\"value2\"; $Domain=\".mydomain.com\"; $Path=\"/\""); + "$Version=\"1\"; name1=\"value1\"; $Path=\"/\"; $Domain=\".mydomain.com\"; " + + "name2=\"value2\"; $Path=\"/\"; $Domain=\".mydomain.com\""); } /** @@ -378,11 +378,11 @@ CookieSpec cookiespec = new RFC2109Spec(); String s = cookiespec.formatCookie(cookie); - assertEquals("$Version=0; name=; $Domain=.whatever.com; $Path=/", s); + assertEquals("$Version=0; name=; $Path=/; $Domain=.whatever.com", s); cookie.setVersion(1); s = cookiespec.formatCookie(cookie); - assertEquals("$Version=\"1\"; name=\"\"; $Domain=\".whatever.com\"; $Path=\"/\"", s); + assertEquals("$Version=\"1\"; name=\"\"; $Path=\"/\"; $Domain=\".whatever.com\"", s); } public void testCookieNullDomainNullPathFormatting() {