replaced ancestor org.easytesting:fest-assert>1.4 by org.assertj:asse…

…rtj-core:3.22.0
apache · Feb 2, 2022 · 4e69349 · 4e69349
1 parent 2880b08
commit 4e69349
Show file tree

Hide file tree

Showing 78 changed files with 156 additions and 177 deletions.
diff --git a/...ilsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java b/...ilsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java
@@ -30,7 +30,7 @@
 import java.io.IOException;
 
 import static org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...afe-plugin/src/test/java/org/apache/maven/plugin/failsafe/MarshallerUnmarshallerTest.java b/...afe-plugin/src/test/java/org/apache/maven/plugin/failsafe/MarshallerUnmarshallerTest.java
@@ -25,7 +25,7 @@
 
 import java.io.File;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  *

diff --git a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java
@@ -25,7 +25,7 @@
 
 import java.io.File;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>

diff --git a/...mon/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java b/...mon/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
@@ -59,8 +59,8 @@
 import static java.util.Collections.singleton;
 import static java.util.Collections.singletonMap;
 import static org.apache.maven.artifact.versioning.VersionRange.createFromVersion;
-import static org.fest.assertions.Assertions.assertThat;
-import static org.fest.assertions.Index.atIndex;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.Index.atIndex;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;

diff --git a/...efire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java b/...efire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
@@ -96,8 +96,7 @@
 import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT;
 import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS;
 import static org.codehaus.plexus.languages.java.jpms.ModuleNameSource.MODULEDESCRIPTOR;
-import static org.fest.assertions.Assertions.assertThat;
-import static org.fest.assertions.MapAssert.entry;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -975,8 +974,8 @@ else if ( "org.junit.platform".equals( artifact.getGroupId() )
 
         assertThat( testClasspathWrapper.getTestDependencies() )
             .hasSize( 2 )
-            .includes( entry( "junit:junit", testClasspathJUnit ),
-                entry( "org.hamcrest:hamcrest-core", testClasspathHamcrest ) );
+            .containsEntry( "junit:junit", testClasspathJUnit )
+            .containsEntry( "org.hamcrest:hamcrest-core", testClasspathHamcrest );
     }
 
     @Test
@@ -1128,14 +1127,14 @@ else if ( "org.junit.platform".equals( resolvable.getGroupId() )
 
         assertThat( testClasspathWrapper.getTestDependencies() )
             .hasSize( 8 )
-            .includes( entry( "third.party:artifact", testClasspathSomeTestArtifact ),
-                entry( "org.junit.vintage:junit-vintage-engine", testClasspathVintage ),
-                entry( "org.apiguardian:apiguardian-api", testClasspathApiguardian ),
-                entry( "org.junit.platform:junit-platform-engine", testClasspathPlatformEng ),
-                entry( "junit:junit", testClasspathJUnit4 ),
-                entry( "org.hamcrest:hamcrest-core", testClasspathHamcrest ),
-                entry( "org.opentest4j:opentest4j", testClasspathOpentest4j ),
-                entry( "org.junit.platform:junit-platform-commons", testClasspathCommons ) );
+            .containsEntry( "third.party:artifact", testClasspathSomeTestArtifact )
+            .containsEntry( "org.junit.vintage:junit-vintage-engine", testClasspathVintage )
+            .containsEntry( "org.apiguardian:apiguardian-api", testClasspathApiguardian )
+            .containsEntry( "org.junit.platform:junit-platform-engine", testClasspathPlatformEng )
+            .containsEntry( "junit:junit", testClasspathJUnit4 )
+            .containsEntry( "org.hamcrest:hamcrest-core", testClasspathHamcrest )
+            .containsEntry( "org.opentest4j:opentest4j", testClasspathOpentest4j )
+            .containsEntry( "org.junit.platform:junit-platform-commons", testClasspathCommons );
     }
 
     @Test
@@ -1257,9 +1256,9 @@ else if ( "org.junit.platform".equals( resolvable.getGroupId() )
 
         assertThat( testClasspathWrapper.getTestDependencies() )
             .hasSize( 3 )
-            .includes( entry( "third.party:artifact", testClasspathSomeTestArtifact ),
-                entry( "org.junit.platform:junit-platform-commons", testClasspathCommons ),
-                entry( "org.apiguardian:apiguardian-api", testClasspathApiguardian ) );
+            .containsEntry( "third.party:artifact", testClasspathSomeTestArtifact )
+            .containsEntry( "org.junit.platform:junit-platform-commons", testClasspathCommons )
+            .containsEntry( "org.apiguardian:apiguardian-api", testClasspathApiguardian );
     }
 
     @Test
