From e2770dc2d3a166db7b3397fdec0142ed85573c33 Mon Sep 17 00:00:00 2001 From: Richard Thai Date: Wed, 23 Jul 2014 11:07:57 -0700 Subject: [PATCH] The cookie domains that were being compared were not case-insensitive which caused some tests to fail. --- .../com/squareup/okhttp/internal/http/CookiesTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/CookiesTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/CookiesTest.java index a44e6839f..9e8037937 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/CookiesTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/CookiesTest.java @@ -81,7 +81,7 @@ public class CookiesTest { assertEquals(null, cookie.getComment()); assertEquals(null, cookie.getCommentURL()); assertEquals(false, cookie.getDiscard()); - assertEquals(server.getCookieDomain(), cookie.getDomain()); + assertTrue(server.getCookieDomain().equalsIgnoreCase(cookie.getDomain())); assertTrue(cookie.getMaxAge() > 100000000000L); assertEquals("/path", cookie.getPath()); assertEquals(true, cookie.getSecure()); @@ -111,7 +111,7 @@ public class CookiesTest { assertEquals("this cookie is delicious", cookie.getComment()); assertEquals(null, cookie.getCommentURL()); assertEquals(false, cookie.getDiscard()); - assertEquals(server.getCookieDomain(), cookie.getDomain()); + assertTrue(server.getCookieDomain().equalsIgnoreCase(cookie.getDomain())); assertEquals(60, cookie.getMaxAge()); assertEquals("/path", cookie.getPath()); assertEquals(true, cookie.getSecure()); @@ -144,7 +144,7 @@ public class CookiesTest { assertEquals("this cookie is delicious", cookie.getComment()); assertEquals("http://google.com/", cookie.getCommentURL()); assertEquals(true, cookie.getDiscard()); - assertEquals(server.getCookieDomain(), cookie.getDomain()); + assertTrue(server.getCookieDomain().equalsIgnoreCase(cookie.getDomain())); assertEquals(60, cookie.getMaxAge()); assertEquals("/path", cookie.getPath()); assertEquals("80,443," + server.getPort(), cookie.getPortlist()); @@ -178,7 +178,7 @@ public class CookiesTest { assertEquals("this cookie is delicious", cookie.getComment()); assertEquals("http://google.com/", cookie.getCommentURL()); assertEquals(true, cookie.getDiscard()); - assertEquals(server.getCookieDomain(), cookie.getDomain()); + assertTrue(server.getCookieDomain().equalsIgnoreCase(cookie.getDomain())); assertEquals(60, cookie.getMaxAge()); assertEquals("/path", cookie.getPath()); assertEquals("80,443," + server.getPort(), cookie.getPortlist());