Convert component to junit5

4 files changed, 162 insertions, 153 deletions

diff --git a/component/pom.xml b/component/pom.xml
index a4330957069..e8cee594066 100755
--- a/component/pom.xml
+++ b/component/pom.xml
@@ -16,11 +16,6 @@
   <version>8-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>config-bundle</artifactId>
       <version>${project.version}</version>
@@ -39,6 +34,16 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <scope>provided</scope>
diff --git a/component/src/test/java/com/yahoo/component/VersionCompatibilityTest.java b/component/src/test/java/com/yahoo/component/VersionCompatibilityTest.java
index c4f0e0f7439..45c94591b11 100644
--- a/component/src/test/java/com/yahoo/component/VersionCompatibilityTest.java
+++ b/component/src/test/java/com/yahoo/component/VersionCompatibilityTest.java
@@ -1,14 +1,14 @@
 // 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 java.util.List;
 import java.util.Locale;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author jonmv
@@ -16,7 +16,7 @@ import static org.junit.Assert.fail;
 public class VersionCompatibilityTest {
 
     @Test
-    public void testNoIncompatibilities() {
+    void testNoIncompatibilities() {
         List<String> versions = List.of();
         VersionCompatibility compatibility = VersionCompatibility.fromVersionList(versions);
         assertTrue(compatibility.accept(new Version(0, 0, 0), new Version(0, 0, 0)));
@@ -26,36 +26,36 @@ public class VersionCompatibilityTest {
     }
 
     @Test
-    public void testValidIncompatibilities() {
+    void testValidIncompatibilities() {
         List<String> versions = List.of("1.2.*", "2", "3.*", "4.0.0", "4.0.1", "4.0.3", "4.1.0", "5");
         VersionCompatibility compatibility = VersionCompatibility.fromVersionList(versions);
-        assertTrue (compatibility.accept(new Version(0, 0, 0), new Version(0, 0, 0)));
-        assertTrue (compatibility.accept(new Version(0, 0, 0), new Version(1, 1, 1)));
+        assertTrue(compatibility.accept(new Version(0, 0, 0), new Version(0, 0, 0)));
+        assertTrue(compatibility.accept(new Version(0, 0, 0), new Version(1, 1, 1)));
         assertFalse(compatibility.accept(new Version(0, 0, 0), new Version(1, 2, 3)));
         assertFalse(compatibility.accept(new Version(1, 1, 0), new Version(1, 2, 0)));
         assertFalse(compatibility.accept(new Version(1, 2, 1), new Version(1, 2, 0)));
         assertFalse(compatibility.accept(new Version(1, 1, 0), new Version(1, 3, 0)));
-        assertTrue (compatibility.accept(new Version(1, 2, 3), new Version(1, 2, 3)));
-        assertTrue (compatibility.accept(new Version(1, 3, 0), new Version(1, 9, 9)));
+        assertTrue(compatibility.accept(new Version(1, 2, 3), new Version(1, 2, 3)));
+        assertTrue(compatibility.accept(new Version(1, 3, 0), new Version(1, 9, 9)));
         assertFalse(compatibility.accept(new Version(1, 3, 0), new Version(2, 0, 0)));
-        assertTrue (compatibility.accept(new Version(2, 0, 0), new Version(2, 2, 2)));
+        assertTrue(compatibility.accept(new Version(2, 0, 0), new Version(2, 2, 2)));
         assertFalse(compatibility.accept(new Version(2, 0, 0), new Version(3, 0, 0)));
-        assertTrue (compatibility.accept(new Version(3, 0, 0), new Version(3, 0, 0)));
+        assertTrue(compatibility.accept(new Version(3, 0, 0), new Version(3, 0, 0)));
         assertFalse(compatibility.accept(new Version(3, 0, 0), new Version(3, 1, 0)));
-        assertTrue (compatibility.accept(new Version(3, 0, 0), new Version(3, 0, 1)));
+        assertTrue(compatibility.accept(new Version(3, 0, 0), new Version(3, 0, 1)));
         assertFalse(compatibility.accept(new Version(3, 0, 0), new Version(4, 0, 0)));
         assertFalse(compatibility.accept(new Version(4, 0, 0), new Version(4, 0, 1)));
-        assertTrue (compatibility.accept(new Version(4, 0, 1), new Version(4, 0, 2)));
+        assertTrue(compatibility.accept(new Version(4, 0, 1), new Version(4, 0, 2)));
         assertFalse(compatibility.accept(new Version(4, 0, 2), new Version(4, 0, 3)));
         assertFalse(compatibility.accept(new Version(4, 0, 3), new Version(4, 1, 0)));
         assertFalse(compatibility.accept(new Version(4, 1, 0), new Version(5, 0, 0)));
-        assertTrue (compatibility.accept(new Version(5, 0, 0), new Version(6, 0, 0)));
+        assertTrue(compatibility.accept(new Version(5, 0, 0), new Version(6, 0, 0)));
         assertFalse(compatibility.accept(new Version(0, 0, 0), new Version(2, 0, 0)));
         assertFalse(compatibility.accept(new Version(0, 0, 0), new Version(6, 0, 0)));
     }
 
     @Test
-    public void testIllegalIncompatibilities() {
+    void testIllegalIncompatibilities() {
         assertThrows(List.of("1", "*"),         IllegalArgumentException.class, "may not have siblings");
         assertThrows(List.of("*", "*.*"),       IllegalArgumentException.class, "may not have siblings");
         assertThrows(List.of("*", "*"),         IllegalArgumentException.class, "may not have siblings");
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));
+        });
     }
 }
