This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
The following commit(s) were added to refs/heads/master by this push:
new 865d3d7 Replace Hamcrest with JUnit 5 assertions in
AbstractMavenFilteringRequestTest
865d3d7 is described below
commit 865d3d7a21dfa34b4b3091519f1a3fb4d56cc82e
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sat Oct 31 12:24:03 2026 +0000
Replace Hamcrest with JUnit 5 assertions in
AbstractMavenFilteringRequestTest
---
pom.xml | 6 ------
.../filtering/AbstractMavenFilteringRequestTest.java | 20 ++++++++++----------
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2807765..628fbb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,12 +136,6 @@
<version>2.2.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</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 5c91afb..e648a47 100644
---
a/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.maven.shared.filtering;
+import java.util.Arrays;
import java.util.LinkedHashSet;
-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:[email protected]">[email protected]</a>.
@@ -36,20 +36,20 @@ class AbstractMavenFilteringRequestTest {
@Test
void setDelimitersShouldNotChangeAnythingIfUsingNull() {
request.setDelimiters(null, false);
- assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
+ assertIterableEquals(Arrays.asList("${*}", "@"),
request.getDelimiters());
}
@Test
void setDelimitersShouldNotChangeAnythingIfUsingEmpty() {
request.setDelimiters(delimiters, false);
- assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
+ assertIterableEquals(Arrays.asList("${*}", "@"),
request.getDelimiters());
}
@Test
void setDelimitersShouldAddOnlyTheGivenDelimiter() {
delimiters.add("test");
request.setDelimiters(delimiters, false);
- assertThat(request.getDelimiters(), Matchers.contains("test"));
+ assertIterableEquals(Arrays.asList("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(Arrays.asList("test", "${*}", "second"),
request.getDelimiters());
}
@Test
void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNullGiven() {
request.setDelimiters(null, true);
- assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
+ assertIterableEquals(Arrays.asList("${*}", "@"),
request.getDelimiters());
}
@Test
void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNotNullGiven() {
LinkedHashSet<String> delimiters = new LinkedHashSet<>();
request.setDelimiters(delimiters, true);
- assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
+ assertIterableEquals(Arrays.asList("${*}", "@"),
request.getDelimiters());
}
@Test
void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfSingleElementIsGiven()
{
delimiters.add("test");
request.setDelimiters(delimiters, true);
- assertThat(request.getDelimiters(), Matchers.contains("${*}", "@",
"test"));
+ assertIterableEquals(Arrays.asList("${*}", "@", "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(Arrays.asList("${*}", "@", "test", "second"),
request.getDelimiters());
}
}