You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/05/30 15:26:25 UTC
[maven-filtering] 01/01: update test dependencies
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch deps
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit 57987d47040edb17d04d81ce1110540370bf3bba
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sat May 30 11:25:55 2020 -0400
update test dependencies
---
.gitignore | 3 ++
pom.xml | 15 +++++-----
.../AbstractMavenFilteringRequestTest.java | 35 ++++++++++------------
3 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2e7c1b2..cd960ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@ out/
/bootstrap
/dependencies.xml
.java-version
+*.versionsBackup
+.checkstyle
+
diff --git a/pom.xml b/pom.xml
index 936711e..64220ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,21 +110,20 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.9.5</version>
+ <version>2.28.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>1.7.1</version>
- <scope>test</scope>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
</dependency>
</dependencies>
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 f9381d7..706804c 100644
--- a/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
@@ -1,5 +1,7 @@
package org.apache.maven.shared.filtering;
+import static org.hamcrest.MatcherAssert.assertThat;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,10 +21,10 @@ package org.apache.maven.shared.filtering;
* under the License.
*/
-import static org.assertj.core.api.Assertions.assertThat;
import java.util.LinkedHashSet;
+import org.hamcrest.Matchers;
import org.junit.Test;
/**
@@ -30,82 +32,75 @@ import org.junit.Test;
*/
public class AbstractMavenFilteringRequestTest
{
+
+ private AbstractMavenFilteringRequest request = new AbstractMavenFilteringRequest();
+ private LinkedHashSet<String> delimiters = new LinkedHashSet<>();
+
@Test
public void setDelimitersShouldNotChangeAnythingIfUsingNull()
{
- AbstractMavenFilteringRequest request = new AbstractMavenFilteringRequest();
request.setDelimiters( null, false );
- assertThat( request.getDelimiters() ).containsExactly( "${*}", "@" );
+ assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@" ) );
}
@Test
public void setDelimitersShouldNotChangeAnythingIfUsingEmpty()
{
- AbstractMavenFilteringRequest request = new AbstractMavenFilteringRequest();
- LinkedHashSet<String> delimiters = new LinkedHashSet<>();
request.setDelimiters( delimiters, false );
- assertThat( request.getDelimiters() ).containsExactly( "${*}", "@" );
+ assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@" ) );
}
@Test
public void setDelimitersShouldAddOnlyTheGivenDelimiter()
{
- AbstractMavenFilteringRequest request = new AbstractMavenFilteringRequest();
- LinkedHashSet<String> delimiters = new LinkedHashSet<>();
delimiters.add( "test" );
request.setDelimiters( delimiters, false );
- assertThat( request.getDelimiters() ).containsExactly( "test" );
+ assertThat( request.getDelimiters(), Matchers.contains( "test" ) );
}
@Test
public void setDelimitersShouldAddDefaultDelimitersForNullElements()
{
- AbstractMavenFilteringRequest request = new AbstractMavenFilteringRequest();
- LinkedHashSet<String> delimiters = new LinkedHashSet<>();
delimiters.add( "test" );
delimiters.add( null );
delimiters.add( "second" );
request.setDelimiters( delimiters, false );
- assertThat( request.getDelimiters() ).containsExactly( "test", "${*}", "second" );
+ assertThat( request.getDelimiters(), Matchers.contains( "test", "${*}", "second" ) );
}
@Test
public void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNullGiven()
{
- AbstractMavenFilteringRequest request = new AbstractMavenFilteringRequest();
request.setDelimiters( null, true );
- assertThat( request.getDelimiters() ).containsExactly( "${*}", "@" );
+ assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@" ) );
}
@Test
public void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNotNullGiven()
{
- AbstractMavenFilteringRequest request = new AbstractMavenFilteringRequest();
LinkedHashSet<String> delimiters = new LinkedHashSet<>();
request.setDelimiters( delimiters, true );
- assertThat( request.getDelimiters() ).containsExactly( "${*}", "@" );
+ assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@" ) );
}
@Test
public void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfSingleElementIsGiven()
{
- AbstractMavenFilteringRequest request = new AbstractMavenFilteringRequest();
LinkedHashSet<String> delimiters = new LinkedHashSet<>();
delimiters.add( "test" );
request.setDelimiters( delimiters, true );
- assertThat( request.getDelimiters() ).containsExactly( "${*}", "@", "test" );
+ assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@", "test" ) );
}
@Test
public void setDelimitersShouldAddDefaultDelimitersForNullElement()
{
- AbstractMavenFilteringRequest request = new AbstractMavenFilteringRequest();
LinkedHashSet<String> delimiters = new LinkedHashSet<>();
delimiters.add( "test" );
delimiters.add( null );
delimiters.add( "second" );
request.setDelimiters( delimiters, true );
- assertThat( request.getDelimiters() ).containsExactly( "${*}", "@", "test", "second" );
+ assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@", "test", "second" ) );
}
}
\ No newline at end of file