Migrate tests to Junit5

org.eclipse.sisu.inject/bnd.bnd

@@ -8,6 +8,9 @@ Main-Class: org.eclipse.sisu.launch.Main
 Import-Package: com.google.inject.servlet;resolution:=optional,\
  javax.servlet.*;resolution:=optional,\
  org.slf4j.*;resolution:=optional,\
+ org.junit.jupiter.api.*;resolution:=optional,\
+ org.junit.jupiter.params.*;resolution:=optional,\
+ org.junit.platform.*;resolution:=optional,\
  org.junit.*;resolution:=optional,\
  junit.framework.*;resolution:=optional,\
  org.testng.*;resolution:=optional,\

org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/launch/AssistedTestCase.java

@@ -10,6 +10,9 @@
  *******************************************************************************/
 package org.eclipse.sisu.launch;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.google.inject.Binder;
 import com.google.inject.Key;
 import com.google.inject.assistedinject.Assisted;
@@ -18,12 +21,9 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.eclipse.sisu.inject.BeanLocator;
+import org.junit.jupiter.api.Test;
 
-/**
- * Still JUnit3 based test
- * Execute with JUnit3 runner.
- */
-public final class AssistedTestCase extends InjectedTestCase {
+public class AssistedTestCase extends InjectedTest {
     interface FooFactory {
         Foo create(int port);
     }
@@ -59,6 +59,7 @@ public void configure(final Properties properties) {
     @Inject
     BeanLocator beanLocator;
 
+    @Test
     public void testAssistedInject() {
         Foo bean = beanFactory.create(8080);
         assertTrue(bean instanceof AssistedFoo);

org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/launch/Custom1TestCase.java

@@ -10,14 +10,16 @@
  *******************************************************************************/
 package org.eclipse.sisu.launch;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.google.inject.Binder;
 import javax.inject.Inject;
+import org.junit.jupiter.api.Test;
 
 /**
- * Still JUnit3 based test
- * Execute with JUnit3 runner.
+ * Migrated to JUnit 5.
  */
-public final class Custom1TestCase extends InjectedTestCase {
+public class Custom1TestCase extends InjectedTest {
     @Override
     public void configure(final Binder binder) {
         // override automatic binding
@@ -27,6 +29,7 @@ public void configure(final Binder binder) {
     @Inject
     Foo bean;
 
+    @Test
     public void testPerTestCaseCustomization() {
         assertTrue(bean instanceof NamedFoo);
     }

org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/launch/Custom3TestCase.java

@@ -10,15 +10,18 @@
  *******************************************************************************/
 package org.eclipse.sisu.launch;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.Properties;
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.junit.jupiter.api.Test;
 
 /**
- * Still JUnit3 based test
- * Execute with JUnit3 runner.
+ * Migrated to JUnit 5.
  */
-public final class Custom3TestCase extends InjectedTestCase {
+public class Custom3TestCase extends InjectedTest {
     @Override
     public void configure(final Properties properties) {
         properties.put("hint", "NameTag");
@@ -33,6 +36,7 @@ public void configure(final Properties properties) {
     @Named("${port}")
     int port;
 
+    @Test
     public void testPerTestCaseCustomization() {
         assertTrue(bean instanceof NamedAndTaggedFoo);
 

org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/launch/ExampleTestCase.java

@@ -10,17 +10,21 @@
  *******************************************************************************/
 package org.eclipse.sisu.launch;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.google.inject.name.Names;
 import java.io.File;
 import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.junit.jupiter.api.Test;
 
 /**
- * Still JUnit3 based test
- * Execute with JUnit3 runner.
+ * Migrated to JUnit 5.
  */
-public final class ExampleTestCase extends InjectedTestCase {
+public class ExampleTestCase extends InjectedTest {
     @Inject
     @Named("${basedir}")
     String basedir;
@@ -29,6 +33,7 @@ public final class ExampleTestCase extends InjectedTestCase {
     @Named("${basedir}/target/test-classes/org/eclipse/sisu/launch/inject.properties")
     File propertiesFile;
 
+    @Test
     public void testBasedir() {
         assertEquals(getBasedir(), basedir);
         assertTrue(propertiesFile.isFile());
@@ -40,6 +45,7 @@ public void testBasedir() {
     @Inject
     Map<String, Foo> beans;
 
+    @Test
     public void testInjection() {
         assertTrue(bean instanceof DefaultFoo);
 
@@ -53,6 +59,7 @@ public void testInjection() {
         assertTrue(bean == beans.get("default"));
     }
 
+    @Test
     public void testContainerLookup() {
         assertTrue(lookup(Foo.class) instanceof DefaultFoo);
         assertTrue(lookup(Foo.class, Named.class) instanceof DefaultFoo);

org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/launch/PrivateModuleTestCase.java

@@ -10,18 +10,21 @@
  *******************************************************************************/
 package org.eclipse.sisu.launch;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.google.inject.Binder;
 import com.google.inject.PrivateModule;
 import com.google.inject.name.Names;
 import java.util.Properties;
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.junit.jupiter.api.Test;
 
 /**
- * Still JUnit3 based test
- * Execute with JUnit3 runner.
+ * JUnit 5 version.
  */
-public final class PrivateModuleTestCase extends InjectedTestCase {
+public final class PrivateModuleTestCase extends InjectedTest {
     static class PrivateFoo implements Foo {
         final String host;
 
@@ -80,6 +83,7 @@ public void configure(final Properties properties) {
     @Named("B")
     Foo beanB;
 
+    @Test
     public void testAssistedInject() {
         assertTrue(bean instanceof PrivateFoo);
         assertEquals("127.0.0.1", ((PrivateFoo) bean).host);

org.eclipse.sisu.inject/src/test/java/org/eclipse/sisu/launch/RequireBindingsTestCase.java

@@ -10,14 +10,16 @@
  *******************************************************************************/
 package org.eclipse.sisu.launch;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import com.google.inject.Binder;
 import javax.inject.Inject;
+import org.junit.jupiter.api.Test;
 
 /**
- * Still JUnit3 based test
- * Execute with JUnit3 runner.
+ * JUnit 5 version.
  */
-public final class RequireBindingsTestCase extends InjectedTestCase {
+public final class RequireBindingsTestCase extends InjectedTest {
     @Override
     public void configure(final Binder binder) {
         binder.requireExplicitBindings();
@@ -26,6 +28,7 @@ public void configure(final Binder binder) {
     @Inject
     Foo bean;
 
+    @Test
     public void testRequireExplicitBindings() {
         assertNotNull(bean);
     }

org.eclipse.sisu.mojos/pom.xml

@@ -92,11 +92,6 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-build-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

org.eclipse.sisu.plexus/pom.xml

@@ -97,6 +97,12 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>

org.eclipse.sisu.plexus/src/test/java/org/codehaus/plexus/component/configurator/converters/basic/EnumConverterTest.java

@@ -6,17 +6,17 @@
  *******************************************************************************/
 package org.codehaus.plexus.component.configurator.converters.basic;
 
-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;
 
 import java.io.File;
 import java.nio.file.StandardCopyOption;
 import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class EnumConverterTest {
     @Test

org.eclipse.sisu.plexus/src/test/java/org/codehaus/plexus/component/configurator/converters/composite/MapConverterTest.java

@@ -6,9 +6,9 @@
  *******************************************************************************/
 package org.codehaus.plexus.component.configurator.converters.composite;
 
-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;
 
 import java.io.File;
 import java.util.HashMap;
@@ -17,7 +17,7 @@
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MapConverterTest {
     @Test

org.eclipse.sisu.plexus/src/test/java/org/codehaus/plexus/component/configurator/converters/composite/PropertiesConverterTest.java

@@ -6,17 +6,17 @@
  *******************************************************************************/
 package org.codehaus.plexus.component.configurator.converters.composite;
 
-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;
 
 import java.io.File;
 import java.util.Properties;
 import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PropertiesConverterTest {
     @Test
@@ -56,7 +56,7 @@ public File alignToBaseDirectory(File path) {
                         null);
         assertTrue(object instanceof Properties);
         Properties result = (Properties) object;
-        assertTrue(result.size() == 2);
+        assertEquals(2, result.size());
         assertEquals("value1", result.getProperty("key1"));
         assertEquals("value2", result.getProperty("key2"));
     }

org.eclipse.sisu.plexus/src/test/java/org/eclipse/sisu/plexus/ArrayConstantTest.java

@@ -10,18 +10,22 @@
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.name.Names;
 import java.net.URI;
-import java.util.Arrays;
 import javax.inject.Inject;
 import javax.inject.Named;
-import junit.framework.TestCase;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class ArrayConstantTest {
 
-public class ArrayConstantTest extends TestCase {
-    @Override
-    protected void setUp() throws Exception {
+    @BeforeEach
+    void setUp() {
         Guice.createInjector(new AbstractModule() {
                     private void bind(final String name, final String value) {
                         bindConstant().annotatedWith(Names.named(name)).to(value);
@@ -74,26 +78,29 @@ protected void configure() {
     @Named("Multi")
     double[][] multi2;
 
+    @Test
     public void testEmptyArray() {
         assertEquals(0, empty.length);
     }
 
-    @SuppressWarnings("boxing")
+    @Test
     public void testCustomArray() {
-        assertTrue(Arrays.equals(new Object[] {true, URI.create("file:temp"), 8.1f}, custom));
+        assertArrayEquals(new Object[] {true, URI.create("file:temp"), 8.1f}, custom);
     }
 
+    @Test
     public void testStringArray() {
-        assertTrue(Arrays.equals(new String[] {"1", "2", "3"}, text));
+        assertArrayEquals(new String[] {"1", "2", "3"}, text);
     }
 
+    @Test
     public void testPrimitiveArray() {
-        assertTrue(Arrays.equals(new int[] {4, 5, 6}, numbers));
+        assertArrayEquals(new int[] {4, 5, 6}, numbers);
     }
 
-    @SuppressWarnings("boxing")
+    @Test
     public void testMultiArrays() {
-        assertTrue(Arrays.deepEquals(new Integer[][] {{1, 2}, {3, 4}, {5, 6}}, multi1));
-        assertTrue(Arrays.deepEquals(new double[][] {{1, 2}, {3, 4}, {5, 6}}, multi2));
+        assertArrayEquals(new Integer[][] {{1, 2}, {3, 4}, {5, 6}}, multi1);
+        assertArrayEquals(new double[][] {{1, 2}, {3, 4}, {5, 6}}, multi2);
     }
 }