1 files changed, 61 insertions, 57 deletions
diff --git a/component/src/test/java/com/yahoo/component/VersionSpecificationTestCase.java b/component/src/test/java/com/yahoo/component/VersionSpecificationTestCase.java
index 7b419f0fc5d..cb4b07f1b33 100644
--- a/component/src/test/java/com/yahoo/component/VersionSpecificationTestCase.java
+++ b/component/src/test/java/com/yahoo/component/VersionSpecificationTestCase.java
@@ -1,11 +1,13 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.component;
 
-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.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author bratseth
@@ -13,74 +15,74 @@ import static org.junit.Assert.assertTrue;
 public class VersionSpecificationTestCase {
 
     @Test
-    public void testPrimitiveCreation() {
-        VersionSpecification version=new VersionSpecification(1,2,3,"qualifier");
-        assertEquals(1, (int)version.getSpecifiedMajor());
-        assertEquals(2, (int)version.getSpecifiedMinor());
-        assertEquals(3, (int)version.getSpecifiedMicro());
-        assertEquals("qualifier",version.getSpecifiedQualifier());
+    void testPrimitiveCreation() {
+        VersionSpecification version = new VersionSpecification(1, 2, 3, "qualifier");
+        assertEquals(1, (int) version.getSpecifiedMajor());
+        assertEquals(2, (int) version.getSpecifiedMinor());
+        assertEquals(3, (int) version.getSpecifiedMicro());
+        assertEquals("qualifier", version.getSpecifiedQualifier());
         assertEquals(1, version.getMajor());
         assertEquals(2, version.getMinor());
         assertEquals(3, version.getMicro());
-        assertEquals("qualifier",version.getQualifier());
+        assertEquals("qualifier", version.getQualifier());
     }
 
     @Test
-    public void testUnderspecifiedPrimitiveCreation() {
-        VersionSpecification version=new VersionSpecification(1);
-        assertEquals(1,(int)version.getSpecifiedMajor());
-        assertEquals(null,version.getSpecifiedMinor());
-        assertEquals(null,version.getSpecifiedMicro());
-        assertEquals(null,version.getSpecifiedQualifier());
+    void testUnderspecifiedPrimitiveCreation() {
+        VersionSpecification version = new VersionSpecification(1);
+        assertEquals(1, (int) version.getSpecifiedMajor());
+        assertNull(version.getSpecifiedMinor());
+        assertNull(version.getSpecifiedMicro());
+        assertNull(version.getSpecifiedQualifier());
         assertEquals(1, version.getMajor());
         assertEquals(0, version.getMinor());
         assertEquals(0, version.getMicro());
-        assertEquals("",version.getQualifier());
+        assertEquals("", version.getQualifier());
     }
 
     @Test
-    public void testStringCreation() {
-        VersionSpecification version=new VersionSpecification("1.2.3.qualifier");
-        assertEquals(1,(int)version.getSpecifiedMajor());
-        assertEquals(2,(int)version.getSpecifiedMinor());
-        assertEquals(3,(int)version.getSpecifiedMicro());
-        assertEquals("qualifier",version.getSpecifiedQualifier());
+    void testStringCreation() {
+        VersionSpecification version = new VersionSpecification("1.2.3.qualifier");
+        assertEquals(1, (int) version.getSpecifiedMajor());
+        assertEquals(2, (int) version.getSpecifiedMinor());
+        assertEquals(3, (int) version.getSpecifiedMicro());
+        assertEquals("qualifier", version.getSpecifiedQualifier());
     }
 
     @Test
-    public void testUnderspecifiedStringCreation() {
-        VersionSpecification version=new VersionSpecification("1");
-        assertEquals(1,(int)version.getSpecifiedMajor());
-        assertEquals(null,version.getSpecifiedMinor());
-        assertEquals(null,version.getSpecifiedMicro());
-        assertEquals(null,version.getSpecifiedQualifier());
+    void testUnderspecifiedStringCreation() {
+        VersionSpecification version = new VersionSpecification("1");
+        assertEquals(1, (int) version.getSpecifiedMajor());
+        assertNull(version.getSpecifiedMinor());
+        assertNull(version.getSpecifiedMicro());
+        assertNull(version.getSpecifiedQualifier());
         assertEquals(1, version.getMajor());
         assertEquals(0, version.getMinor());
         assertEquals(0, version.getMicro());
-        assertEquals("",version.getQualifier());
+        assertEquals("", version.getQualifier());
     }
 
     @Test
-    public void testEquality() {
-        assertEquals(new VersionSpecification(),VersionSpecification.emptyVersionSpecification);
-        assertEquals(new VersionSpecification(),new VersionSpecification(""));
-        assertEquals(new VersionSpecification(1),new VersionSpecification("1"));
-        assertEquals(new VersionSpecification(1,2),new VersionSpecification("1.2"));
-        assertEquals(new VersionSpecification(1,2,3),new VersionSpecification("1.2.3"));
-        assertEquals(new VersionSpecification(1,2,3,"qualifier"),new VersionSpecification("1.2.3.qualifier"));
+    void testEquality() {
+        assertEquals(new VersionSpecification(), VersionSpecification.emptyVersionSpecification);
+        assertEquals(new VersionSpecification(), new VersionSpecification(""));
+        assertEquals(new VersionSpecification(1), new VersionSpecification("1"));
+        assertEquals(new VersionSpecification(1, 2), new VersionSpecification("1.2"));
+        assertEquals(new VersionSpecification(1, 2, 3), new VersionSpecification("1.2.3"));
+        assertEquals(new VersionSpecification(1, 2, 3, "qualifier"), new VersionSpecification("1.2.3.qualifier"));
     }
 
     @Test
-    public void testToString() {
-        assertEquals("",new VersionSpecification().toString());
-        assertEquals("1",new VersionSpecification(1).toString());
-        assertEquals("1.2",new VersionSpecification(1,2).toString());
-        assertEquals("1.2.3",new VersionSpecification(1,2,3).toString());
-        assertEquals("1.2.3.qualifier",new VersionSpecification(1,2,3,"qualifier").toString());
+    void testToString() {
+        assertEquals("", new VersionSpecification().toString());
+        assertEquals("1", new VersionSpecification(1).toString());
+        assertEquals("1.2", new VersionSpecification(1, 2).toString());
+        assertEquals("1.2.3", new VersionSpecification(1, 2, 3).toString());
+        assertEquals("1.2.3.qualifier", new VersionSpecification(1, 2, 3, "qualifier").toString());
     }
 
     @Test
-    public void testMatches() {
+    void testMatches() {
         assertTrue(new VersionSpecification("").matches(new Version("1")));
         assertTrue(new VersionSpecification("1").matches(new Version("1")));
         assertFalse(new VersionSpecification("1").matches(new Version("2")));
@@ -112,19 +114,19 @@ public class VersionSpecificationTestCase {
     }
 
     @Test
-    public void testOrder() {
-        assertTrue(new VersionSpecification("1.2.3").compareTo(new VersionSpecification("1.2.3"))==0);
-        assertTrue(new VersionSpecification("1.2.3").compareTo(new VersionSpecification("1.2.4"))<0);
-        assertTrue(new VersionSpecification("1.2.3").compareTo(new VersionSpecification("1.2.2"))>0);
+    void testOrder() {
+        assertEquals(new VersionSpecification("1.2.3").compareTo(new VersionSpecification("1.2.3")), 0);
+        assertTrue(new VersionSpecification("1.2.3").compareTo(new VersionSpecification("1.2.4")) < 0);
+        assertTrue(new VersionSpecification("1.2.3").compareTo(new VersionSpecification("1.2.2")) > 0);
 
-        assertTrue(new VersionSpecification("1.2.3").compareTo(new VersionSpecification("2"))<0);
-        assertTrue(new VersionSpecification("1.2.3").compareTo(new VersionSpecification("1.3"))<0);
+        assertTrue(new VersionSpecification("1.2.3").compareTo(new VersionSpecification("2")) < 0);
+        assertTrue(new VersionSpecification("1.2.3").compareTo(new VersionSpecification("1.3")) < 0);
 
-        assertTrue(new VersionSpecification("1.0.0").compareTo(new VersionSpecification("1"))==0);
+        assertEquals(new VersionSpecification("1.0.0").compareTo(new VersionSpecification("1")), 0);
     }
 
     @Test
-    public void testValidIntersect() {
+    void testValidIntersect() {
         VersionSpecification mostSpecific = new VersionSpecification(4, 2, 1);
         VersionSpecification leastSpecific = new VersionSpecification(4, 2);
 
@@ -134,9 +136,11 @@ public class VersionSpecificationTestCase {
                 leastSpecific.intersect(mostSpecific));
     }
 
-    @Test(expected=RuntimeException.class)
-    public void testInvalidIntersect() {
-        new VersionSpecification(4, 1).intersect(
-                new VersionSpecification(4, 2));
+    @Test
+    void testInvalidIntersect() {
+        assertThrows(RuntimeException.class, () -> {
+            new VersionSpecification(4, 1).intersect(
+                    new VersionSpecification(4, 2));
+        });
     }
 }