1 files changed, 11 insertions, 14 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/builder/xml/ConfigModelIdTest.java b/config-model/src/test/java/com/yahoo/config/model/builder/xml/ConfigModelIdTest.java
index 931768b6fd9..b1354446d1f 100644
--- a/config-model/src/test/java/com/yahoo/config/model/builder/xml/ConfigModelIdTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/builder/xml/ConfigModelIdTest.java
@@ -2,12 +2,9 @@
 package com.yahoo.config.model.builder.xml;
 
 import com.yahoo.component.Version;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author Ulf Lilleengen
@@ -16,7 +13,7 @@ import static org.junit.Assert.assertTrue;
 public class ConfigModelIdTest {
 
     @Test
-    public void require_that_element_gets_correct_name() {
+    void require_that_element_gets_correct_name() {
         ConfigModelId id = ConfigModelId.fromName("foo");
         assertEquals("foo", id.getName());
         assertEquals(Version.fromString("1"), id.getVersion());
@@ -26,7 +23,7 @@ public class ConfigModelIdTest {
     }
 
     @Test
-    public void test_toString() {
+    void test_toString() {
         ConfigModelId id = ConfigModelId.fromNameAndVersion("bar", "1.0");
         assertEquals("bar.1", id.toString());
         id = ConfigModelId.fromNameAndVersion("foo", "1.1.3");
@@ -36,7 +33,7 @@ public class ConfigModelIdTest {
     }
 
     @Test
-    public void test_equality() {
+    void test_equality() {
         ConfigModelId a1 = ConfigModelId.fromName("a");
         ConfigModelId a2 = ConfigModelId.fromName("a");
         ConfigModelId b = ConfigModelId.fromName("b");
@@ -52,18 +49,18 @@ public class ConfigModelIdTest {
     }
 
     @Test
-    public void test_compare() {
+    void test_compare() {
         ConfigModelId a1 = ConfigModelId.fromName("a");
         ConfigModelId a2 = ConfigModelId.fromName("a");
         ConfigModelId b = ConfigModelId.fromName("b");
-        assertTrue(a1.compareTo(a2) == 0);
-        assertTrue(a2.compareTo(a1) == 0);
+        assertEquals(a1.compareTo(a2), 0);
+        assertEquals(a2.compareTo(a1), 0);
         assertFalse(a1.compareTo(b) > 0);
         assertFalse(a2.compareTo(b) > 0);
         assertFalse(b.compareTo(a1) < 0);
         assertFalse(b.compareTo(a2) < 0);
-        assertTrue(a1.compareTo(a1) == 0);
-        assertTrue(a2.compareTo(a2) == 0);
-        assertTrue(b.compareTo(b) == 0);
+        assertEquals(a1.compareTo(a1), 0);
+        assertEquals(a2.compareTo(a2), 0);
+        assertEquals(b.compareTo(b), 0);
     }
 }