diff options
Diffstat (limited to 'node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java')
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java index f8dc05b5eda..8504a724417 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.hosted.node.admin.container.metrics.Metrics; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextImpl; import com.yahoo.vespa.test.file.TestFileSystem; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import java.time.Duration; @@ -17,9 +17,7 @@ import java.util.Set; import static com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminImpl.NodeAgentWithScheduler; import static com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminImpl.NodeAgentWithSchedulerFactory; -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.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; @@ -42,7 +40,7 @@ public class NodeAdminImplTest { new Metrics(), clock, Duration.ZERO, Duration.ZERO); @Test - public void nodeAgentsAreProperlyLifeCycleManaged() { + void nodeAgentsAreProperlyLifeCycleManaged() { final NodeAgentContext context1 = createNodeAgentContext("host1.test.yahoo.com"); final NodeAgentContext context2 = createNodeAgentContext("host2.test.yahoo.com"); final NodeAgentWithScheduler nodeAgent1 = mockNodeAgentWithSchedulerFactory(context1); @@ -80,7 +78,7 @@ public class NodeAdminImplTest { } @Test - public void testSetFrozen() { + void testSetFrozen() { Set<NodeAgentContext> contexts = new HashSet<>(); List<NodeAgentWithScheduler> nodeAgents = new ArrayList<>(); for (int i = 0; i < 3; i++) { @@ -127,7 +125,7 @@ public class NodeAdminImplTest { } @Test - public void testSubsystemFreezeDuration() { + void testSubsystemFreezeDuration() { // Initially everything is frozen to force convergence assertTrue(nodeAdmin.isFrozen()); assertTrue(nodeAdmin.subsystemFreezeDuration().isZero()); |