@@ -1370,11 +1369,11 @@ else if ( "org.junit.platform".equals( resolvable.getGroupId() )
 
         assertThat( testClasspathWrapper.getTestDependencies() )
             .hasSize( 5 )
-            .includes( entry( "third.party:artifact", testClasspathSomeTestArtifact ),
-                entry( "org.junit.platform:junit-platform-engine", testClasspathJUnit5 ),
-                entry( "org.apiguardian:apiguardian-api", testClasspathApiguardian ),
-                entry( "org.junit.platform:junit-platform-commons", testClasspathCommons ),
-                entry( "org.opentest4j:opentest4j", testClasspathOpentest4j ) );
+            .containsEntry( "third.party:artifact", testClasspathSomeTestArtifact )
+            .containsEntry( "org.junit.platform:junit-platform-engine", testClasspathJUnit5 )
+            .containsEntry( "org.apiguardian:apiguardian-api", testClasspathApiguardian )
+            .containsEntry( "org.junit.platform:junit-platform-commons", testClasspathCommons )
+            .containsEntry( "org.opentest4j:opentest4j", testClasspathOpentest4j );
     }
 
     @Test
@@ -1506,11 +1505,11 @@ else if ( "org.junit.jupiter".equals( resolvable.getGroupId() )
 
         assertThat( testClasspathWrapper.getTestDependencies() )
             .hasSize( 5 )
-            .includes( entry( "third.party:artifact", testClasspathSomeTestArtifact ),
-                entry( "org.junit.jupiter:junit-jupiter-api", testClasspathJupiterApi ),
-                entry( "org.apiguardian:apiguardian-api", testClasspathApiguardian ),
-                entry( "org.junit.platform:junit-platform-commons", testClasspathCommons ),
-                entry( "org.opentest4j:opentest4j", testClasspathOpentest4j ) );
+            .containsEntry( "third.party:artifact", testClasspathSomeTestArtifact )
+            .containsEntry( "org.junit.jupiter:junit-jupiter-api", testClasspathJupiterApi )
+            .containsEntry( "org.apiguardian:apiguardian-api", testClasspathApiguardian )
+            .containsEntry( "org.junit.platform:junit-platform-commons", testClasspathCommons )
+            .containsEntry( "org.opentest4j:opentest4j", testClasspathOpentest4j );
     }
 
     @Test
@@ -1628,13 +1627,13 @@ else if ( "org.junit.platform".equals( resolvable.getGroupId() )
 
         assertThat( testClasspathWrapper.getTestDependencies() )
             .hasSize( 7 )
-            .includes( entry( "third.party:artifact", testClasspathSomeTestArtifact ),
-                entry( "org.junit.jupiter:junit-jupiter-engine", testClasspathJupiterEngine ),
-                entry( "org.junit.platform:junit-platform-engine", testClasspathPlatformEngine ),
-                entry( "org.junit.jupiter:junit-jupiter-api", testClasspathJupiterApi ),
-                entry( "org.apiguardian:apiguardian-api", testClasspathApiguardian ),
-                entry( "org.junit.platform:junit-platform-commons", testClasspathCommons ),
-                entry( "org.opentest4j:opentest4j", testClasspathOpentest4j ) );
+            .containsEntry( "third.party:artifact", testClasspathSomeTestArtifact )
+            .containsEntry( "org.junit.jupiter:junit-jupiter-engine", testClasspathJupiterEngine )
+            .containsEntry( "org.junit.platform:junit-platform-engine", testClasspathPlatformEngine )
+            .containsEntry( "org.junit.jupiter:junit-jupiter-api", testClasspathJupiterApi )
+            .containsEntry( "org.apiguardian:apiguardian-api", testClasspathApiguardian )
+            .containsEntry( "org.junit.platform:junit-platform-commons", testClasspathCommons )
+            .containsEntry( "org.opentest4j:opentest4j", testClasspathOpentest4j );
     }
 
     @Test
@@ -1821,11 +1820,11 @@ else if ( "org.junit.platform".equals( resolvable.getGroupId() )
 
         assertThat( testClasspathWrapper.getTestDependencies() )
             .hasSize( 5 )
-            .includes( entry( "third.party:artifact", testClasspathSomeTestArtifact ),
-                entry( "org.junit.jupiter:junit-jupiter-api", testClasspathJupiterApi ),
-                entry( "org.apiguardian:apiguardian-api", testClasspathApiguardian ),
-                entry( "org.junit.platform:junit-platform-commons", testClasspathCommons ),
-                entry( "org.opentest4j:opentest4j", testClasspathOpentest4j ) );
+            .containsEntry( "third.party:artifact", testClasspathSomeTestArtifact )
+            .containsEntry( "org.junit.jupiter:junit-jupiter-api", testClasspathJupiterApi )
+            .containsEntry( "org.apiguardian:apiguardian-api", testClasspathApiguardian )
+            .containsEntry( "org.junit.platform:junit-platform-commons", testClasspathCommons )
+            .containsEntry( "org.opentest4j:opentest4j", testClasspathOpentest4j );
     }
 
     @Test
@@ -1845,12 +1844,12 @@ public void shouldConvertJunitEngineParameters() throws Exception
         mojo.setIncludeJUnit5Engines( new String[] {"e1", "e2"} );
         invokeMethod( mojo, "convertJunitEngineParameters" );
         assertThat( properties )
