1 files changed, 60 insertions, 62 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
index 2ae1399e9d1..9be3b15be07 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
@@ -20,16 +20,14 @@ import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.ContainerModel;
 import com.yahoo.vespa.model.container.xml.ContainerModelBuilder;
 import com.yahoo.vespa.model.content.Content;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Element;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Demonstrates how a model can be added at build time to amend another model.
@@ -42,44 +40,44 @@ import static org.junit.Assert.assertNotNull;
 public class ModelAmendingTestCase {
 
     @Test
-    public void testModelAmending() {
+    void testModelAmending() {
         ConfigModelRegistry amendingModelRepo = MapConfigModelRegistry.createFromList(new AdminModelAmenderBuilder(),
-                                                                                      new ContainerModelAmenderBuilder(),
-                                                                                      new ContentModelAmenderBuilder());
+                new ContainerModelAmenderBuilder(),
+                new ContentModelAmenderBuilder());
         String services =
                 "<services version='1.0'>" +
-                "    <admin version='4.0'/>" +
-                "    <container id='test1' version='1.0'>" +
-                "        <search/>" +
-                "        <nodes count='2'/>" +
-                "    </container>" +
-                "    <container id='test2' version='1.0'>" +
-                "        <http><server id='server1' port='" + Defaults.getDefaults().vespaWebServicePort() + "'/></http>" +
-                "        <document-api/>" +
-                "        <nodes count='2'/>" +
-                "    </container>" +
-                "    <content id='test3' version='1.0'>" +
-                "        <redundancy>1</redundancy>" +
-                "        <documents>" +
-                "            <document mode='index' type='type1'/>" +
-                "        </documents>" +
-                "        <nodes count='2'/>" +
-                "    </content>" +
-                "    <content id='test4' version='1.0'>" +
-                "        <redundancy>1</redundancy>" +
-                "        <documents>" +
-                "            <document mode='index' type='type1'/>" +
-                "        </documents>" +
-                "        <nodes count='3'/>" +
-                "    </content>" +
-                "</services>";
+                        "    <admin version='4.0'/>" +
+                        "    <container id='test1' version='1.0'>" +
+                        "        <search/>" +
+                        "        <nodes count='2'/>" +
+                        "    </container>" +
+                        "    <container id='test2' version='1.0'>" +
+                        "        <http><server id='server1' port='" + Defaults.getDefaults().vespaWebServicePort() + "'/></http>" +
+                        "        <document-api/>" +
+                        "        <nodes count='2'/>" +
+                        "    </container>" +
+                        "    <content id='test3' version='1.0'>" +
+                        "        <redundancy>1</redundancy>" +
+                        "        <documents>" +
+                        "            <document mode='index' type='type1'/>" +
+                        "        </documents>" +
+                        "        <nodes count='2'/>" +
+                        "    </content>" +
+                        "    <content id='test4' version='1.0'>" +
+                        "        <redundancy>1</redundancy>" +
+                        "        <documents>" +
+                        "            <document mode='index' type='type1'/>" +
+                        "        </documents>" +
+                        "        <nodes count='3'/>" +
+                        "    </content>" +
+                        "</services>";
         VespaModelTester tester = new VespaModelTester(amendingModelRepo);
         tester.addHosts(12);
         VespaModel model = tester.createModel(services);
 
         // Check that all hosts are amended
         for (HostResource host : model.getAdmin().hostSystem().getHosts()) {
-            assertFalse(host + " is amended", host.getHost().getChildrenByTypeRecursive(AmendedService.class).isEmpty());
+            assertFalse(host.getHost().getChildrenByTypeRecursive(AmendedService.class).isEmpty(), host + " is amended");
         }
 
         // Check that container clusters are amended
@@ -89,44 +87,44 @@ public class ModelAmendingTestCase {
     }
 
     @Test
-    public void testModelAmendingWithDedicatedCC() {
+    void testModelAmendingWithDedicatedCC() {
         ConfigModelRegistry amendingModelRepo = MapConfigModelRegistry.createFromList(new AdminModelAmenderBuilder(),
-                                                                                      new ContainerModelAmenderBuilder(),
-                                                                                      new ContentModelAmenderBuilder());
+                new ContainerModelAmenderBuilder(),
+                new ContentModelAmenderBuilder());
         String services =
                 "<services version='1.0'>" +
-                "    <admin version='4.0'/>" +
-                "    <container id='test1' version='1.0'>" +
-                "        <search/>" +
-                "        <nodes count='2'/>" +
-                "    </container>" +
-                "    <container id='test2' version='1.0'>" +
-                "        <http><server id='server1' port='" + Defaults.getDefaults().vespaWebServicePort() + "'/></http>" +
-                "        <document-api/>" +
-                "        <nodes count='2'/>" +
-                "    </container>" +
-                "    <content id='test3' version='1.0'>" +
-                "        <redundancy>1</redundancy>" +
-                "        <documents>" +
-                "            <document mode='index' type='type1'/>" +
-                "        </documents>" +
-                "        <nodes count='2'/>" +
-                "    </content>" +
-                "    <content id='test4' version='1.0'>" +
-                "        <redundancy>1</redundancy>" +
-                "        <documents>" +
-                "            <document mode='index' type='type1'/>" +
-                "        </documents>" +
-                "        <nodes count='3'/>" +
-                "    </content>" +
-                "</services>";
+                        "    <admin version='4.0'/>" +
+                        "    <container id='test1' version='1.0'>" +
+                        "        <search/>" +
+                        "        <nodes count='2'/>" +
+                        "    </container>" +
+                        "    <container id='test2' version='1.0'>" +
+                        "        <http><server id='server1' port='" + Defaults.getDefaults().vespaWebServicePort() + "'/></http>" +
+                        "        <document-api/>" +
+                        "        <nodes count='2'/>" +
+                        "    </container>" +
+                        "    <content id='test3' version='1.0'>" +
+                        "        <redundancy>1</redundancy>" +
+                        "        <documents>" +
+                        "            <document mode='index' type='type1'/>" +
+                        "        </documents>" +
+                        "        <nodes count='2'/>" +
+                        "    </content>" +
+                        "    <content id='test4' version='1.0'>" +
+                        "        <redundancy>1</redundancy>" +
+                        "        <documents>" +
+                        "            <document mode='index' type='type1'/>" +
+                        "        </documents>" +
+                        "        <nodes count='3'/>" +
+                        "    </content>" +
+                        "</services>";
         VespaModelTester tester = new VespaModelTester(amendingModelRepo);
         tester.addHosts(12);
         VespaModel model = tester.createModel(services);
 
         // Check that all hosts are amended
         for (HostResource host : model.getAdmin().hostSystem().getHosts()) {
-            assertFalse(host + " is amended", host.getHost().getChildrenByTypeRecursive(AmendedService.class).isEmpty());
+            assertFalse(host.getHost().getChildrenByTypeRecursive(AmendedService.class).isEmpty(), host + " is amended");
         }
 
         // Check that container clusters are amended