diff --git a/component/src/test/java/com/yahoo/component/VersionTestCase.java b/component/src/test/java/com/yahoo/component/VersionTestCase.java
index f66bc245f85..96adb6ce38f 100644
--- a/component/src/test/java/com/yahoo/component/VersionTestCase.java
+++ b/component/src/test/java/com/yahoo/component/VersionTestCase.java
@@ -3,11 +3,11 @@ package com.yahoo.component;
 
 import com.yahoo.text.Utf8Array;
 import com.yahoo.text.Utf8String;
-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.assertTrue;
 
 /**
  * @author bratseth
@@ -15,111 +15,111 @@ import static org.junit.Assert.assertTrue;
 public class VersionTestCase {
 
     @Test
-    public void testPrimitiveCreation() {
-        Version version=new Version(1,2,3,"qualifier");
-        assertEquals(1,version.getMajor());
-        assertEquals(2,version.getMinor());
-        assertEquals(3,version.getMicro());
-        assertEquals("qualifier",version.getQualifier());
+    void testPrimitiveCreation() {
+        Version version = new Version(1, 2, 3, "qualifier");
+        assertEquals(1, version.getMajor());
+        assertEquals(2, version.getMinor());
+        assertEquals(3, version.getMicro());
+        assertEquals("qualifier", version.getQualifier());
     }
 
     @Test
-    public void testUnderspecifiedPrimitiveCreation() {
-        Version version=new Version(1);
-        assertEquals(1,version.getMajor());
-        assertEquals(1,version.getMajor());
-        assertEquals(0,version.getMinor());
-        assertEquals(0,version.getMicro());
-        assertEquals("",version.getQualifier());
+    void testUnderspecifiedPrimitiveCreation() {
+        Version version = new Version(1);
+        assertEquals(1, version.getMajor());
+        assertEquals(1, version.getMajor());
+        assertEquals(0, version.getMinor());
+        assertEquals(0, version.getMicro());
+        assertEquals("", version.getQualifier());
     }
 
     @Test
-    public void testStringCreation() {
-        Version version=new Version("1.2.3.qualifier");
-        assertEquals(1,version.getMajor());
-        assertEquals(2,version.getMinor());
-        assertEquals(3,version.getMicro());
-        assertEquals("qualifier",version.getQualifier());
+    void testStringCreation() {
+        Version version = new Version("1.2.3.qualifier");
+        assertEquals(1, version.getMajor());
+        assertEquals(2, version.getMinor());
+        assertEquals(3, version.getMicro());
+        assertEquals("qualifier", version.getQualifier());
     }
 
     @Test
-    public void testUtf8StringCreation() {
-        Version version=new Version((Utf8Array)new Utf8String("1.2.3.qualifier"));
-        assertEquals(1,version.getMajor());
-        assertEquals(2,version.getMinor());
-        assertEquals(3,version.getMicro());
-        assertEquals("qualifier",version.getQualifier());
+    void testUtf8StringCreation() {
+        Version version = new Version((Utf8Array) new Utf8String("1.2.3.qualifier"));
+        assertEquals(1, version.getMajor());
+        assertEquals(2, version.getMinor());
+        assertEquals(3, version.getMicro());
+        assertEquals("qualifier", version.getQualifier());
     }
 
     @Test
-    public void testUnderspecifiedStringCreation() {
-        Version version=new Version("1");
-        assertEquals(1,version.getMajor());
-        assertEquals(0,version.getMinor());
-        assertEquals(0,version.getMicro());
-        assertEquals("",version.getQualifier());
+    void testUnderspecifiedStringCreation() {
+        Version version = new Version("1");
+        assertEquals(1, version.getMajor());
+        assertEquals(0, version.getMinor());
+        assertEquals(0, version.getMicro());
+        assertEquals("", version.getQualifier());
     }
 
     @Test
-    public void testEquality() {
-        assertEquals(new Version(),Version.emptyVersion);
-        assertEquals(new Version(),new Version(""));
-        assertEquals(new Version(0,0,0),Version.emptyVersion);
-        assertEquals(new Version(1),new Version("1"));
-        assertEquals(new Version(1,2),new Version("1.2"));
-        assertEquals(new Version(1,2,3),new Version("1.2.3"));
-        assertEquals(new Version(1,2,3,"qualifier"),new Version("1.2.3.qualifier"));
+    void testEquality() {
+        assertEquals(new Version(), Version.emptyVersion);
+        assertEquals(new Version(), new Version(""));
+        assertEquals(new Version(0, 0, 0), Version.emptyVersion);
+        assertEquals(new Version(1), new Version("1"));
+        assertEquals(new Version(1, 2), new Version("1.2"));
+        assertEquals(new Version(1, 2, 3), new Version("1.2.3"));
+        assertEquals(new Version(1, 2, 3, "qualifier"), new Version("1.2.3.qualifier"));
     }
 
     @Test
-    public void testToString() {
-        assertEquals("",new Version().toString());
-        assertEquals("1",new Version(1).toString());
-        assertEquals("1.2",new Version(1,2).toString());
-        assertEquals("1.2.3",new Version(1,2,3).toString());
-        assertEquals("1.2.3.qualifier",new Version(1,2,3,"qualifier").toString());
+    void testToString() {
+        assertEquals("", new Version().toString());
+        assertEquals("1", new Version(1).toString());
+        assertEquals("1.2", new Version(1, 2).toString());
+        assertEquals("1.2.3", new Version(1, 2, 3).toString());
+        assertEquals("1.2.3.qualifier", new Version(1, 2, 3, "qualifier").toString());
     }
 
     @Test
-    public void testToFullString() {
-        assertEquals("0.0.0",new Version().toFullString());
-        assertEquals("1.0.0",new Version(1).toFullString());
-        assertEquals("1.2.0",new Version(1,2).toFullString());
-        assertEquals("1.2.3",new Version(1,2,3).toFullString());
-        assertEquals("1.2.3.qualifier",new Version(1,2,3,"qualifier").toFullString());
+    void testToFullString() {
+        assertEquals("0.0.0", new Version().toFullString());
+        assertEquals("1.0.0", new Version(1).toFullString());
+        assertEquals("1.2.0", new Version(1, 2).toFullString());
+        assertEquals("1.2.3", new Version(1, 2, 3).toFullString());
+        assertEquals("1.2.3.qualifier", new Version(1, 2, 3, "qualifier").toFullString());
     }
 
     @Test
-    public void testOrder() {
-        assertTrue(new Version("1.2.3").compareTo(new Version("1.2.3"))==0);
-        assertTrue(new Version("1.2.3").compareTo(new Version("1.2.4"))<0);
-        assertTrue(new Version("1.2.3").compareTo(new Version("1.2.3.foo"))<0);
-        assertTrue(new Version("1.2.3").compareTo(new Version("1.2.2"))>0);
-        assertTrue(new Version("1.2.3.foo").compareTo(new Version("1.2.3"))>0);
-        assertTrue(new Version("1.2.3").compareTo(new Version("2"))<0);
-        assertTrue(new Version("1.2.3").compareTo(new Version("1.3"))<0);
-        assertTrue(new Version("1.0.0").compareTo(new Version("1"))==0);
+    void testOrder() {
+        assertEquals(new Version("1.2.3").compareTo(new Version("1.2.3")), 0);
+        assertTrue(new Version("1.2.3").compareTo(new Version("1.2.4")) < 0);
+        assertTrue(new Version("1.2.3").compareTo(new Version("1.2.3.foo")) < 0);
+        assertTrue(new Version("1.2.3").compareTo(new Version("1.2.2")) > 0);
+        assertTrue(new Version("1.2.3.foo").compareTo(new Version("1.2.3")) > 0);
+        assertTrue(new Version("1.2.3").compareTo(new Version("2")) < 0);
+        assertTrue(new Version("1.2.3").compareTo(new Version("1.3")) < 0);
+        assertEquals(new Version("1.0.0").compareTo(new Version("1")), 0);
     }
-    
+
     @Test
-    public void testIsBefore() {
+    void testIsBefore() {
         assertFalse(new Version("1.2.3").isBefore(new Version("0.2.3")));
         assertFalse(new Version("1.2.3").isBefore(new Version("1.1.3")));
         assertFalse(new Version("1.2.3").isBefore(new Version("1.2.2")));
         assertFalse(new Version("1.2.3").isBefore(new Version("1.2.3")));
         assertFalse(new Version("1.2.3.foo").isBefore(new Version("1.2.3")));
-        assertTrue( new Version("1.2.3").isBefore(new Version("1.2.4")));
-        assertTrue( new Version("1.2.3").isBefore(new Version("1.3.3")));
-        assertTrue( new Version("1.2.3").isBefore(new Version("2.2.3")));
-        assertTrue( new Version("1.2.3").isBefore(new Version("1.2.3.foo")));
+        assertTrue(new Version("1.2.3").isBefore(new Version("1.2.4")));
+        assertTrue(new Version("1.2.3").isBefore(new Version("1.3.3")));
+        assertTrue(new Version("1.2.3").isBefore(new Version("2.2.3")));
+        assertTrue(new Version("1.2.3").isBefore(new Version("1.2.3.foo")));
     }
 
     @Test
-    public void testIsAfter() {
-        assertTrue( new Version("1.2.3").isAfter(new Version("0.2.3")));
-        assertTrue( new Version("1.2.3").isAfter(new Version("1.1.3")));
-        assertTrue( new Version("1.2.3").isAfter(new Version("1.2.2")));
-        assertTrue( new Version("1.2.3.foo").isAfter(new Version("1.2.3")));
+    void testIsAfter() {
+        assertTrue(new Version("1.2.3").isAfter(new Version("0.2.3")));
+        assertTrue(new Version("1.2.3").isAfter(new Version("1.1.3")));
+        assertTrue(new Version("1.2.3").isAfter(new Version("1.2.2")));
+        assertTrue(new Version("1.2.3.foo").isAfter(new Version("1.2.3")));
         assertFalse(new Version("1.2.3").isAfter(new Version("1.2.3")));
         assertFalse(new Version("1.2.3").isAfter(new Version("1.2.4")));
         assertFalse(new Version("1.2.3").isAfter(new Version("1.3.3")));