diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-09-14 09:18:49 +0200 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:21 +0100 |
commit | b48b717506c2d40958b5b627863be90aca81cf51 (patch) | |
tree | ec5372c5b5d6ac83221ffb035c2bbfe5d413e086 /jdisc_http_service/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java | |
parent | 178903a8b938738e7fc1db18eea850863f9461ed (diff) |
Fix todos in Cookie
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java')
-rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java index dab4f91f631..4c651f79666 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java @@ -131,7 +131,6 @@ public class CookieTestCase { } @Test - @SuppressWarnings("deprecation") public void requireThatSetCookieCanBeDecoded() { final Cookie foo = new Cookie(); foo.setName("foo.name"); @@ -141,7 +140,6 @@ public class CookieTestCase { foo.setMaxAge(0, TimeUnit.SECONDS); foo.setSecure(true); foo.setHttpOnly(true); - foo.setVersion(1); assertDecodeSetCookie(foo, "foo.name=foo.value;Max-Age=0;Path=path;Domain=domain;Secure;HTTPOnly;"); final Cookie bar = new Cookie(); @@ -150,7 +148,6 @@ public class CookieTestCase { bar.setPath("path"); bar.setDomain("domain"); bar.setMaxAge(0, TimeUnit.SECONDS); - bar.setVersion(1); assertDecodeSetCookie(bar, "bar.name=bar.value;Max-Age=0;Path=path;Domain=domain;"); } @@ -193,11 +190,13 @@ public class CookieTestCase { } private static void assertEncodeCookie(String expectedResult, List<Cookie> cookies) { - assertThat(Cookie.toCookieHeader(cookies), equalTo(expectedResult)); + String actual = Cookie.toCookieHeader(cookies); + String expectedResult1 = expectedResult; + assertThat(actual, equalTo(expectedResult1)); } private static void assertEncodeSetCookie(List<String> expectedResult, List<Cookie> cookies) { - assertThat(Cookie.toSetCookieHeaderAll(cookies), containsInAnyOrder(expectedResult.toArray())); + assertThat(Cookie.toSetCookieHeaders(cookies), containsInAnyOrder(expectedResult.toArray())); } private static void assertDecodeCookie(List<Cookie> expected, String toDecode) { @@ -205,7 +204,7 @@ public class CookieTestCase { } private static void assertDecodeSetCookie(final Cookie expected, String toDecode) { - assertThat(Cookie.fromSetCookieHeader(toDecode), containsInAnyOrder(expected)); + assertThat(Cookie.fromSetCookieHeader(toDecode), equalTo(expected)); } private static Cookie newCookie(final String name) { |