migrate from testng to junit5

lightblueseas · Jul 3, 2024 · 69f2f4a · 69f2f4a
1 parent b9d7976
commit 69f2f4a
Show file tree

Hide file tree

Showing 18 changed files with 108 additions and 87 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -28,31 +28,27 @@ projectRepositoriesPasswordKey=ossrhPassword
 projectRepositoriesReleasesName=Sonatype Nexus Releases
 projectRepositoriesSnapshotsName=Sonatype Nexus Snapshots
 projectRepositoriesMavenUrl=https://plugins.gradle.org/m2/
-###########################
-# gradle-plugins versions #
-###########################
-gradlePluginLombokVersion=8.4
-gradlePluginVersionsVersion=0.49.0
-licenseGradlePluginVersion=0.16.1
-grgitGradlePluginVersion=5.2.1
-spotlessGradlePluginVersion=6.22.0
-#########################
-# dependencies versions #
-#########################
-lombokVersion=1.18.30
-commonsLang3Version=3.13.0
-jdkSerializableFunctionalVersion=1.9.0
-##############################
-# test dependencies versions #
-##############################
-testObjectVersion=8
-hamcrestAllVersion=1.3
-testngVersion=7.8.0
 ##########################
 # for deploy on sonatype #
 ##########################
 systemProp.org.gradle.internal.publish.checksums.insecure=true
+#############################
+# gradle related properties #
+#############################
+# Enable the Gradle daemon
+org.gradle.daemon=true
+# Enable the build cache
 org.gradle.caching=true
+# Enable parallel execution
 org.gradle.parallel=true
+# Run Gradle in offline mode
+org.gradle.offline=false
+# Configure console output
+org.gradle.console=auto
+# Set the warning mode
+org.gradle.warning.mode=summary
+# Enable Configure on Demand to improve configuration time
 org.gradle.configureondemand=true
+# Enable VFS watching for better performance
 org.gradle.vfs.watch=true
