1 files changed, 10 insertions, 12 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java
index 55c10a28a01..da01b6ae9f9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java
@@ -11,16 +11,14 @@ import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.ConfigPayloadBuilder;
 import com.yahoo.vespa.configdefinition.SpecialtokensConfig;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.Optional;
 
-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.*;
 
 /**
  * @author Ulf Lilleengen
@@ -30,13 +28,13 @@ public class UserConfigBuilderTest {
     private final ConfigDefinitionStore configDefinitionStore = defKey -> Optional.empty();
 
     @Test
-    public void require_that_simple_config_is_resolved() {
+    void require_that_simple_config_is_resolved() {
         Element configRoot = getDocument("<config name=\"test.simpletypes\">" +
-                                         "    <intval>13</intval>" +
-                                         "</config>" +
-                                         "<config name=\"test.simpletypes\" version=\"1\">" +
-                                         "    <stringval>foolio</stringval>" +
-                                         "</config>");
+                "    <intval>13</intval>" +
+                "</config>" +
+                "<config name=\"test.simpletypes\" version=\"1\">" +
+                "    <stringval>foolio</stringval>" +
+                "</config>");
         UserConfigRepo map = UserConfigBuilder.build(configRoot, configDefinitionStore, new BaseDeployLogger());
         assertFalse(map.isEmpty());
         ConfigDefinitionKey key = new ConfigDefinitionKey("simpletypes", "test");
@@ -51,7 +49,7 @@ public class UserConfigBuilderTest {
     }
 
     @Test
-    public void require_that_arrays_of_structs_are_resolved() {
+    void require_that_arrays_of_structs_are_resolved() {
         Element configRoot = getDocument(
                 "  <config name='vespa.configdefinition.specialtokens'>" +
                         "    <tokenlist>" +
@@ -86,7 +84,7 @@ public class UserConfigBuilderTest {
     }
 
     @Test
-    public void no_exception_when_config_class_does_not_exist() {
+    void no_exception_when_config_class_does_not_exist() {
         Element configRoot = getDocument("<config name=\"is.unknown\">" +
                 "    <foo>1</foo>" +
                 "</config>");