Migrate all tests to JUnit Jupiter (#424)

This change migrates all tests to use JUnit Jupiter, so that is all tests are now annotated with `org.junit.jupiter.api.Test`. In most cases, this is a simple change of imports, with a few exceptions: * Uses of `assertTrue` have been adjusted to allow for the description being the last parameter * `org.hamcrest.AbstractMatcherTest` has been moved to `org.hamcrest.test.AbstractMatcherTest` * Static assertion methods in `AbstractMatcherTest` have been moved to `org.hamcrest.test.MatcherAssertions`

Author: tumbarumba

CHANGES.md

@@ -23,6 +23,7 @@ these methods will need to be updated. The following methods are affected:
 * Javadoc improvements and cleanup ([PR #420](https://github.com/hamcrest/JavaHamcrest/pull/420))
 * Optional matchers ([PR #421](https://github.com/hamcrest/JavaHamcrest/pull/421))
 * Derive version from git tags ([PR #419](https://github.com/hamcrest/JavaHamcrest/pull/419))
+* Migrate all tests to JUnit Jupiter ([PR #424](https://github.com/hamcrest/JavaHamcrest/pull/424))
 
 ### Bugfixes
 

gradle/libs.versions.toml

@@ -0,0 +1,7 @@
+# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
+
+[versions]
+junit-jupiter = "5.11.2"
+
+[libraries]
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }

hamcrest/hamcrest.gradle

@@ -5,13 +5,12 @@ plugins {
 version = rootProject.version
 
 dependencies {
- testImplementation(group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.3') {
- transitive = true
- }
- testImplementation(group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.10.3') {
- transitive = true
- exclude(module: 'hamcrest-core')
- }
+ testImplementation libs.junit.jupiter
+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+}
+
+tasks.named("test") {
+ useJUnitPlatform()
 }
 
 jar {

hamcrest/src/test/java/org/hamcrest/AbstractMatcherTest.java

@@ -1,8 +1,8 @@
 package org.hamcrest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public final class BaseDescriptionTest {
 

hamcrest/src/test/java/org/hamcrest/BaseDescriptionTest.java

@@ -1,8 +1,8 @@
 package org.hamcrest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public final class BaseMatcherTest {
 

hamcrest/src/test/java/org/hamcrest/BaseMatcherTest.java

@@ -1,8 +1,9 @@
 package org.hamcrest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.test.MatcherAssertions.assertDescription;
 
-import static org.hamcrest.AbstractMatcherTest.assertDescription;
 
 public final class CustomMatcherTest {
 

hamcrest/src/test/java/org/hamcrest/CustomMatcherTest.java

@@ -1,8 +1,8 @@
 package org.hamcrest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.AbstractMatcherTest.*;
+import static org.hamcrest.test.MatcherAssertions.*;
 
 public final class CustomTypeSafeMatcherTest {
 

hamcrest/src/test/java/org/hamcrest/CustomTypeSafeMatcherTest.java

@@ -1,10 +1,10 @@
 package org.hamcrest;
 
 import org.hamcrest.core.IsEqual;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.AbstractMatcherTest.*;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.test.MatcherAssertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public final class FeatureMatcherTest {
 

hamcrest/src/test/java/org/hamcrest/FeatureMatcherTest.java

@@ -1,10 +1,10 @@
 package org.hamcrest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public final class MatcherAssertTest {