SUREFIRE-1136 Remove usage of fest-assertions from IT (not JDK 1.5 compatible)
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/60111e78 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/60111e78 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/60111e78 Branch: refs/heads/master Commit: 60111e78fa1d10eae0a0b8f2ab653e828f26ad21 Parents: 15da349 Author: Andreas Gudian <agud...@apache.org> Authored: Thu Jan 22 21:18:31 2015 +0100 Committer: Andreas Gudian <agud...@apache.org> Committed: Thu Jan 22 21:18:31 2015 +0100 ---------------------------------------------------------------------- .../surefire-1136-cwd-propagation-in-forked-mode/pom.xml | 6 ------ .../cwd/CurrentWorkingDirectoryInForkedModeTest.java | 11 ++++++----- 2 files changed, 6 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/60111e78/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml index c85a9ab..943fac7 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml @@ -46,12 +46,6 @@ <version>4.11</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.easytesting</groupId> - <artifactId>fest-assert-core</artifactId> - <version>2.0M10</version> - <scope>test</scope> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/60111e78/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java index 1660bfb..9dc0ffe 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java +++ b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java @@ -23,7 +23,8 @@ import org.junit.Test; import java.io.File; -import static org.fest.assertions.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; public class CurrentWorkingDirectoryInForkedModeTest { @@ -38,12 +39,12 @@ public class CurrentWorkingDirectoryInForkedModeTest forkDirectory.deleteOnExit(); // user.dir and current working directory must be aligned, base directory is not affected - assertThat( System.getProperty( "basedir" ) ).isEqualTo( projectDirectory.getCanonicalPath() ); - assertThat( System.getProperty( "user.dir" ) ).isEqualTo( forkDirectory.getCanonicalPath() ); - assertThat( new File( "." ).getCanonicalPath() ).isEqualTo( forkDirectory.getCanonicalPath() ); + assertEquals( System.getProperty( "basedir" ), projectDirectory.getCanonicalPath() ); + assertEquals( System.getProperty( "user.dir" ), forkDirectory.getCanonicalPath() ); + assertEquals( new File( "." ).getCanonicalPath(), forkDirectory.getCanonicalPath() ); // original working directory (before variable expansion) should not be created - assertThat( new File( "cwd_${surefire.forkNumber}" ) ).doesNotExist(); + assertFalse( new File( "cwd_${surefire.forkNumber}" ).exists() ); }