+
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -7,7 +7,7 @@ dependencies {
 
     implementation libs.commons.lang3
     implementation libs.jdk.serializable.functional
-
     // Note: use of bundles...
     testImplementation libs.bundles.unit.testing
+    testRuntimeOnly libs.junit.platform.launcher
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,23 +8,28 @@ gradle-plugin-version-catalog-update-version = "0.8.4"
 gradle-plugin-versions-version = "0.51.0"
 hamcrest-all-version = "1.3"
 jdk-serializable-functional-version = "1.9.0"
-lombok-version = "1.18.32"
+lombok-version = "1.18.34"
 test-object-version = "8.2"
-testng-version = "7.10.2"
+junit-jupiter-params-version = "5.11.0-M2"
+junit-jupiter-version = "5.11.0-M2"
+junit-platform-launcher-version = "1.11.0-M2"
 
 [libraries]
 commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commons-lang3-version" }
 hamcrest-all = { module = "org.hamcrest:hamcrest-all", version.ref = "hamcrest-all-version" }
 jdk-serializable-functional = { module = "org.danekja:jdk-serializable-functional", version.ref = "jdk-serializable-functional-version" }
 lombok = { module = "org.projectlombok:lombok", version.ref = "lombok-version" }
 test-object = { module = "io.github.astrapi69:test-object", version.ref = "test-object-version" }
-testng = { module = "org.testng:testng", version.ref = "testng-version" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter-version" }
+junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter-params-version" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform-launcher-version" }
 
 [bundles]
 unit-testing = [
     "hamcrest-all",
     "test-object",
-    "testng",
+    "junit-jupiter",
+    "junit-jupiter-params",
 ]
 
 [plugins]

diff --git a/gradle/testing.gradle b/gradle/testing.gradle
@@ -1,5 +1,5 @@
 test {
-    useTestNG()
+    useJUnitPlatform()
 }
 
 jacocoTestReport {

diff --git a/src/test/java/io/github/astrapi69/model/AbstractPropertyModelObjectClassTest.java b/src/test/java/io/github/astrapi69/model/AbstractPropertyModelObjectClassTest.java
@@ -15,13 +15,13 @@
  */
 package io.github.astrapi69.model;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import io.github.astrapi69.model.api.IModel;
 

diff --git a/src/test/java/io/github/astrapi69/model/GenericModelTest.java b/src/test/java/io/github/astrapi69/model/GenericModelTest.java
@@ -15,10 +15,10 @@
  */
 package io.github.astrapi69.model;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import io.github.astrapi69.model.api.IModel;
 import io.github.astrapi69.test.object.Employee;

diff --git a/src/test/java/io/github/astrapi69/model/LambdaBindingModelTest.java b/src/test/java/io/github/astrapi69/model/LambdaBindingModelTest.java
@@ -15,9 +15,9 @@
  */
 package io.github.astrapi69.model;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import io.github.astrapi69.model.api.IModel;
 import io.github.astrapi69.test.object.Company;

diff --git a/src/test/java/io/github/astrapi69/model/LambdaModelTest.java b/src/test/java/io/github/astrapi69/model/LambdaModelTest.java
@@ -19,9 +19,10 @@
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import io.github.astrapi69.model.api.IModel;
 import io.github.astrapi69.model.lambda.Person;
@@ -120,13 +121,14 @@ public void targetModelPerson()
 		assertThat(personNameModel.getObject(), is("new name"));
 	}
 
-	@Test(expectedExceptions = UnsupportedOperationException.class)
+	@Test
 	public void targetReadOnly()
 	{
-		final IModel<Person> target = SerializableModel.of(new Person());
-
-		final IModel<String> personNameModel = LambdaModel.of(target, Person::getName);
-		check(personNameModel);
+		Assertions.assertThrows(UnsupportedOperationException.class, () -> { // ...
+			final IModel<Person> target = SerializableModel.of(new Person());
+			final IModel<String> personNameModel = LambdaModel.of(target, Person::getName);
+			check(personNameModel);
+		});
 	}
 
 

diff --git a/src/test/java/io/github/astrapi69/model/LoadableDetachableModelTest.java b/src/test/java/io/github/astrapi69/model/LoadableDetachableModelTest.java
@@ -17,7 +17,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -26,7 +26,7 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the states of a LoadableDetachableModel

diff --git a/src/test/java/io/github/astrapi69/model/ModelDetachTest.java b/src/test/java/io/github/astrapi69/model/ModelDetachTest.java
@@ -16,11 +16,11 @@
 package io.github.astrapi69.model;
 
 
-import static org.testng.AssertJUnit.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.Serial;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import io.github.astrapi69.model.api.IDetachable;
 import io.github.astrapi69.model.api.IModel;

diff --git a/src/test/java/io/github/astrapi69/model/ModelToStringTest.java b/src/test/java/io/github/astrapi69/model/ModelToStringTest.java
@@ -15,12 +15,12 @@
  */
 package io.github.astrapi69.model;
 
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Properties;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 
 /**
@@ -36,18 +36,21 @@ public void loadableDetachableModel()
 	{
 		String actual;
 		String expected;
-		final LoadableDetachableModel<String> model = new MyLoadableDetachableModel();
+		LoadableDetachableModel<String> model;
+		model = new MyLoadableDetachableModel();
 		actual = model.toString();
-		assertTrue(model.toString().contains(":attached=false"));
-		assertTrue(model.toString().contains(":tempModelObject=[null]"));
+		assertTrue(actual.contains(":attached=false"));
+		assertTrue(actual.contains(":tempModelObject=[null]"));
 
 		model.getObject();
-		assertTrue(model.toString().contains(":attached=true"));
-		assertTrue(model.toString().contains(":tempModelObject=[foo]"));
+		actual = model.toString();
+		assertTrue(actual.contains(":attached=true"));
+		assertTrue(actual.contains(":tempModelObject=[foo]"));
 
 		model.detach();
-		assertTrue(model.toString().contains(":attached=false"));
-		assertTrue(model.toString().contains(":tempModelObject=[null]"));
+		actual = model.toString();
+		assertTrue(actual.contains(":attached=false"));
+		assertTrue(actual.contains(":tempModelObject=[null]"));
 	}
 
 	/**
@@ -56,23 +59,34 @@ public void loadableDetachableModel()
 	@Test
 	public void propertyModel()
 	{
-		final PropertyModel<Void> emptyModel = new PropertyModel<>("", null);
-		String expected = "IModel:classname=[io.github.astrapi69.model.PropertyModel]:nestedModel=[]:expression=[null]";
-		assertEquals(expected, emptyModel.toString());
+		String actual;
+		String expected;
+		PropertyModel<Void> emptyModel;
+		PropertyModel<String> stringProperty;
+		Properties properties;
 
-		final Properties properties = new Properties();
-		properties.put("name", "foo");
-		final PropertyModel<String> stringProperty = new PropertyModel<>(properties, "name");
+		emptyModel = new PropertyModel<>("", null);
+		actual = emptyModel.toString();
+		expected = "IModel:classname=[io.github.astrapi69.model.PropertyModel]:nestedModel=[]:expression=[null]";
+		assertEquals(expected, actual);
 
+		properties = new Properties();
+		properties.put("name", "foo");
+		stringProperty = new PropertyModel<>(properties, "name");
+		actual = stringProperty.toString();
 		expected = "IModel:classname=[io.github.astrapi69.model.PropertyModel]:nestedModel=[{name=foo}]:expression=[name]";
-		assertEquals(expected, stringProperty.toString());
+		assertEquals(expected, actual);
 
 		stringProperty.getObject();
+		actual = stringProperty.toString();
 		expected = "IModel:classname=[io.github.astrapi69.model.PropertyModel]:nestedModel=[{name=foo}]:expression=[name]";
-		assertEquals(expected, stringProperty.toString());
+		assertEquals(expected, actual);
+
+		InnerPOJO innerPOJO;
+		PropertyModel<?> pojoProperty;
 
-		final InnerPOJO innerPOJO = new InnerPOJO();
-		final PropertyModel<?> pojoProperty = new PropertyModel<>(innerPOJO, "pojo");
+		innerPOJO = new InnerPOJO();
+		pojoProperty = new PropertyModel<>(innerPOJO, "pojo");
 
 		expected = "IModel:classname=[io.github.astrapi69.model.PropertyModel]:nestedModel=[pojo]:expression=[pojo]";
 		assertEquals(expected, pojoProperty.toString());

diff --git a/src/test/java/io/github/astrapi69/model/PropertyModelTest.java b/src/test/java/io/github/astrapi69/model/PropertyModelTest.java
@@ -15,9 +15,10 @@
  */
 package io.github.astrapi69.model;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import io.github.astrapi69.model.api.IModel;
 import io.github.astrapi69.test.object.Employee;
@@ -32,12 +33,15 @@ public class PropertyModelTest
 	 * abstract class type. This should end in an exception because Wicket can't decide what to
 	 * instantiate on behalf of the program.
 	 */
-	@Test(expectedExceptions = RuntimeException.class)
+	@Test
 	public void setWithNullPathAbstract()
 	{
-		final Person person = new Person();
-		final PropertyModel<String> model = new PropertyModel<>(person, "abstractAddress.street");
-		model.setObject("foo");
+		Assertions.assertThrows(RuntimeException.class, () -> {
+			final Person person = new Person();
+			final PropertyModel<String> model = new PropertyModel<>(person,
+				"abstractAddress.street");
+			model.setObject("foo");
+		});
 	}
 
 	@Test

diff --git a/src/test/java/io/github/astrapi69/model/PropertyModelWithListTest.java b/src/test/java/io/github/astrapi69/model/PropertyModelWithListTest.java
@@ -15,12 +15,12 @@
  */
 package io.github.astrapi69.model;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * https://issues.apache.org/jira/browse/WICKET-3929

diff --git a/src/test/java/io/github/astrapi69/model/SimpleLambdaModelTest.java b/src/test/java/io/github/astrapi69/model/SimpleLambdaModelTest.java
@@ -15,9 +15,9 @@
  */
 package io.github.astrapi69.model;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import io.github.astrapi69.model.api.IModel;
 import io.github.astrapi69.test.object.Person;

diff --git a/src/test/java/io/github/astrapi69/model/reflect/CachingMethodResolverTest.java b/src/test/java/io/github/astrapi69/model/reflect/CachingMethodResolverTest.java
@@ -15,12 +15,12 @@
  */
 package io.github.astrapi69.model.reflect;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for {@link CachingMethodResolver}.

diff --git a/src/test/java/io/github/astrapi69/model/reflect/CachingProxyFactoryTest.java b/src/test/java/io/github/astrapi69/model/reflect/CachingProxyFactoryTest.java
@@ -15,9 +15,9 @@
  */
 package io.github.astrapi69.model.reflect;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for {@link CachingProxyFactory}.

diff --git a/src/test/java/io/github/astrapi69/model/reflect/DefaultMethodResolverTest.java b/src/test/java/io/github/astrapi69/model/reflect/DefaultMethodResolverTest.java
@@ -15,12 +15,12 @@
  */
 package io.github.astrapi69.model.reflect;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.lang.reflect.Method;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for {@link DefaultMethodResolver}.