-            .includes( entry( "includejunit5engines", "e1,e2" ) );
+            .containsEntry( "includejunit5engines", "e1,e2" );
 
         mojo.setExcludeJUnit5Engines( new String[] {"e1", "e2"} );
         invokeMethod( mojo, "convertJunitEngineParameters" );
         assertThat( properties )
-            .includes( entry( "excludejunit5engines", "e1,e2" ) );
+            .containsEntry( "excludejunit5engines", "e1,e2" );
     }
 
     private static ArtifactResolutionResult createJUnitPlatformLauncherResolutionResult(

diff --git a/...on/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java b/...on/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java
@@ -26,7 +26,6 @@
 import org.apache.maven.toolchain.ToolchainManager;
 import org.apache.maven.toolchain.java.DefaultJavaToolChain;
 import org.codehaus.plexus.logging.Logger;
-import org.fest.assertions.MapAssert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -49,7 +48,7 @@
 import static java.util.Collections.singletonMap;
 import static junit.framework.TestCase.assertNull;
 import static org.apache.maven.surefire.booter.SystemUtils.toJdkHomeFromJre;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.startsWith;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -166,7 +165,7 @@ public void shouldChangeJavaHomeFromToolchain() throws Exception
 
         assertThat( mojo.getEnvironmentVariables() ).isEmpty();
         JdkAttributes effectiveJvm = invokeMethod( mojo, "getEffectiveJvm" );
-        assertThat( mojo.getEnvironmentVariables() ).includes( MapAssert.entry( "JAVA_HOME", "/some/path" ) );
+        assertThat( mojo.getEnvironmentVariables() ).containsEntry( "JAVA_HOME", "/some/path" );
         assertThat( effectiveJvm.getJvmExecutable().getPath() )
             .contains( "/path/from/toolchain".replace( '/', separatorChar ) );
     }
@@ -183,7 +182,7 @@ public void shouldNotChangeJavaHomeFromToolchainIfAlreadySet() throws Exception
         mojo.setToolchain( toolchain );
 
         JdkAttributes effectiveJvm = invokeMethod( mojo, "getEffectiveJvm" );
-        assertThat( mojo.getEnvironmentVariables() ).includes( MapAssert.entry( "JAVA_HOME", "/already/set/path" ) );
+        assertThat( mojo.getEnvironmentVariables() ).containsEntry( "JAVA_HOME", "/already/set/path" );
         assertThat( effectiveJvm.getJvmExecutable().getPath() )
             .contains( "/path/from/toolchain".replace( '/', separatorChar ) );
     }
@@ -206,7 +205,7 @@ public void shouldChangeJavaHomeFromJvm() throws Exception
         assertThat( mojo.getEnvironmentVariables() ).isEmpty();
         JdkAttributes effectiveJvm = invokeMethod( mojo, "getEffectiveJvm" );
         assertThat( mojo.getEnvironmentVariables() )
-            .includes( MapAssert.entry( "JAVA_HOME", currentJdkHome.getAbsolutePath() ) );
+            .containsEntry( "JAVA_HOME", currentJdkHome.getAbsolutePath() );
         assertThat( effectiveJvm.getJvmExecutable().getPath() ).contains( javaExecutablePath );
     }
 
@@ -227,7 +226,7 @@ public void shouldNotChangeJavaHomeFromJvmIfAlreadySet() throws Exception
 
         JdkAttributes effectiveJvm = invokeMethod( mojo, "getEffectiveJvm" );
         assertThat( mojo.getEnvironmentVariables() )
-            .includes( MapAssert.entry( "JAVA_HOME", "/already/set/path" ) );
+            .containsEntry( "JAVA_HOME", "/already/set/path" );
         assertThat( effectiveJvm.getJvmExecutable().getPath() ).contains( javaExecutablePath );
     }
 

diff --git a/...n-surefire-common/src/test/java/org/apache/maven/plugin/surefire/CommonReflectorTest.java b/...n-surefire-common/src/test/java/org/apache/maven/plugin/surefire/CommonReflectorTest.java
@@ -36,7 +36,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.maven.surefire.api.util.ReflectionUtils.getMethod;
 import static org.apache.maven.surefire.api.util.ReflectionUtils.invokeMethodWithArray;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;

diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
@@ -42,7 +42,7 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static org.powermock.reflect.Whitebox.invokeMethod;
 import static org.powermock.reflect.Whitebox.setInternalState;

diff --git a/...common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java b/...common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java
@@ -48,7 +48,7 @@
 import static java.util.Collections.singletonMap;
 import static org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec;
 import static org.apache.maven.plugin.surefire.SurefireDependencyResolver.PROVIDER_GROUP_ID;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
@@ -35,7 +35,7 @@
 import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath;
 import static org.apache.maven.plugin.surefire.SurefireHelper.reportExecution;
 import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
 /**

diff --git a/...test/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfigurationTest.java b/...test/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfigurationTest.java
@@ -43,7 +43,7 @@
 import java.util.Properties;
 
 import static java.util.Collections.singleton;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;