1 files changed, 39 insertions, 41 deletions
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java
index cf43a6470bc..3f18d41badd 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.http;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -9,9 +9,7 @@ import java.util.concurrent.TimeUnit;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author Simon Thoresen Hult
@@ -20,19 +18,19 @@ import static org.junit.Assert.assertTrue;
 public class CookieTestCase {
 
     @Test
-    public void requireThatDefaultValuesAreSane() {
+    void requireThatDefaultValuesAreSane() {
         Cookie cookie = new Cookie("foo", "bar");
         assertEquals("foo", cookie.getName());
         assertEquals("bar", cookie.getValue());
-        assertEquals(null, cookie.getDomain());
+        assertNull(cookie.getDomain());
         assertEquals(Integer.MIN_VALUE, cookie.getMaxAge(TimeUnit.SECONDS));
-        assertEquals(null, cookie.getPath());
+        assertNull(cookie.getPath());
         assertEquals(false, cookie.isHttpOnly());
         assertEquals(false, cookie.isSecure());
     }
 
     @Test
-    public void requireThatAccessorsWork() {
+    void requireThatAccessorsWork() {
         final Cookie cookie = new Cookie();
         cookie.setName("foo");
         assertEquals("foo", cookie.getName());
@@ -70,7 +68,7 @@ public class CookieTestCase {
     }
 
     @Test
-    public void requireThatCopyConstructorWorks() {
+    void requireThatCopyConstructorWorks() {
         final Cookie lhs = newSetCookie("foo");
         final Cookie rhs = new Cookie(lhs);
         assertEquals(rhs.getName(), rhs.getName());
@@ -83,23 +81,23 @@ public class CookieTestCase {
     }
 
     @Test
-    public void requireThatHashCodeIsImplemented() {
+    void requireThatHashCodeIsImplemented() {
         final Cookie cookie = newCookie("foo");
-        assertFalse(cookie.hashCode() == new Cookie().hashCode());
+        assertNotNull(new Cookie().hashCode());
         assertEquals(cookie.hashCode(), cookie.hashCode());
         assertEquals(cookie.hashCode(), new Cookie(cookie).hashCode());
     }
 
     @Test
-    public void requireThatEqualsIsImplemented() {
+    void requireThatEqualsIsImplemented() {
         final Cookie cookie = newCookie("foo");
-        assertFalse(cookie.equals(new Cookie()));
+        assertNotEquals(cookie, new Cookie());
         assertEquals(cookie, cookie);
         assertEquals(cookie, new Cookie(cookie));
     }
 
     @Test
-    public void requireThatCookieCanBeEncoded() {
+    void requireThatCookieCanBeEncoded() {
         assertEncodeCookie(
                 "foo.name=foo.value",
                 List.of(newCookie("foo")));
@@ -109,7 +107,7 @@ public class CookieTestCase {
     }
 
     @Test
-    public void requireThatSetCookieCanBeEncoded() {
+    void requireThatSetCookieCanBeEncoded() {
         assertEncodeSetCookie(
                 List.of("foo.name=foo.value; Path=path; Domain=domain; Secure; HttpOnly",
                         "foo.name=foo.value; Path=path; Domain=domain; Secure; HttpOnly; SameSite=None"),
@@ -118,7 +116,7 @@ public class CookieTestCase {
     }
 
     @Test
-    public void requireThatCookieCanBeDecoded() {
+    void requireThatCookieCanBeDecoded() {
         final Cookie foo = new Cookie();
         foo.setName("foo.name");
         foo.setValue("foo.value");
@@ -127,11 +125,11 @@ public class CookieTestCase {
         final Cookie bar = new Cookie();
         bar.setName("bar.name");
         bar.setValue("bar.value");
-        assertDecodeCookie(List.of(foo, bar),"foo.name=foo.value; bar.name=bar.value");
+        assertDecodeCookie(List.of(foo, bar), "foo.name=foo.value; bar.name=bar.value");
     }
 
     @Test
-    public void requireThatSetCookieCanBeDecoded() {
+    void requireThatSetCookieCanBeDecoded() {
         final Cookie foo = new Cookie();
         foo.setName("foo.name");
         foo.setValue("foo.value");
@@ -152,45 +150,45 @@ public class CookieTestCase {
     }
 
     @Test
-    public void requireThatCookieDecoderWorksForGenericValidCookies() {
+    void requireThatCookieDecoderWorksForGenericValidCookies() {
         Cookie.fromCookieHeader("Y=v=1&n=8es5opih9ljtk&l=og0_iedeh0qqvqqr/o&p=m2g2rs6012000000&r=pv&lg=en-US&intl=" +
-                                   "us&np=1; T=z=h.nzPBhSP4PBVd5JqacVnIbNjU1NAY2TjYzNzVOTjYzNzM0Mj&a=YAE&sk=DAALShmNQ" +
-                                   "vhoZV&ks=EAABsibvMK6ejwn0uUoS4rC9w--~E&d=c2wBTVRJeU13RXhPVEUwTURJNU9URTBNRFF6TlRJ" +
-                                   "NU5nLS0BYQFZQUUBZwE1VkNHT0w3VUVDTklJVEdRR1FXT0pOSkhEQQFzY2lkAWNOUnZIbEc3ZHZoVHlWZ" +
-                                   "0NoXzEwYkxhOVdzcy0Bb2sBWlcwLQF0aXABWUhwTmVDAXp6AWgubnpQQkE3RQ--");
+                "us&np=1; T=z=h.nzPBhSP4PBVd5JqacVnIbNjU1NAY2TjYzNzVOTjYzNzM0Mj&a=YAE&sk=DAALShmNQ" +
+                "vhoZV&ks=EAABsibvMK6ejwn0uUoS4rC9w--~E&d=c2wBTVRJeU13RXhPVEUwTURJNU9URTBNRFF6TlRJ" +
+                "NU5nLS0BYQFZQUUBZwE1VkNHT0w3VUVDTklJVEdRR1FXT0pOSkhEQQFzY2lkAWNOUnZIbEc3ZHZoVHlWZ" +
+                "0NoXzEwYkxhOVdzcy0Bb2sBWlcwLQF0aXABWUhwTmVDAXp6AWgubnpQQkE3RQ--");
     }
 
     @Test
-    public void requireThatCookieDecoderWorksForYInvalidCookies() {
+    void requireThatCookieDecoderWorksForYInvalidCookies() {
         Cookie.fromCookieHeader("Y=v=1&n=77nkr5t7o4nqn&l=og0_iedeh0qqvqqr/o&p=m2g2rs6012000000&r=pv&lg=en-US&intl=" +
-                                   "us&np=1; T=z=05nzPB0NP4PBN/n0gwc1AWGNjU1NAY2TjYzNzVOTjYzNzM0Mj&a=QAE&sk=DAA4R2svo" +
-                                   "osjIa&ks=EAAj3nBQFkN4ZmuhqFxJdNoaQ--~E&d=c2wBTVRJeU13RXhPVEUwTURJNU9URTBNRFF6TlRJ" +
-                                   "NU5nLS0BYQFRQUUBZwE1VkNHT0w3VUVDTklJVEdRR1FXT0pOSkhEQQFzY2lkAUpPalRXOEVsUDZrR3RHT" +
-                                   "VZkX29CWk53clJIQS0BdGlwAVlIcE5lQwF6egEwNW56UEJBN0U-");
+                "us&np=1; T=z=05nzPB0NP4PBN/n0gwc1AWGNjU1NAY2TjYzNzVOTjYzNzM0Mj&a=QAE&sk=DAA4R2svo" +
+                "osjIa&ks=EAAj3nBQFkN4ZmuhqFxJdNoaQ--~E&d=c2wBTVRJeU13RXhPVEUwTURJNU9URTBNRFF6TlRJ" +
+                "NU5nLS0BYQFRQUUBZwE1VkNHT0w3VUVDTklJVEdRR1FXT0pOSkhEQQFzY2lkAUpPalRXOEVsUDZrR3RHT" +
+                "VZkX29CWk53clJIQS0BdGlwAVlIcE5lQwF6egEwNW56UEJBN0U-");
     }
 
     @Test
-    public void requireThatCookieDecoderWorksForYValidCookies() {
+    void requireThatCookieDecoderWorksForYValidCookies() {
         Cookie.fromCookieHeader("Y=v=1&n=3767k6te5aj2s&l=1v4u3001uw2ys00q0rw0qrw34q0x5s3u/o&p=030vvit012000000&iz=" +
-                                   "&r=pu&lg=en-US,it-IT,it&intl=it&np=1; T=z=m38yPBmLk3PBWvehTPBhBHYNU5OBjQ3NE5ONU5P" +
-                                   "NDY0NzU0M0&a=IAE&sk=DAAAx5URYgbhQ6&ks=EAA4rTgdlAGeMQmdYeM_VehGg--~E&d=c2wBTWprNUF" +
-                                   "UTXdNems1TWprNE16RXpNREl6TkRneAFhAUlBRQFnAUVJSlNMSzVRM1pWNVNLQVBNRkszQTRaWDZBAXNj" +
-                                   "aWQBSUlyZW5paXp4NS4zTUZMMDVlSVhuMjZKYUcwLQFvawFaVzAtAWFsAW1hcmlvYXByZWFAeW1haWwuY" +
-                                   "29tAXp6AW0zOHlQQkE3RQF0aXABaXRZOFRE");
+                "&r=pu&lg=en-US,it-IT,it&intl=it&np=1; T=z=m38yPBmLk3PBWvehTPBhBHYNU5OBjQ3NE5ONU5P" +
+                "NDY0NzU0M0&a=IAE&sk=DAAAx5URYgbhQ6&ks=EAA4rTgdlAGeMQmdYeM_VehGg--~E&d=c2wBTWprNUF" +
+                "UTXdNems1TWprNE16RXpNREl6TkRneAFhAUlBRQFnAUVJSlNMSzVRM1pWNVNLQVBNRkszQTRaWDZBAXNj" +
+                "aWQBSUlyZW5paXp4NS4zTUZMMDVlSVhuMjZKYUcwLQFvawFaVzAtAWFsAW1hcmlvYXByZWFAeW1haWwuY" +
+                "29tAXp6AW0zOHlQQkE3RQF0aXABaXRZOFRE");
     }
 
     @Test
-    public void requireThatCookieDecoderWorksForGenericInvalidCookies() {
+    void requireThatCookieDecoderWorksForGenericInvalidCookies() {
         Cookie.fromCookieHeader("Y=v=1&n=e92s5cq8qbs6h&l=3kdb0f.3@i126be10b.d4j/o&p=m1f2qgmb13000107&r=g5&lg=en-US" +
-                                   "&intl=us; T=z=TXp3OBTrQ8OBFMcj3GBpFSyNk83TgY2MjMwN04zMDMw&a=YAE&sk=DAAVfaNwLeISrX" +
-                                   "&ks=EAAOeNNgY8c5hV8YzPYmnrW7w--~E&d=c2wBTVRnd09RRXhOVFEzTURrME56UTMBYQFZQUUBZwFMQ" +
-                                   "U5NT0Q2UjY2Q0I1STY0R0tKSUdVQVlRRQFvawFaVzAtAXRpcAFMTlRUdkMBenoBVFhwM09CQTdF&af=QU" +
-                                   "FBQ0FDQURBd0FCMUNCOUFJQUJBQ0FEQU1IME1nTWhNbiZ0cz0xMzIzMjEwMTk1JnBzPVA1d3NYakh0aVk" +
-                                   "2UDMuUGZ6WkdTT2ctLQ--");
+                "&intl=us; T=z=TXp3OBTrQ8OBFMcj3GBpFSyNk83TgY2MjMwN04zMDMw&a=YAE&sk=DAAVfaNwLeISrX" +
+                "&ks=EAAOeNNgY8c5hV8YzPYmnrW7w--~E&d=c2wBTVRnd09RRXhOVFEzTURrME56UTMBYQFZQUUBZwFMQ" +
+                "U5NT0Q2UjY2Q0I1STY0R0tKSUdVQVlRRQFvawFaVzAtAXRpcAFMTlRUdkMBenoBVFhwM09CQTdF&af=QU" +
+                "FBQ0FDQURBd0FCMUNCOUFJQUJBQ0FEQU1IME1nTWhNbiZ0cz0xMzIzMjEwMTk1JnBzPVA1d3NYakh0aVk" +
+                "2UDMuUGZ6WkdTT2ctLQ--");
     }
 
     @Test
-    public void requireMappingBetweenSameSiteAndJettySameSite() {
+    void requireMappingBetweenSameSiteAndJettySameSite() {
         for (var jdiscSameSite : Cookie.SameSite.values()) {
             assertEquals(jdiscSameSite, Cookie.SameSite.fromJettySameSite(jdiscSameSite.jettySameSite()));
         }