1 files changed, 9 insertions, 9 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
index 995712c6dda..1197fd1469b 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.Orchestrato
 import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.Orchestrator;
 import com.yahoo.vespa.hosted.node.admin.integration.NodeRepoMock;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -23,8 +23,8 @@ import java.util.stream.IntStream;
 import static com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminStateUpdater.State.RESUMED;
 import static com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminStateUpdater.State.SUSPENDED;
 import static com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminStateUpdater.State.SUSPENDED_NODE_ADMIN;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -54,7 +54,7 @@ public class NodeAdminStateUpdaterTest {
 
 
     @Test
-    public void state_convergence() {
+    void state_convergence() {
         mockNodeRepo(NodeState.active, 4);
         List<String> activeHostnames = nodeRepository.getNodes(hostHostname.value()).stream()
                 .map(NodeSpec::hostname)
@@ -132,7 +132,7 @@ public class NodeAdminStateUpdaterTest {
     }
 
     @Test
-    public void half_transition_revert() {
+    void half_transition_revert() {
         final String exceptionMsg = "Cannot allow to suspend because some reason";
         mockNodeRepo(NodeState.active, 3);
 
@@ -174,7 +174,7 @@ public class NodeAdminStateUpdaterTest {
     }
 
     @Test
-    public void do_not_orchestrate_host_when_not_active() {
+    void do_not_orchestrate_host_when_not_active() {
         when(nodeAdmin.subsystemFreezeDuration()).thenReturn(Duration.ofHours(1));
         when(nodeAdmin.setFrozen(anyBoolean())).thenReturn(true);
         mockNodeRepo(NodeState.ready, 3);
@@ -196,7 +196,7 @@ public class NodeAdminStateUpdaterTest {
     }
 
     @Test
-    public void node_spec_and_acl_aligned() {
+    void node_spec_and_acl_aligned() {
         Acl acl = new Acl.Builder().withTrustedPorts(22).build();
         mockNodeRepo(NodeState.active, 3);
         mockAcl(acl, 1, 2, 3);
@@ -213,7 +213,7 @@ public class NodeAdminStateUpdaterTest {
     }
 
     @Test
-    public void node_spec_and_acl_mismatch_missing_one_acl() {
+    void node_spec_and_acl_mismatch_missing_one_acl() {
         Acl acl = new Acl.Builder().withTrustedPorts(22).build();
         mockNodeRepo(NodeState.active, 3);
         mockAcl(acl, 1, 2); // Acl for 3 is missing
@@ -231,7 +231,7 @@ public class NodeAdminStateUpdaterTest {
     }
 
     @Test
-    public void node_spec_and_acl_mismatch_additional_acl() {
+    void node_spec_and_acl_mismatch_additional_acl() {
         Acl acl = new Acl.Builder().withTrustedPorts(22).build();
         mockNodeRepo(NodeState.active, 2);
         mockAcl(acl, 1, 2, 3); // Acl for 3 is extra