1 files changed, 21 insertions, 16 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddressesTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddressesTest.java
index 703b81af9ae..ed2fad3e979 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddressesTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddressesTest.java
@@ -2,12 +2,13 @@
 package com.yahoo.vespa.hosted.node.admin.task.util.network;
 
 import com.google.common.net.InetAddresses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.Inet6Address;
 import java.net.InetAddress;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @author smorgrav
@@ -17,7 +18,7 @@ public class IPAddressesTest {
     private final IPAddressesMock mock = new IPAddressesMock();
 
     @Test
-    public void choose_sitelocal_ipv4_over_public() {
+    void choose_sitelocal_ipv4_over_public() {
         mock.addAddress("localhost", "38.3.4.2")
                 .addAddress("localhost", "10.0.2.2")
                 .addAddress("localhost", "fe80::1")
@@ -27,7 +28,7 @@ public class IPAddressesTest {
     }
 
     @Test
-    public void choose_ipv6_public_over_local() {
+    void choose_ipv6_public_over_local() {
         mock.addAddress("localhost", "38.3.4.2")
                 .addAddress("localhost", "10.0.2.2")
                 .addAddress("localhost", "fe80::1")
@@ -36,23 +37,27 @@ public class IPAddressesTest {
         assertEquals(InetAddresses.forString("2001::1"), mock.getIPv6Address("localhost").get());
     }
 
-    @Test(expected = RuntimeException.class)
-    public void throws_when_multiple_ipv6_addresses() {
-        mock.addAddress("localhost", "2001::1")
-                .addAddress("localhost", "2001::2");
-        mock.getIPv6Address("localhost");
+    @Test
+    void throws_when_multiple_ipv6_addresses() {
+        assertThrows(RuntimeException.class, () -> {
+            mock.addAddress("localhost", "2001::1")
+                    .addAddress("localhost", "2001::2");
+            mock.getIPv6Address("localhost");
+        });
     }
 
-    @Test(expected = RuntimeException.class)
-    public void throws_when_multiple_private_ipv4_addresses() {
-        mock.addAddress("localhost", "38.3.4.2")
-                .addAddress("localhost", "10.0.2.2")
-                .addAddress("localhost", "10.0.2.3");
-        mock.getIPv4Address("localhost");
+    @Test
+    void throws_when_multiple_private_ipv4_addresses() {
+        assertThrows(RuntimeException.class, () -> {
+            mock.addAddress("localhost", "38.3.4.2")
+                    .addAddress("localhost", "10.0.2.2")
+                    .addAddress("localhost", "10.0.2.3");
+            mock.getIPv4Address("localhost");
+        });
     }
 
     @Test
-    public void translator_with_valid_parameters() {
+    void translator_with_valid_parameters() {
 
         // Test simplest possible address
         Inet6Address original = (Inet6Address) InetAddresses.forString("2001:db8::1");