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 2020/07/03 12:01:43 UTC
[maven-assembly-plugin] 01/02: replace deprecated assertThat method
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-assembly-plugin.git
commit d64380d547cff6553e08cd29184446677c73c90d
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Fri Jul 3 07:16:04 2020 -0400
replace deprecated assertThat method
---
.../archive/archiver/AssemblyProxyArchiverTest.java | 2 +-
.../archive/task/AddDependencySetsTaskTest.java | 2 +-
.../plugins/assembly/format/ReaderFormatterTest.java | 2 +-
.../plugins/assembly/utils/FilterUtilsTest.java | 20 +++++++++-----------
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
index 6e2d7a3..7121297 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
@@ -19,10 +19,10 @@ package org.apache.maven.plugins.assembly.archive.archiver;
* under the License.
*/
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
index 04513f8..5867742 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.plugins.assembly.archive.task;
* under the License.
*/
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
diff --git a/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java b/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
index d0279a7..c21a1e8 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
@@ -19,10 +19,10 @@ package org.apache.maven.plugins.assembly.format;
* under the License.
*/
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.sameInstance;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.verify;
diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java
index b5df696..2e2ddde 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java
@@ -19,6 +19,7 @@ package org.apache.maven.plugins.assembly.utils;
* under the License.
*/
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -183,21 +184,18 @@ public class FilterUtilsTest
@Test
public void testTransitiveScopes()
{
- Assert.assertThat( FilterUtils.newScopeFilter( "compile" ).getIncluded(),
- Matchers.containsInAnyOrder( "compile", "provided", "system" ) );
+ assertThat( FilterUtils.newScopeFilter( "compile" ).getIncluded(),
+ Matchers.containsInAnyOrder( "compile", "provided", "system" ) );
- Assert.assertThat( FilterUtils.newScopeFilter( "provided" ).getIncluded(),
- Matchers.containsInAnyOrder( "provided" ) );
+ assertThat( FilterUtils.newScopeFilter( "provided" ).getIncluded(), Matchers.containsInAnyOrder( "provided" ) );
- Assert.assertThat( FilterUtils.newScopeFilter( "system" ).getIncluded(),
- Matchers.containsInAnyOrder( "system" ) );
+ assertThat( FilterUtils.newScopeFilter( "system" ).getIncluded(), Matchers.containsInAnyOrder( "system" ) );
- Assert.assertThat( FilterUtils.newScopeFilter( "runtime" ).getIncluded(),
- Matchers.containsInAnyOrder( "compile", "runtime" ) );
-
- Assert.assertThat( FilterUtils.newScopeFilter( "test" ).getIncluded(),
- Matchers.containsInAnyOrder( "compile", "provided", "runtime", "system", "test" ) );
+ assertThat( FilterUtils.newScopeFilter( "runtime" ).getIncluded(),
+ Matchers.containsInAnyOrder( "compile", "runtime" ) );
+ assertThat( FilterUtils.newScopeFilter( "test" ).getIncluded(),
+ Matchers.containsInAnyOrder( "compile", "provided", "runtime", "system", "test" ) );
}
private void verifyArtifactInclusion( final String groupId, final String artifactId, final String inclusionPattern,