Migrate from Hamcrest and AssertJ to JUnit 5 assertions

api/maven-api-core/src/test/java/org/apache/maven/api/services/RequestImplementationTest.java

@@ -69,8 +69,8 @@ void testArtifactResolverRequestEquality() {
 
         // Test toString
         String toString = request1.toString();
-        assertTrue(toString.contains("coordinates="));
-        assertTrue(toString.contains("repositories="));
+        assertTrue(toString.contains("coordinates="), "Expected " + toString + " to contain " + "coordinates=");
+        assertTrue(toString.contains("repositories="), "Expected " + toString + " to contain " + "repositories=");
     }
 
     @Test
@@ -110,7 +110,7 @@ void testDependencyResolverRequestEquality() {
         assertNotEquals(request1, request3);
 
         String toString = request1.toString();
-        assertTrue(toString.contains("requestType="));
-        assertTrue(toString.contains("pathScope="));
+        assertTrue(toString.contains("requestType="), "Expected " + toString + " to contain " + "requestType=");
+        assertTrue(toString.contains("pathScope="), "Expected " + toString + " to contain " + "pathScope=");
     }
 }

compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java

@@ -176,7 +176,7 @@ void testSnapshotVsReleases() {
     void testHashCode() {
         ArtifactVersion v1 = newArtifactVersion("1");
         ArtifactVersion v2 = newArtifactVersion("1.0");
-        assertTrue(v1.equals(v2));
+        assertTrue(v1.equals(v2), "Expected " + v1 + " to equal " + v2);
         assertEquals(v1.hashCode(), v2.hashCode());
     }
 

compat/maven-compat/pom.xml

@@ -174,11 +174,7 @@ under the License.
       <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
+
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>

compat/maven-compat/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java

@@ -32,9 +32,8 @@
 import org.junit.jupiter.api.Test;
 
 import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.endsWith;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Deprecated
 class ProjectDependenciesResolverTest extends AbstractCoreMavenComponentTestCase {
@@ -82,6 +81,6 @@ void testSystemScopeDependencyIsPresentInTheCompileClasspathElements() throws Ex
         @SuppressWarnings("deprecation")
         List<Artifact> artifacts = project.getCompileArtifacts();
         assertEquals(1, artifacts.size());
-        assertThat(artifacts.get(0).getFile().getName(), endsWith("tools.jar"));
+        assertTrue(artifacts.get(0).getFile().getName().endsWith("tools.jar"));
     }
 }

compat/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java

@@ -67,7 +67,7 @@ void testArtifactInstallation() throws Exception {
 
             ArtifactRepository remoteRepository = remoteRepository();
             File deployedFile = new File(remoteRepository.getBasedir(), remoteRepository.pathOf(artifact));
-            assertTrue(deployedFile.exists());
+            assertTrue(deployedFile.exists(), "Expected " + deployedFile + ".exists() to return true");
             assertEquals("dummy", new String(Files.readAllBytes(deployedFile.toPath()), StandardCharsets.UTF_8).trim());
         } finally {
             sessionScope.exit();

compat/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java

@@ -47,10 +47,10 @@ void testHashCodeEquals() {
         assertTrue(r1.hashCode() == r2.hashCode());
         assertFalse(r1.hashCode() == r3.hashCode());
 
-        assertTrue(r1.equals(r2));
-        assertTrue(r2.equals(r1));
+        assertTrue(r1.equals(r2), "Expected " + r1 + " to equal " + r2);
+        assertTrue(r2.equals(r1), "Expected " + r2 + " to equal " + r1);
 
-        assertFalse(r1.equals(r3));
-        assertFalse(r3.equals(r1));
+        assertFalse(r1.equals(r3), "Expected " + r1 + " to not equal " + r3);
+        assertFalse(r3.equals(r1), "Expected " + r3 + " to not equal " + r1);
     }
 }

compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java

@@ -42,11 +42,11 @@ void testEquals() {
 
         AndArtifactFilter filter2 = new AndArtifactFilter(Arrays.asList(newSubFilter()));
 
-        assertFalse(filter1.equals(null));
-        assertTrue(filter1.equals(filter1));
+        assertFalse(filter1.equals(null), "Expected " + filter1 + " to not equal " + null);
+        assertTrue(filter1.equals(filter1), "Expected " + filter1 + " to equal " + filter1);
         assertEquals(filter1.hashCode(), filter1.hashCode());
 
-        assertFalse(filter1.equals(filter2));
-        assertFalse(filter2.equals(filter1));
+        assertFalse(filter1.equals(filter2), "Expected " + filter1 + " to not equal " + filter2);
+        assertFalse(filter2.equals(filter1), "Expected " + filter2 + " to not equal " + filter1);
     }
 }

compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java

@@ -37,12 +37,12 @@ void testIncludesExcludesArtifactFilter() {
 
         IncludesArtifactFilter f2 = new IncludesArtifactFilter(patterns);
 
-        assertTrue(f1.equals(f2));
-        assertTrue(f2.equals(f1));
+        assertTrue(f1.equals(f2), "Expected " + f1 + " to equal " + f2);
+        assertTrue(f2.equals(f1), "Expected " + f2 + " to equal " + f1);
         assertTrue(f1.hashCode() == f2.hashCode());
 
         IncludesArtifactFilter f3 = new IncludesArtifactFilter(Arrays.asList("d", "c", "e"));
-        assertTrue(f1.equals(f3));
+        assertTrue(f1.equals(f3), "Expected " + f1 + " to equal " + f3);
         assertTrue(f1.hashCode() == f3.hashCode());
     }
 }

compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java

@@ -43,11 +43,11 @@ void testEquals() {
 
         OrArtifactFilter filter2 = new OrArtifactFilter(Arrays.asList(newSubFilter()));
 
-        assertFalse(filter1.equals(null));
-        assertTrue(filter1.equals(filter1));
+        assertFalse(filter1.equals(null), "Expected " + filter1 + " to not equal " + null);
+        assertTrue(filter1.equals(filter1), "Expected " + filter1 + " to equal " + filter1);
         assertEquals(filter1.hashCode(), filter1.hashCode());
 
-        assertFalse(filter1.equals(filter2));
-        assertFalse(filter2.equals(filter1));
+        assertFalse(filter1.equals(filter2), "Expected " + filter1 + " to not equal " + filter2);
+        assertFalse(filter2.equals(filter1), "Expected " + filter2 + " to not equal " + filter1);
     }
 }

compat/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java

@@ -120,9 +120,9 @@ public void assertFileExistence(File dir, String filename, boolean shouldExist)
         File file = new File(dir, filename);
 
         if (shouldExist) {
-            assertTrue(file.exists());
+            assertTrue(file.exists(), "Expected " + file + ".exists() to return true");
         } else {
-            assertFalse(file.exists());
+            assertFalse(file.exists(), "Expected " + file + ".exists() to return false");
         }
     }
 

compat/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java

@@ -185,7 +185,7 @@ public void setPath(ProducedArtifact artifact, Path path) {
         //
         d.setScope(Artifact.SCOPE_SYSTEM);
         File file = new File(getBasedir(), "src/test/repository-system/maven-core-2.1.0.jar");
-        assertTrue(file.exists());
+        assertTrue(file.exists(), "Expected " + file + ".exists() to return true");
         d.setSystemPath(file.getCanonicalPath());
 
         artifact = repositorySystem.createDependencyArtifact(d);
@@ -208,7 +208,7 @@ public void setPath(ProducedArtifact artifact, Path path) {
         // Put in a bogus file to make sure missing files cause the resolution to fail.
         //
         file = new File(getBasedir(), "src/test/repository-system/maven-monkey-2.1.0.jar");
-        assertFalse(file.exists());
+        assertFalse(file.exists(), "Expected " + file + ".exists() to return false");
         d.setSystemPath(file.getCanonicalPath());
         artifact = repositorySystem.createDependencyArtifact(d);
 
@@ -226,7 +226,7 @@ public void setPath(ProducedArtifact artifact, Path path) {
             result = repositorySystem.resolve(request);
             resolutionErrorHandler.throwErrors(request, result);
         } catch (Exception e) {
-            assertTrue(result.hasMissingArtifacts());
+            assertTrue(result.hasMissingArtifacts(), "Expected " + result + ".hasMissingArtifacts() to return true");
         }
     }
 

compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java

@@ -108,7 +108,7 @@ void testMissingArtifact() throws Exception {
 
         assertFalse(updateCheckManager.isUpdateRequired(a, remoteRepository));
 
-        assertFalse(file.exists());
+        assertFalse(file.exists(), "Expected " + file + ".exists() to return false");
         assertNotNull(
                 updateCheckManager.readLastUpdated(touchFile, updateCheckManager.getRepositoryKey(remoteRepository)));
     }
@@ -161,7 +161,7 @@ void testMissingPom() throws Exception {
 
         assertFalse(updateCheckManager.isUpdateRequired(a, remoteRepository));
 
-        assertFalse(file.exists());
+        assertFalse(file.exists(), "Expected " + file + ".exists() to return false");
         assertNotNull(
                 updateCheckManager.readLastUpdated(touchFile, updateCheckManager.getRepositoryKey(remoteRepository)));
     }

compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java

@@ -333,7 +333,7 @@ void testIncompatibleRanges() throws ArtifactResolutionException, InvalidVersion
 
         ArtifactResolutionResult res = collect(a);
 
-        assertTrue(res.hasVersionRangeViolations());
+        assertTrue(res.hasVersionRangeViolations(), "Expected " + res + ".hasVersionRangeViolations() to return true");
     }
 
     @Test
@@ -346,7 +346,7 @@ void testUnboundedRangeWhenVersionUnavailable()
 
         ArtifactResolutionResult res = collect(a);
 
-        assertTrue(res.hasVersionRangeViolations());
+        assertTrue(res.hasVersionRangeViolations(), "Expected " + res + ".hasVersionRangeViolations() to return true");
     }
 
     @Test
@@ -371,7 +371,7 @@ void testUnboundedRangeAboveLastRelease() throws ArtifactResolutionException, In
 
         ArtifactResolutionResult res = collect(a);
 
-        assertTrue(res.hasVersionRangeViolations());
+        assertTrue(res.hasVersionRangeViolations(), "Expected " + res + ".hasVersionRangeViolations() to return true");
     }
 
     @Test
@@ -665,7 +665,7 @@ void testSnapshotNotIncluded() throws ArtifactResolutionException, InvalidVersio
 
         ArtifactResolutionResult res = collect(a);
 
-        assertTrue(res.hasVersionRangeViolations());
+        assertTrue(res.hasVersionRangeViolations(), "Expected " + res + ".hasVersionRangeViolations() to return true");
 
         /*
          * try { ArtifactResolutionResult res = collect( a ); fail( "Expected b not to resolve: " + res ); } catch (

compat/maven-embedder/pom.xml

@@ -205,11 +205,7 @@ under the License.
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
+
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>