1 files changed, 10 insertions, 10 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java b/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java
index 325361e0127..3db4948c8c3 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java
@@ -2,13 +2,13 @@
 package com.yahoo.config.model;
 
 import com.yahoo.config.model.application.provider.Bundle;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Ulf Lilleengen
@@ -19,38 +19,38 @@ public class ConfigModelUtilsTest {
     public static final String INVALID_TEST_BUNDLE = "src/test/cfg/application/validation/invalidjar_app/components";
 
     @Test
-    public void all_def_files_in_correct_directory_are_handled_and_files_outside_are_ignored() {
+    void all_def_files_in_correct_directory_are_handled_and_files_outside_are_ignored() {
         List<Bundle> bundles = Bundle.getBundles(new File(VALID_TEST_BUNDLE));
         assertEquals(1, bundles.size());
         assertEquals(5, bundles.get(0).getDefEntries().size());
     }
 
     @Test
-    public void def_file_with_namespace_is_handled() {
+    void def_file_with_namespace_is_handled() {
         Bundle.DefEntry defEntry = getDefEntry("test-namespace");
         assertEquals("config", defEntry.defNamespace);
     }
 
     @Test
-    public void def_file_with_namespace_and_namespace_in_filename_is_handled() {
+    void def_file_with_namespace_and_namespace_in_filename_is_handled() {
         Bundle.DefEntry defEntry = getDefEntry("namespace-in-filename");
         assertEquals("a.b", defEntry.defNamespace);
     }
 
     @Test
-    public void def_file_with_package_is_handled() {
+    void def_file_with_package_is_handled() {
         Bundle.DefEntry defEntry = getDefEntry("test-package");
         assertEquals("com.mydomain.mypackage", defEntry.defNamespace);
     }
 
     @Test
-    public void def_file_with_package_and_pacakage_in_filename_is_handled() {
+    void def_file_with_package_and_pacakage_in_filename_is_handled() {
         Bundle.DefEntry defEntry = getDefEntry("package-in-filename");
         assertEquals("com.mydomain.mypackage", defEntry.defNamespace);
     }
 
     @Test
-    public void def_file_with_both_package_and_namespace_gets_package_as_namespace() {
+    void def_file_with_both_package_and_namespace_gets_package_as_namespace() {
         Bundle.DefEntry defEntry = getDefEntry("namespace-and-package");
         assertEquals("com.mydomain.mypackage", defEntry.defNamespace);
     }
@@ -66,7 +66,7 @@ public class ConfigModelUtilsTest {
     }
 
     @Test
-    public void invalid_jar_file_fails_to_load() {
+    void invalid_jar_file_fails_to_load() {
         try {
             Bundle.getBundles(new File(INVALID_TEST_BUNDLE));
             fail();