hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1646864 [2/2] - in /httpcomponents/httpclient/trunk/httpclient/src: main/java/org/apache/http/client/protocol/ main/java/org/apache/http/cookie/ main/java/org/apache/http/impl/cookie/ test/java/org/apache/http/client/protocol/ test/java/or...
Date Fri, 19 Dec 2014 20:59:43 GMT
Added: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestLaxCookieAttribHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestLaxCookieAttribHandlers.java?rev=1646864&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestLaxCookieAttribHandlers.java
(added)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestLaxCookieAttribHandlers.java
Fri Dec 19 20:59:42 2014
@@ -0,0 +1,317 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.impl.cookie;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import org.apache.http.cookie.CookieAttributeHandler;
+import org.apache.http.cookie.MalformedCookieException;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestLaxCookieAttribHandlers {
+
+    @Test
+    public void testParseMaxAge() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxMaxAgeHandler();
+        h.parse(cookie, "2000");
+        Assert.assertNotNull(cookie.getExpiryDate());
+    }
+
+    @Test
+    public void testParseMaxNegative() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxMaxAgeHandler();
+        h.parse(cookie, "-2000");
+        Assert.assertNotNull(cookie.getExpiryDate());
+    }
+
+    @Test
+    public void testParseMaxZero() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxMaxAgeHandler();
+        h.parse(cookie, "0000");
+        Assert.assertNotNull(cookie.getExpiryDate());
+    }
+
+    @Test
+    public void testBasicMaxAgeParseEmpty() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxMaxAgeHandler();
+        h.parse(cookie, "  ");
+        Assert.assertNull(cookie.getExpiryDate());
+    }
+
+    @Test
+    public void testBasicMaxAgeParseInvalid() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxMaxAgeHandler();
+        h.parse(cookie, "garbage");
+        Assert.assertNull(cookie.getExpiryDate());
+    }
+
+    @Test
+    public void testBasicMaxAgeInvalidInput() throws Exception {
+        final CookieAttributeHandler h = new LaxMaxAgeHandler();
+        try {
+            h.parse(null, "stuff");
+            Assert.fail("IllegalArgumentException must have been thrown");
+        } catch (final IllegalArgumentException ex) {
+            // expected
+        }
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testExpiryGarbage() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, ";;blah,blah;yada  ");
+    }
+
+    @Test
+    public void testParseExpiry() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "1:0:12 8-jan-2012");
+
+        final Date expiryDate = cookie.getExpiryDate();
+        Assert.assertNotNull(expiryDate);
+        final Calendar c = Calendar.getInstance();
+        c.setTimeZone(LaxExpiresHandler.UTC);
+        c.setTime(expiryDate);
+        Assert.assertEquals(2012, c.get(Calendar.YEAR));
+        Assert.assertEquals(Calendar.JANUARY, c.get(Calendar.MONTH));
+        Assert.assertEquals(8, c.get(Calendar.DAY_OF_MONTH));
+        Assert.assertEquals(1, c.get(Calendar.HOUR_OF_DAY));
+        Assert.assertEquals(0, c.get(Calendar.MINUTE));
+        Assert.assertEquals(12, c.get(Calendar.SECOND));
+        Assert.assertEquals(0, c.get(Calendar.MILLISECOND));
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseExpiryInvalidTime1() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "1:0:122 8 dec 1980");
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseExpiryInvalidTime2() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "24:00:00 8 dec 1980");
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseExpiryInvalidTime3() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "23:60:00 8 dec 1980");
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseExpiryInvalidTime4() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "23:00:60 8 dec 1980");
+    }
+
+    @Test
+    public void testParseExpiryFunnyTime() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "1:59:00blah; 8-feb-2000");
+
+        final Date expiryDate = cookie.getExpiryDate();
+        Assert.assertNotNull(expiryDate);
+        final Calendar c = Calendar.getInstance();
+        c.setTimeZone(LaxExpiresHandler.UTC);
+        c.setTime(expiryDate);
+        Assert.assertEquals(2000, c.get(Calendar.YEAR));
+        Assert.assertEquals(Calendar.FEBRUARY, c.get(Calendar.MONTH));
+        Assert.assertEquals(8, c.get(Calendar.DAY_OF_MONTH));
+        Assert.assertEquals(1, c.get(Calendar.HOUR_OF_DAY));
+        Assert.assertEquals(59, c.get(Calendar.MINUTE));
+        Assert.assertEquals(0, c.get(Calendar.SECOND));
+        Assert.assertEquals(0, c.get(Calendar.MILLISECOND));
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseExpiryInvalidDayOfMonth1() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "12:00:00 888 mar 1880");
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseExpiryInvalidDayOfMonth2() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "12:00:00 0 mar 1880");
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseExpiryInvalidDayOfMonth3() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "12:00:00 32 mar 1880");
+    }
+
+    @Test
+    public void testParseExpiryFunnyDayOfMonth() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "12:00:00 8blah;mar;1880");
+
+        final Date expiryDate = cookie.getExpiryDate();
+        Assert.assertNotNull(expiryDate);
+        final Calendar c = Calendar.getInstance();
+        c.setTimeZone(LaxExpiresHandler.UTC);
+        c.setTime(expiryDate);
+        Assert.assertEquals(1880, c.get(Calendar.YEAR));
+        Assert.assertEquals(Calendar.MARCH, c.get(Calendar.MONTH));
+        Assert.assertEquals(8, c.get(Calendar.DAY_OF_MONTH));
+        Assert.assertEquals(12, c.get(Calendar.HOUR_OF_DAY));
+        Assert.assertEquals(0, c.get(Calendar.MINUTE));
+        Assert.assertEquals(0, c.get(Calendar.SECOND));
+        Assert.assertEquals(0, c.get(Calendar.MILLISECOND));
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseExpiryInvalidMonth() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "1:00:00 8 dek 80");
+    }
+
+    @Test
+    public void testParseExpiryFunnyMonth() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "23:59:59; 1-ApriLLLLL-2008");
+
+        final Date expiryDate = cookie.getExpiryDate();
+        Assert.assertNotNull(expiryDate);
+        final Calendar c = Calendar.getInstance();
+        c.setTimeZone(LaxExpiresHandler.UTC);
+        c.setTime(expiryDate);
+        Assert.assertEquals(2008, c.get(Calendar.YEAR));
+        Assert.assertEquals(Calendar.APRIL, c.get(Calendar.MONTH));
+        Assert.assertEquals(1, c.get(Calendar.DAY_OF_MONTH));
+        Assert.assertEquals(23, c.get(Calendar.HOUR_OF_DAY));
+        Assert.assertEquals(59, c.get(Calendar.MINUTE));
+        Assert.assertEquals(59, c.get(Calendar.SECOND));
+        Assert.assertEquals(0, c.get(Calendar.MILLISECOND));
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseExpiryInvalidYearTooShort() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "1:00:00 8 dec 8");
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseExpiryInvalidYearTooLong() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "1:00:00 8 dec 88888");
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseExpiryInvalidYearTooLongAgo() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "1:00:00 8 dec 1600");
+    }
+
+    @Test
+    public void testParseExpiryFunnyYear() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "23:59:59; 1-Apr-2008blah");
+
+        final Date expiryDate = cookie.getExpiryDate();
+        Assert.assertNotNull(expiryDate);
+        final Calendar c = Calendar.getInstance();
+        c.setTimeZone(LaxExpiresHandler.UTC);
+        c.setTime(expiryDate);
+        Assert.assertEquals(2008, c.get(Calendar.YEAR));
+        Assert.assertEquals(Calendar.APRIL, c.get(Calendar.MONTH));
+        Assert.assertEquals(1, c.get(Calendar.DAY_OF_MONTH));
+        Assert.assertEquals(23, c.get(Calendar.HOUR_OF_DAY));
+        Assert.assertEquals(59, c.get(Calendar.MINUTE));
+        Assert.assertEquals(59, c.get(Calendar.SECOND));
+        Assert.assertEquals(0, c.get(Calendar.MILLISECOND));
+    }
+
+    @Test
+    public void testParseExpiryYearTwoDigit1() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "23:59:59; 1-Apr-70");
+
+        final Date expiryDate = cookie.getExpiryDate();
+        Assert.assertNotNull(expiryDate);
+        final Calendar c = Calendar.getInstance();
+        c.setTimeZone(LaxExpiresHandler.UTC);
+        c.setTime(expiryDate);
+        Assert.assertEquals(1970, c.get(Calendar.YEAR));
+    }
+
+    @Test
+    public void testParseExpiryYearTwoDigit2() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "23:59:59; 1-Apr-99");
+
+        final Date expiryDate = cookie.getExpiryDate();
+        Assert.assertNotNull(expiryDate);
+        final Calendar c = Calendar.getInstance();
+        c.setTimeZone(LaxExpiresHandler.UTC);
+        c.setTime(expiryDate);
+        Assert.assertEquals(1999, c.get(Calendar.YEAR));
+    }
+
+    @Test
+    public void testParseExpiryYearTwoDigit3() throws Exception {
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        final CookieAttributeHandler h = new LaxExpiresHandler();
+        h.parse(cookie, "23:59:59; 1-Apr-00");
+
+        final Date expiryDate = cookie.getExpiryDate();
+        Assert.assertNotNull(expiryDate);
+        final Calendar c = Calendar.getInstance();
+        c.setTimeZone(LaxExpiresHandler.UTC);
+        c.setTime(expiryDate);
+        Assert.assertEquals(2000, c.get(Calendar.YEAR));
+    }
+
+}

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestLaxCookieAttribHandlers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestLaxCookieAttribHandlers.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestLaxCookieAttribHandlers.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestRFC6265CookieSpecBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestRFC6265CookieSpecBase.java?rev=1646864&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestRFC6265CookieSpecBase.java
(added)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestRFC6265CookieSpecBase.java
Fri Dec 19 20:59:42 2014
@@ -0,0 +1,337 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.impl.cookie;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.http.Header;
+import org.apache.http.cookie.ClientCookie;
+import org.apache.http.cookie.CommonCookieAttributeHandler;
+import org.apache.http.cookie.Cookie;
+import org.apache.http.cookie.CookieOrigin;
+import org.apache.http.cookie.MalformedCookieException;
+import org.apache.http.cookie.SetCookie;
+import org.apache.http.message.BasicHeader;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class TestRFC6265CookieSpecBase {
+
+    @Test
+    public void testParseCookieBasics() throws Exception {
+        final CommonCookieAttributeHandler h1 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h1.getAttributeName()).thenReturn("this");
+        final CommonCookieAttributeHandler h2 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h2.getAttributeName()).thenReturn("that");
+
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase(h1, h2);
+
+        final Header header = new BasicHeader("Set-Cookie", "name = value ; this = stuff;");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        final List<Cookie> cookies = cookiespec.parse(header, origin);
+
+        Assert.assertEquals(1, cookies.size());
+        final Cookie cookie = cookies.get(0);
+        Assert.assertEquals("name", cookie.getName());
+        Assert.assertEquals("value", cookie.getValue());
+        Assert.assertEquals("/path", cookie.getPath());
+        Assert.assertEquals("host", cookie.getDomain());
+        Assert.assertTrue(cookie instanceof ClientCookie);
+        final ClientCookie clientCookie = (ClientCookie) cookie;
+        Assert.assertEquals("stuff", clientCookie.getAttribute("this"));
+        Assert.assertEquals(null, clientCookie.getAttribute("that"));
+
+        Mockito.verify(h1).parse(Mockito.<SetCookie>any(), Mockito.eq("stuff"));
+        Mockito.verify(h2, Mockito.never()).parse(Mockito.<SetCookie>any(), Mockito.anyString());
+    }
+
+    @Test
+    public void testParseCookieQuotedValue() throws Exception {
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase();
+
+        final Header header = new BasicHeader("Set-Cookie", "name = \" one, two, three; four
\" ; this = stuff;");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        final List<Cookie> cookies = cookiespec.parse(header, origin);
+
+        Assert.assertEquals(1, cookies.size());
+        final Cookie cookie = cookies.get(0);
+        Assert.assertEquals("name", cookie.getName());
+        Assert.assertEquals(" one, two, three; four ", cookie.getValue());
+        Assert.assertTrue(cookie instanceof ClientCookie);
+        final ClientCookie clientCookie = (ClientCookie) cookie;
+        Assert.assertEquals("stuff", clientCookie.getAttribute("this"));
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseCookieWrongHeader() throws Exception {
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase();
+
+        final Header header = new BasicHeader("Set-Cookie2", "blah");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        cookiespec.parse(header, origin);
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseCookieMissingName() throws Exception {
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase();
+
+        final Header header = new BasicHeader("Set-Cookie", "=blah ; this = stuff;");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        cookiespec.parse(header, origin);
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseCookieMissingValue1() throws Exception {
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase();
+
+        final Header header = new BasicHeader("Set-Cookie", "blah");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        cookiespec.parse(header, origin);
+    }
+
+    @Test(expected = MalformedCookieException.class)
+    public void testParseCookieMissingValue2() throws Exception {
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase();
+
+        final Header header = new BasicHeader("Set-Cookie", "blah;");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        cookiespec.parse(header, origin);
+    }
+
+    @Test
+    public void testParseCookieEmptyValue() throws Exception {
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase();
+
+        final Header header = new BasicHeader("Set-Cookie", "blah=;");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        final List<Cookie> cookies = cookiespec.parse(header, origin);
+        Assert.assertEquals(1, cookies.size());
+        final Cookie cookie = cookies.get(0);
+        Assert.assertEquals("blah", cookie.getName());
+        Assert.assertEquals("", cookie.getValue());
+    }
+
+    @Test
+    public void testParseCookieWithAttributes() throws Exception {
+        final CommonCookieAttributeHandler h1 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h1.getAttributeName()).thenReturn("this");
+        final CommonCookieAttributeHandler h2 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h2.getAttributeName()).thenReturn("that");
+
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase(h1, h2);
+
+        final Header header = new BasicHeader("Set-Cookie", "name = value ; p1 = v ; p2 =
v,0; p3 ; p4");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        final List<Cookie> cookies = cookiespec.parse(header, origin);
+
+        Assert.assertEquals(1, cookies.size());
+        final Cookie cookie = cookies.get(0);
+        Assert.assertEquals("name", cookie.getName());
+        Assert.assertEquals("value", cookie.getValue());
+        Assert.assertTrue(cookie instanceof ClientCookie);
+        final ClientCookie clientCookie = (ClientCookie) cookie;
+        Assert.assertEquals("v", clientCookie.getAttribute("p1"));
+        Assert.assertEquals("v,0", clientCookie.getAttribute("p2"));
+        Assert.assertTrue(clientCookie.containsAttribute("p3"));
+        Assert.assertTrue(clientCookie.containsAttribute("p4"));
+        Assert.assertFalse(clientCookie.containsAttribute("p5"));
+    }
+
+    @Test
+    public void testParseCookieWithAttributes2() throws Exception {
+        final CommonCookieAttributeHandler h1 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h1.getAttributeName()).thenReturn("this");
+        final CommonCookieAttributeHandler h2 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h2.getAttributeName()).thenReturn("that");
+
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase(h1, h2);
+
+        final Header header = new BasicHeader("Set-Cookie", "name = value ; p1 = v");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        final List<Cookie> cookies = cookiespec.parse(header, origin);
+
+        Assert.assertEquals(1, cookies.size());
+        final Cookie cookie = cookies.get(0);
+        Assert.assertEquals("name", cookie.getName());
+        Assert.assertEquals("value", cookie.getValue());
+        Assert.assertTrue(cookie instanceof ClientCookie);
+        final ClientCookie clientCookie = (ClientCookie) cookie;
+        Assert.assertEquals("v", clientCookie.getAttribute("p1"));
+    }
+
+    @Test
+    public void testParseCookieWithAttributes3() throws Exception {
+        final CommonCookieAttributeHandler h1 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h1.getAttributeName()).thenReturn("this");
+        final CommonCookieAttributeHandler h2 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h2.getAttributeName()).thenReturn("that");
+
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase(h1, h2);
+
+        final Header header = new BasicHeader("Set-Cookie", "name = value ; p1 =");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        final List<Cookie> cookies = cookiespec.parse(header, origin);
+
+        Assert.assertEquals(1, cookies.size());
+        final Cookie cookie = cookies.get(0);
+        Assert.assertEquals("name", cookie.getName());
+        Assert.assertEquals("value", cookie.getValue());
+        Assert.assertTrue(cookie instanceof ClientCookie);
+        final ClientCookie clientCookie = (ClientCookie) cookie;
+        Assert.assertEquals("", clientCookie.getAttribute("p1"));
+    }
+
+    @Test
+    public void testValidateCookieBasics() throws Exception {
+        final CommonCookieAttributeHandler h1 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h1.getAttributeName()).thenReturn("this");
+        final CommonCookieAttributeHandler h2 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h2.getAttributeName()).thenReturn("that");
+
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase(h1, h2);
+
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+        cookiespec.validate(cookie, origin);
+
+        Mockito.verify(h1).validate(cookie, origin);
+        Mockito.verify(h2).validate(cookie, origin);
+    }
+
+    @Test
+    public void testMatchCookie() throws Exception {
+        final CommonCookieAttributeHandler h1 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h1.getAttributeName()).thenReturn("this");
+        final CommonCookieAttributeHandler h2 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h2.getAttributeName()).thenReturn("that");
+
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase(h1, h2);
+
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+
+        Mockito.when(h1.match(cookie, origin)).thenReturn(true);
+        Mockito.when(h2.match(cookie, origin)).thenReturn(true);
+
+        Assert.assertTrue(cookiespec.match(cookie, origin));
+
+        Mockito.verify(h1).match(cookie, origin);
+        Mockito.verify(h2).match(cookie, origin);
+    }
+
+    @Test
+    public void testMatchCookieNoMatch() throws Exception {
+        final CommonCookieAttributeHandler h1 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h1.getAttributeName()).thenReturn("this");
+        final CommonCookieAttributeHandler h2 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h2.getAttributeName()).thenReturn("that");
+
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase(h1, h2);
+
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+
+        Mockito.when(h1.match(cookie, origin)).thenReturn(false);
+        Mockito.when(h2.match(cookie, origin)).thenReturn(false);
+
+        Assert.assertFalse(cookiespec.match(cookie, origin));
+
+        Mockito.verify(h1).match(cookie, origin);
+        Mockito.verify(h2, Mockito.never()).match(cookie, origin);
+    }
+
+    @Test
+    public void testLegacy() throws Exception {
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase();
+
+        Assert.assertEquals(0, cookiespec.getVersion());
+        Assert.assertEquals(null, cookiespec.getVersionHeader());
+    }
+
+    @Test
+    public void testFormatCookiesBasics() throws Exception {
+        final Cookie cookie1 = new BasicClientCookie("name1", "value");
+
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase();
+        final List<Header> headers = cookiespec.formatCookies(Arrays.asList(cookie1));
+        Assert.assertNotNull(headers);
+        Assert.assertEquals(1, headers.size());
+        final Header header = headers.get(0);
+        Assert.assertEquals("Cookie", header.getName());
+        Assert.assertEquals("name1=value", header.getValue());
+    }
+
+    @Test
+    public void testFormatCookiesIllegalCharsInValue() throws Exception {
+        final Cookie cookie1 = new BasicClientCookie("name1", "value");
+        final Cookie cookie2 = new BasicClientCookie("name2", "some value");
+        final Cookie cookie3 = new BasicClientCookie("name3", "\"\\\"");
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase();
+        final List<Header> headers = cookiespec.formatCookies(Arrays.asList(cookie1,
cookie2, cookie3));
+        Assert.assertNotNull(headers);
+        Assert.assertEquals(1, headers.size());
+        final Header header = headers.get(0);
+        Assert.assertEquals("Cookie", header.getName());
+        Assert.assertEquals("name1=value; name2=\"some value\"; name3=\"\\\"\\\\\\\"\"",
header.getValue());
+    }
+
+    @Test
+    public void testParseCookieMultipleAttributes() throws Exception {
+        final CommonCookieAttributeHandler h1 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h1.getAttributeName()).thenReturn("this");
+
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase(h1);
+
+        final Header header = new BasicHeader("Set-Cookie", "name = value ; this = stuff;
this = morestuff;");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        cookiespec.parse(header, origin);
+
+        Mockito.verify(h1).parse(Mockito.<SetCookie>any(), Mockito.eq("morestuff"));
+        Mockito.verify(h1, Mockito.times(1)).parse(Mockito.<SetCookie>any(), Mockito.anyString());
+    }
+
+    @Test
+    public void testParseCookieMaxAgeOverExpires() throws Exception {
+        final CommonCookieAttributeHandler h1 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h1.getAttributeName()).thenReturn("Expires");
+        final CommonCookieAttributeHandler h2 = Mockito.mock(CommonCookieAttributeHandler.class);
+        Mockito.when(h2.getAttributeName()).thenReturn("Max-Age");
+
+        final RFC6265CookieSpecBase cookiespec = new RFC6265CookieSpecBase(h1, h2);
+
+        final Header header = new BasicHeader("Set-Cookie", "name = value ; expires = stuff;
max-age = otherstuff;");
+        final CookieOrigin origin = new CookieOrigin("host", 80, "/path/", true);
+        cookiespec.parse(header, origin);
+
+        Mockito.verify(h1, Mockito.never()).parse(Mockito.<SetCookie>any(), Mockito.anyString());
+        Mockito.verify(h2).parse(Mockito.<SetCookie>any(), Mockito.eq("otherstuff"));
+    }
+
+}

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestRFC6265CookieSpecBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestRFC6265CookieSpecBase.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestRFC6265CookieSpecBase.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message