1 files changed, 29 insertions, 34 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java b/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java
index da8ce7fd425..753f4b11f9f 100644
--- a/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java
@@ -3,16 +3,11 @@ package com.yahoo.config.model.graph;
 
 import com.yahoo.config.model.ConfigModelContext;
 import com.yahoo.config.model.test.MockRoot;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author Ulf Lilleengen
@@ -30,7 +25,7 @@ public class ModelGraphTest {
     }
 
     @Test
-    public void require_that_dependencies_are_correctly_set() {
+    void require_that_dependencies_are_correctly_set() {
         ModelGraphBuilder builder = new ModelGraphBuilder();
         builder.addBuilder(new GraphMock.BC()).addBuilder(new GraphMock.BB()).addBuilder(new GraphMock.BA());
         ModelGraph graph = builder.build();
@@ -45,22 +40,24 @@ public class ModelGraphTest {
     }
 
     @Test
-    public void require_that_dependencies_are_correctly_sorted() {
+    void require_that_dependencies_are_correctly_sorted() {
         ModelGraph graph = new ModelGraphBuilder().addBuilder(new GraphMock.BC()).addBuilder(new GraphMock.BB()).addBuilder(new GraphMock.BA()).build();
         assertOrdering(graph, "ABC");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void require_that_cycles_are_detected() {
-        ModelGraph graph = new ModelGraphBuilder().addBuilder(new GraphMock.BD()).addBuilder(new GraphMock.BE()).build();
-        assertEquals(2, graph.getNodes().size());
-        assertTrue(graph.getNodes().get(0).dependsOn(graph.getNodes().get(1)));
-        assertTrue(graph.getNodes().get(1).dependsOn(graph.getNodes().get(0)));
-        graph.topologicalSort();
+    @Test
+    void require_that_cycles_are_detected() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            ModelGraph graph = new ModelGraphBuilder().addBuilder(new GraphMock.BD()).addBuilder(new GraphMock.BE()).build();
+            assertEquals(2, graph.getNodes().size());
+            assertTrue(graph.getNodes().get(0).dependsOn(graph.getNodes().get(1)));
+            assertTrue(graph.getNodes().get(1).dependsOn(graph.getNodes().get(0)));
+            graph.topologicalSort();
+        });
     }
 
     @Test
-    public void require_that_instance_can_be_created() {
+    void require_that_instance_can_be_created() {
         ModelGraph graph = new ModelGraphBuilder().addBuilder(new GraphMock.BC()).addBuilder(new GraphMock.BB()).addBuilder(new GraphMock.BA()).build();
         List<ModelNode> nodes = graph.topologicalSort();
         MockRoot root = new MockRoot();
@@ -83,30 +80,28 @@ public class ModelGraphTest {
         assertTrue(c.b.contains(b2));
     }
 
-    @SuppressWarnings("deprecation")
-    @Rule
-    public ExpectedException expectedEx = ExpectedException.none();
-
     @Test
-    public void require_that_context_must_be_first_ctor_param() {
-        expectedEx.expect(IllegalArgumentException.class);
-        expectedEx.expectMessage("Constructor for " + GraphMock.Bad.class.getName() + " must have as its first argument a " + ConfigModelContext.class.getName());
-        ModelNode node = new ModelNode(new GraphMock.Bad.Builder());
-        MockRoot root = new MockRoot();
-        node.createModel(ConfigModelContext.create(root.getDeployState(), null, null, root, "foo"));
+    void require_that_context_must_be_first_ctor_param() {
+        Throwable exception = assertThrows(IllegalArgumentException.class, () -> {
+            ModelNode node = new ModelNode(new GraphMock.Bad.Builder());
+            MockRoot root = new MockRoot();
+            node.createModel(ConfigModelContext.create(root.getDeployState(), null, null, root, "foo"));
+        });
+        assertTrue(exception.getMessage().contains("Constructor for " + GraphMock.Bad.class.getName() + " must have as its first argument a " + ConfigModelContext.class.getName()));
     }
 
     @Test
-    public void require_that_ctor_arguments_must_be_models_or_collections_of_models() {
-        expectedEx.expect(IllegalArgumentException.class);
-        expectedEx.expectMessage("Unable to find constructor argument class java.lang.String for com.yahoo.config.model.graph.GraphMock$Bad2");
-        ModelNode node = new ModelNode(new GraphMock.Bad2.Builder());
-        MockRoot root = new MockRoot();
-        node.createModel(ConfigModelContext.create(root.getDeployState(), null, null, root, "foo"));
+    void require_that_ctor_arguments_must_be_models_or_collections_of_models() {
+        Throwable exception = assertThrows(IllegalArgumentException.class, () -> {
+            ModelNode node = new ModelNode(new GraphMock.Bad2.Builder());
+            MockRoot root = new MockRoot();
+            node.createModel(ConfigModelContext.create(root.getDeployState(), null, null, root, "foo"));
+        });
+        assertTrue(exception.getMessage().contains("Unable to find constructor argument class java.lang.String for com.yahoo.config.model.graph.GraphMock$Bad2"));
     }
 
     @Test
-    public void require_that_collections_can_be_empty() {
+    void require_that_collections_can_be_empty() {
         ModelGraph graph = new ModelGraphBuilder().addBuilder(new GraphMock.BC()).addBuilder(new GraphMock.BA()).build();
         List<ModelNode> nodes = graph.topologicalSort();
         MockRoot root = new MockRoot();