1 files changed, 15 insertions, 16 deletions

diff --git a/container-core/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java b/container-core/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
index 8d86010ea5a..4561c18bc3d 100644
--- a/container-core/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
+++ b/container-core/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
@@ -2,9 +2,9 @@
 package com.yahoo.component.test;
 
 import com.yahoo.component.ComponentId;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author bratseth
@@ -12,27 +12,26 @@ import static org.junit.Assert.assertEquals;
 public class ComponentIdTestCase {
 
     @Test
-    public void testFileNameConversion() {
-        assertFileNameEquals("a","a");
-        assertFileNameEquals("a-1","a-1");
-        assertFileNameEquals("a-1","a-1.0.0");
-        assertFileNameEquals("a-1.0.0.qualifier","a-1.0.0.qualifier");
-        assertFileNameEquals("a.b-1.0.0.qualifier","a.b-1.0.0.qualifier");
-        assertFileNameEquals("a@space","a@space");
-        assertFileNameEquals("a-1@space","a-1@space");
-        assertFileNameEquals("a-1@space","a-1.0.0@space");
-        assertFileNameEquals("a-1.0.0.qualifier@space","a-1.0.0.qualifier@space");
-        assertFileNameEquals("a.b-1.0.0.qualifier@space","a.b-1.0.0.qualifier@space");
+    void testFileNameConversion() {
+        assertFileNameEquals("a", "a");
+        assertFileNameEquals("a-1", "a-1");
+        assertFileNameEquals("a-1", "a-1.0.0");
+        assertFileNameEquals("a-1.0.0.qualifier", "a-1.0.0.qualifier");
+        assertFileNameEquals("a.b-1.0.0.qualifier", "a.b-1.0.0.qualifier");
+        assertFileNameEquals("a@space", "a@space");
+        assertFileNameEquals("a-1@space", "a-1@space");
+        assertFileNameEquals("a-1@space", "a-1.0.0@space");
+        assertFileNameEquals("a-1.0.0.qualifier@space", "a-1.0.0.qualifier@space");
+        assertFileNameEquals("a.b-1.0.0.qualifier@space", "a.b-1.0.0.qualifier@space");
     }
 
     /** Takes two id file names as input */
     private void assertFileNameEquals(String expected,String initial) {
-        assertEquals("'" + initial + "' became id '" + ComponentId.fromFileName(initial) + "' which should become '" + expected + "'",
-                     expected,ComponentId.fromFileName(initial).toFileName());
+        assertEquals(expected,ComponentId.fromFileName(initial).toFileName(),"'" + initial + "' became id '" + ComponentId.fromFileName(initial) + "' which should become '" + expected + "'");
     }
 
     @Test
-    public void testCompareWithNameSpace() {
+    void testCompareWithNameSpace() {
         ComponentId withNS = ComponentId.fromString("foo@ns");
         ComponentId withoutNS = ComponentId.fromString("foo"); // Should be less than withNs