You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/09/19 21:49:30 UTC

(maven-filtering) 01/01: Drop Hamcrest from tests

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch agent/drop-hamcrest
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git

commit ec6d6f48f6191488557f86b2f2cd76b921cdf29b
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Sep 19 23:49:15 2026 +0200

    Drop Hamcrest from tests
---
 pom.xml                                              |  7 -------
 .../filtering/AbstractMavenFilteringRequestTest.java | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2bfedbf..cb33cc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,6 @@
     <javaVersion>17</javaVersion>
     <mavenVersion>4.0.0-rc-6</mavenVersion>
 
-    <hamcrestVersion>3.0</hamcrestVersion>
     <junitVersion>5.14.4</junitVersion>
     <mockitoVersion>5.23.0</mockitoVersion>
     <mavenPluginTestingVersion>4.0.0-beta-4</mavenPluginTestingVersion>
@@ -159,12 +158,6 @@
       <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <version>${hamcrestVersion}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
diff --git a/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java b/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
index d229c33..47d9dde 100644
--- a/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
@@ -19,11 +19,11 @@
 package org.apache.maven.shared.filtering;
 
 import java.util.LinkedHashSet;
+import java.util.List;
 
-import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertIterableEquals;
 
 /**
  * @author Karl Heinz Marbaise <a href="mailto:khmarbaise@apache.org">khmarbaise@apache.org</a>.
@@ -36,20 +36,20 @@ class AbstractMavenFilteringRequestTest {
     @Test
     void setDelimitersShouldNotChangeAnythingIfUsingNull() {
         request.setDelimiters(null, false);
-        assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
+        assertIterableEquals(List.of("${*}", "@"), request.getDelimiters());
     }
 
     @Test
     void setDelimitersShouldNotChangeAnythingIfUsingEmpty() {
         request.setDelimiters(delimiters, false);
-        assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
+        assertIterableEquals(List.of("${*}", "@"), request.getDelimiters());
     }
 
     @Test
     void setDelimitersShouldAddOnlyTheGivenDelimiter() {
         delimiters.add("test");
         request.setDelimiters(delimiters, false);
-        assertThat(request.getDelimiters(), Matchers.contains("test"));
+        assertIterableEquals(List.of("test"), request.getDelimiters());
     }
 
     @Test
@@ -58,27 +58,27 @@ class AbstractMavenFilteringRequestTest {
         delimiters.add(null);
         delimiters.add("second");
         request.setDelimiters(delimiters, false);
-        assertThat(request.getDelimiters(), Matchers.contains("test", "${*}", "second"));
+        assertIterableEquals(List.of("test", "${*}", "second"), request.getDelimiters());
     }
 
     @Test
     void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNullGiven() {
         request.setDelimiters(null, true);
-        assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
+        assertIterableEquals(List.of("${*}", "@"), request.getDelimiters());
     }
 
     @Test
     void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNotNullGiven() {
         LinkedHashSet<String> delimiters = new LinkedHashSet<>();
         request.setDelimiters(delimiters, true);
-        assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
+        assertIterableEquals(List.of("${*}", "@"), request.getDelimiters());
     }
 
     @Test
     void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfSingleElementIsGiven() {
         delimiters.add("test");
         request.setDelimiters(delimiters, true);
-        assertThat(request.getDelimiters(), Matchers.contains("${*}", "@", "test"));
+        assertIterableEquals(List.of("${*}", "@", "test"), request.getDelimiters());
     }
 
     @Test
@@ -87,6 +87,6 @@ class AbstractMavenFilteringRequestTest {
         delimiters.add(null);
         delimiters.add("second");
         request.setDelimiters(delimiters, true);
-        assertThat(request.getDelimiters(), Matchers.contains("${*}", "@", "test", "second"));
+        assertIterableEquals(List.of("${*}", "@", "test", "second"), request.getDelimiters());
     }
 }