1 files changed, 27 insertions, 27 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java
index 87f3d71ec7a..78971dc30c7 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java
@@ -2,13 +2,13 @@
 package com.yahoo.vespa.hosted.node.admin.configserver.noderepository;
 
 import com.yahoo.vespa.hosted.node.admin.task.util.network.IPVersion;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
@@ -27,7 +27,7 @@ public class AclTest {
             Set.of());
 
     @Test
-    public void no_trusted_ports() {
+    void no_trusted_ports() {
         String listRulesIpv4 = String.join("\n", aclWithoutPorts.toRules(IPVersion.IPv4));
         assertEquals(
                 "-P INPUT ACCEPT\n" +
@@ -42,7 +42,7 @@ public class AclTest {
     }
 
     @Test
-    public void ipv4_rules() {
+    void ipv4_rules() {
         String listRulesIpv4 = String.join("\n", aclCommon.toRules(IPVersion.IPv4));
         assertEquals(
                 "-P INPUT ACCEPT\n" +
@@ -58,7 +58,7 @@ public class AclTest {
     }
 
     @Test
-    public void ipv6_rules() {
+    void ipv6_rules() {
         String listRulesIpv6 = String.join("\n", aclCommon.toRules(IPVersion.IPv6));
         assertEquals(
                 "-P INPUT ACCEPT\n" +
@@ -75,43 +75,43 @@ public class AclTest {
     }
 
     @Test
-    public void ipv6_rules_stable_order() {
+    void ipv6_rules_stable_order() {
         Acl aclCommonDifferentOrder = new Acl(
                 Set.of(453, 1234),
                 testNodes("fe80::2", "192.1.2.2", "fb00::1", "fe80::3"),
                 Set.of());
 
-        for (IPVersion ipVersion: IPVersion.values()) {
+        for (IPVersion ipVersion : IPVersion.values()) {
             assertEquals(aclCommon.toRules(ipVersion), aclCommonDifferentOrder.toRules(ipVersion));
         }
     }
 
     @Test
-    public void trusted_networks() {
+    void trusted_networks() {
         Acl acl = new Acl(Set.of(4080), testNodes("127.0.0.1"), Set.of("10.0.0.0/24", "2001:db8::/32"));
 
         assertEquals("-P INPUT ACCEPT\n" +
-                     "-P FORWARD ACCEPT\n" +
-                     "-P OUTPUT ACCEPT\n" +
-                     "-A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT\n" +
-                     "-A INPUT -i lo -j ACCEPT\n" +
-                     "-A INPUT -p icmp -j ACCEPT\n" +
-                     "-A INPUT -p tcp -m multiport --dports 4080 -j ACCEPT\n" +
-                     "-A INPUT -s 127.0.0.1/32 -j ACCEPT\n" +
-                     "-A INPUT -s 10.0.0.0/24 -j ACCEPT\n" +
-                     "-A INPUT -j REJECT --reject-with icmp-port-unreachable",
-                     String.join("\n", acl.toRules(IPVersion.IPv4)));
+                "-P FORWARD ACCEPT\n" +
+                "-P OUTPUT ACCEPT\n" +
+                "-A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT\n" +
+                "-A INPUT -i lo -j ACCEPT\n" +
+                "-A INPUT -p icmp -j ACCEPT\n" +
+                "-A INPUT -p tcp -m multiport --dports 4080 -j ACCEPT\n" +
+                "-A INPUT -s 127.0.0.1/32 -j ACCEPT\n" +
+                "-A INPUT -s 10.0.0.0/24 -j ACCEPT\n" +
+                "-A INPUT -j REJECT --reject-with icmp-port-unreachable",
+                String.join("\n", acl.toRules(IPVersion.IPv4)));
 
         assertEquals("-P INPUT ACCEPT\n" +
-                     "-P FORWARD ACCEPT\n" +
-                     "-P OUTPUT ACCEPT\n" +
-                     "-A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT\n" +
-                     "-A INPUT -i lo -j ACCEPT\n" +
-                     "-A INPUT -p ipv6-icmp -j ACCEPT\n" +
-                     "-A INPUT -p tcp -m multiport --dports 4080 -j ACCEPT\n" +
-                     "-A INPUT -s 2001:db8::/32 -j ACCEPT\n" +
-                     "-A INPUT -j REJECT --reject-with icmp6-port-unreachable",
-                     String.join("\n", acl.toRules(IPVersion.IPv6)));
+                "-P FORWARD ACCEPT\n" +
+                "-P OUTPUT ACCEPT\n" +
+                "-A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT\n" +
+                "-A INPUT -i lo -j ACCEPT\n" +
+                "-A INPUT -p ipv6-icmp -j ACCEPT\n" +
+                "-A INPUT -p tcp -m multiport --dports 4080 -j ACCEPT\n" +
+                "-A INPUT -s 2001:db8::/32 -j ACCEPT\n" +
+                "-A INPUT -j REJECT --reject-with icmp6-port-unreachable",
+                String.join("\n", acl.toRules(IPVersion.IPv6)));
     }
 
     private static Set<Acl.Node> testNodes(String... address) {