1 files changed, 31 insertions, 23 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImplTest.java
index 9a6a358d9f0..061cd6e264b 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImplTest.java
@@ -4,15 +4,13 @@ package com.yahoo.vespa.hosted.node.admin.nodeagent;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.test.file.TestFileSystem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.FileSystem;
 import java.nio.file.Path;
 import java.util.List;
 
-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 freva
@@ -23,7 +21,7 @@ public class NodeAgentContextImplTest {
             .fileSystem(fileSystem).build();
 
     @Test
-    public void path_on_host_from_path_in_node_test() {
+    void path_on_host_from_path_in_node_test() {
         assertEquals(
                 "/data/vespa/storage/container-1",
                 context.paths().of("/").pathOnHost().toString());
@@ -33,35 +31,43 @@ public class NodeAgentContextImplTest {
                 context.paths().of("/dev/null").pathOnHost().toString());
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void path_in_container_must_be_absolute() {
-        context.paths().of("some/relative/path");
+    @Test
+    void path_in_container_must_be_absolute() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            context.paths().of("some/relative/path");
+        });
     }
 
     @Test
-    public void path_in_node_from_path_on_host_test() {
+    void path_in_node_from_path_on_host_test() {
         assertEquals(
                 "/dev/null",
                 context.paths().fromPathOnHost(fileSystem.getPath("/data/vespa/storage/container-1/dev/null")).pathInContainer());
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void path_on_host_must_be_absolute() {
-        context.paths().fromPathOnHost(Path.of("some/relative/path"));
+    @Test
+    void path_on_host_must_be_absolute() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            context.paths().fromPathOnHost(Path.of("some/relative/path"));
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void path_on_host_must_be_inside_container_storage_of_context() {
-        context.paths().fromPathOnHost(fileSystem.getPath("/data/vespa/storage/container-2/dev/null"));
+    @Test
+    void path_on_host_must_be_inside_container_storage_of_context() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            context.paths().fromPathOnHost(fileSystem.getPath("/data/vespa/storage/container-2/dev/null"));
+        });
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void path_on_host_must_be_inside_container_storage() {
-        context.paths().fromPathOnHost(fileSystem.getPath("/home"));
+    @Test
+    void path_on_host_must_be_inside_container_storage() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            context.paths().fromPathOnHost(fileSystem.getPath("/home"));
+        });
     }
 
     @Test
-    public void path_under_vespa_host_in_container_test() {
+    void path_under_vespa_host_in_container_test() {
         assertEquals(
                 "/opt/vespa",
                 context.paths().underVespaHome("").pathInContainer());
@@ -71,13 +77,15 @@ public class NodeAgentContextImplTest {
                 context.paths().underVespaHome("logs/vespa/vespa.log").pathInContainer());
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void path_under_vespa_home_must_be_relative() {
-        context.paths().underVespaHome("/home");
+    @Test
+    void path_under_vespa_home_must_be_relative() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            context.paths().underVespaHome("/home");
+        });
     }
 
     @Test
-    public void disabledTasksTest() {
+    void disabledTasksTest() {
         NodeAgentContext context1 = createContextWithDisabledTasks();
         assertFalse(context1.isDisabled(NodeAgentTask.DiskCleanup));
         assertFalse(context1.isDisabled(NodeAgentTask.CoreDumps));