migrated junit 4 tests to junit 5

essential/iwant-api-antrunner/src/test/java/org/fluentjava/iwant/api/antrunner/MinimalAntLoggerTest.java

@@ -1,16 +1,16 @@
 package org.fluentjava.iwant.api.antrunner;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.Project;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class MinimalAntLoggerTest {
 
@@ -19,7 +19,7 @@ public class MinimalAntLoggerTest {
 	private PrintStream err;
 	private Project project;
 
-	@Before
+	@BeforeEach
 	public void before() {
 		logger = new MinimalAntLogger();
 		errBytes = new ByteArrayOutputStream();
@@ -28,7 +28,7 @@ public void before() {
 		project = new Project();
 	}
 
-	@After
+	@AfterEach
 	public void after() {
 		err.close();
 	}

essential/iwant-api-bash/src/test/java/org/fluentjava/iwant/api/bash/BashScriptTest.java

@@ -6,7 +6,7 @@
 import java.util.Arrays;
 
 import org.fluentjava.iwant.api.core.ScriptGenerated;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BashScriptTest {
 

essential/iwant-api-bash/src/test/java/org/fluentjava/iwant/api/bash/IndentedStringArrayParserTest.java

@@ -1,11 +1,11 @@
 package org.fluentjava.iwant.api.bash;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class IndentedStringArrayParserTest {
 

essential/iwant-api-bash/src/test/java/org/fluentjava/iwant/api/bash/IngredientTypeNameValueTest.java

@@ -1,11 +1,11 @@
 package org.fluentjava.iwant.api.bash;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class IngredientTypeNameValueTest {
 

essential/iwant-api-core/src/test/java/org/fluentjava/iwant/api/core/IngredientsAndParametersTest.java

@@ -1,6 +1,6 @@
 package org.fluentjava.iwant.api.core;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 
@@ -10,8 +10,8 @@
 import org.fluentjava.iwant.api.model.TargetEvaluationContext;
 import org.fluentjava.iwant.api.target.TargetBase;
 import org.fluentjava.iwant.apimocks.TargetMock;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class IngredientsAndParametersTest {
 
@@ -20,7 +20,7 @@ public class IngredientsAndParametersTest {
 	private Path i3s;
 	private Path i4t;
 
-	@Before
+	@BeforeEach
 	public void before() {
 		i1s = Source.underWsroot("i1");
 		i2t = new TargetMock("i2");

essential/iwant-api-javamodules/src/test/java/org/fluentjava/iwant/api/javamodules/JavaComplianceTest.java

@@ -1,8 +1,8 @@
 package org.fluentjava.iwant.api.javamodules;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JavaComplianceTest {
 

essential/iwant-api-javamodules/src/test/java/org/fluentjava/iwant/api/javamodules/KotlinVersionTest.java

@@ -1,11 +1,11 @@
 package org.fluentjava.iwant.api.javamodules;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.fluentjava.iwant.api.core.SubPath;
 import org.fluentjava.iwant.api.zip.Unzipped;
 import org.fluentjava.iwant.core.download.Downloaded;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class KotlinVersionTest {
 

essential/iwant-api-javamodules/src/test/java/org/fluentjava/iwant/api/javamodules/ScalaVersionTest.java

@@ -1,9 +1,9 @@
 package org.fluentjava.iwant.api.javamodules;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.fluentjava.iwant.core.download.Downloaded;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ScalaVersionTest {
 

essential/iwant-api-model/src/test/java/org/fluentjava/iwant/api/model/ExternalSourceTest.java

@@ -1,14 +1,14 @@
 package org.fluentjava.iwant.api.model;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ExternalSourceTest {
 

essential/iwant-api-model/src/test/java/org/fluentjava/iwant/api/model/SystemEnvTest.java

@@ -1,11 +1,11 @@
 package org.fluentjava.iwant.api.model;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import org.fluentjava.iwant.api.model.SystemEnv.SystemEnvPlease;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SystemEnvTest {
 

essential/iwant-api-target/src/test/java/org/fluentjava/iwant/api/target/TargetBaseTest.java

@@ -1,12 +1,12 @@
 package org.fluentjava.iwant.api.target;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.fluentjava.iwant.api.model.Source;
 import org.fluentjava.iwant.api.model.SystemEnv;
 import org.fluentjava.iwant.api.model.Target;
 import org.fluentjava.iwant.api.model.TargetEvaluationContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TargetBaseTest {
 

essential/iwant-core-javafinder/src/test/java/org/fluentjava/iwant/core/javafinder/PathToClasspathLocationOfTest.java

@@ -1,15 +1,15 @@
 package org.fluentjava.iwant.core.javafinder;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 
 import org.fluentjava.iwant.api.javamodules.JavaModule;
 import org.fluentjava.iwant.api.model.ExternalSource;
 import org.fluentjava.iwant.api.model.Path;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PathToClasspathLocationOfTest {
 

essential/iwant-core-javafinder/src/test/java/org/fluentjava/iwant/core/javafinder/WsdefJavaOfTest.java

@@ -1,7 +1,7 @@
 package org.fluentjava.iwant.core.javafinder;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Set;
 
@@ -12,14 +12,14 @@
 import org.fluentjava.iwant.api.wsdef.IwantPluginWishes;
 import org.fluentjava.iwant.api.wsdef.WishDefinitionContext;
 import org.fluentjava.iwant.entry.Iwant.IwantException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class WsdefJavaOfTest {
 
 	private Ctx ctx;
 
-	@Before
+	@BeforeEach
 	public void before() {
 		ctx = new Ctx();
 	}

essential/iwant-core-javamodules/src/test/java/org/fluentjava/iwant/core/javamodules/JavaModulesTest.java

@@ -1,7 +1,7 @@
 package org.fluentjava.iwant.core.javamodules;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.Iterator;
 import java.util.List;
@@ -16,7 +16,7 @@
 import org.fluentjava.iwant.api.zip.Jar;
 import org.fluentjava.iwant.core.download.Downloaded;
 import org.fluentjava.iwant.core.download.GnvArtifact;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JavaModulesTest {
 

essential/iwant-entry3/src/test/java/org/fluentjava/iwant/entry3/TargetNameCheckerMicrobenchmarkTest.java

@@ -8,7 +8,7 @@
 import org.fluentjava.iwant.api.core.Concatenated;
 import org.fluentjava.iwant.api.core.Concatenated.ConcatenatedBuilder;
 import org.fluentjava.iwant.api.model.Target;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TargetNameCheckerMicrobenchmarkTest {
 

essential/iwant-entry3/src/test/java/org/fluentjava/iwant/entry3/TargetNameCheckerTest.java

@@ -1,7 +1,7 @@
 package org.fluentjava.iwant.entry3;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Arrays;
 
@@ -10,7 +10,7 @@
 import org.fluentjava.iwant.api.model.Path;
 import org.fluentjava.iwant.api.model.Source;
 import org.fluentjava.iwant.api.model.Target;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TargetNameCheckerTest {
 

optional/iwant-plugin-testng/src/test/java/org/fluentjava/iwant/plugin/testng/TestngRunnerTest.java

@@ -1,32 +1,32 @@
 package org.fluentjava.iwant.plugin.testng;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import org.fluentjava.iwant.entry.Iwant;
 import org.fluentjava.iwant.entry.Iwant.ExitCalledException;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestngRunnerTest {
 
 	private static SecurityManager originalSecurityManager;
 
-	@BeforeClass
+	@BeforeAll
 	public static void beforeClass() {
 		originalSecurityManager = System.getSecurityManager();
 		System.setSecurityManager(new Iwant.ExitCatcher());
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void afterClass() {
 		System.setSecurityManager(originalSecurityManager);
 	}
 
-	@Before
+	@BeforeEach
 	public void before() {
 		Successful1.test1Executed = false;
 		Successful1.test2Executed = false;

private/iwant-docs/backlog.txt

@@ -7,6 +7,8 @@
   - simplify iwant for iwant (our iwant.sh): simply use a magic string for tmp, remove by it from cache
   - optional old runner when defining javamodules: fluent methods for these
   - convert all tests to junit 5
+    + 4
+    - 3
   - document: in own modules class it's wise to funnel throug a myModule method
     - deprecate and even remove commonSettins
     - ha, maybe even force by defining abstract myModule method

private/iwant-entry-tests/src/test/java/org/fluentjava/iwant/entry/tests/HttpDownloadTest.java

@@ -1,8 +1,8 @@
 package org.fluentjava.iwant.entry.tests;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.io.IOException;
@@ -31,10 +31,10 @@
 import org.apache.commons.io.FileUtils;
 import org.fluentjava.iwant.entry.Iwant;
 import org.fluentjava.iwant.testarea.TestArea;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpServer;
@@ -53,12 +53,12 @@ public class HttpDownloadTest {
 	private SSLSocketFactory defaultSocketFactory;
 	private TrustManager[] defaultTrustManagers;
 
-	@BeforeClass
+	@BeforeAll
 	public static void beforeClass() {
 		vertx = Vertx.vertx();
 	}
 
-	@Before
+	@BeforeEach
 	public void before() throws InterruptedException, URISyntaxException,
 			NoSuchAlgorithmException, KeyStoreException, KeyManagementException,
 			UnrecoverableKeyException {
@@ -67,7 +67,7 @@ public void before() throws InterruptedException, URISyntaxException,
 		disableCertificateChecks();
 	}
 
-	@After
+	@AfterEach
 	public void after() throws InterruptedException, KeyManagementException,
 			NoSuchAlgorithmException {
 		enableDefaultCertificateChecks();