You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by df...@apache.org on 2007/12/09 09:53:05 UTC
svn commit: r602652 - in
/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its:
TestFailIfNoTests.java TestFailIfNoTestsForkMode.java
TestNgBeforeMethodFailure.java TestSingleTest.java TimeoutForkedTest.java
Author: dfabulich
Date: Sun Dec 9 00:53:01 2007
New Revision: 602652
URL: http://svn.apache.org/viewvc?rev=602652&view=rev
Log:
[SUREFIRE-397] Fixing some failing tests on non-Windows systems. Apparently Verifier.executeGoal throws a VerifierException on non-Windows systems. On Windows, we have to check the logs.
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java?rev=602652&r1=602651&r2=602652&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java Sun Dec 9 00:53:01 2007
@@ -27,14 +27,21 @@
List goals = new ArrayList();
goals.add( "test" );
goals.add( "-DfailIfNoTests" );
- verifier.executeGoals( goals );
- verifier.resetStreams();
-
- try {
+
+ try
+ {
+ verifier.executeGoals( goals );
+ verifier.resetStreams();
verifier.verifyErrorFreeLog();
- fail ( "Build didn't fail, but it should" );
- } catch ( VerificationException e ) {
+ fail( "Build didn't fail, but it should" );
+ }
+ catch ( VerificationException e )
+ {
// as expected
+ }
+ finally
+ {
+ verifier.resetStreams();
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java?rev=602652&r1=602651&r2=602652&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java Sun Dec 9 00:53:01 2007
@@ -60,12 +60,12 @@
goals.add( "test" );
goals.add( "-DforkMode=" + forkMode );
goals.add( "-DfailIfNoTests=" + failIfNoTests );
- verifier.executeGoals( goals );
- verifier.resetStreams();
if (failIfNoTests)
{
try
{
+ verifier.executeGoals( goals );
+ verifier.resetStreams();
verifier.verifyErrorFreeLog();
fail( "Build did not fail, but it should have" );
} catch (VerificationException e )
@@ -75,6 +75,8 @@
}
else
{
+ verifier.executeGoals( goals );
+ verifier.resetStreams();
verifier.verifyErrorFreeLog();
HelperAssertions.assertTestSuiteResults( 0, 0, 0, 0, testDir );
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java?rev=602652&r1=602651&r2=602652&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java Sun Dec 9 00:53:01 2007
@@ -4,6 +4,7 @@
import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
import org.apache.maven.it.Verifier;
+import org.apache.maven.it.VerificationException;
import org.apache.maven.it.util.ResourceExtractor;
/**
@@ -21,10 +22,21 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-beforeMethodFailure" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "test" );
- //errors are expected
- //verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ try
+ {
+ verifier.executeGoal( "test" );
+ verifier.resetStreams();
+ verifier.verifyErrorFreeLog();
+ fail( "Build didn't fail, but it should" );
+ }
+ catch ( VerificationException e )
+ {
+ // as expected
+ }
+ finally
+ {
+ verifier.resetStreams();
+ }
HelperAssertions.assertTestSuiteResults( 2, 0, 1, 1, testDir );
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java?rev=602652&r1=602651&r2=602652&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java Sun Dec 9 00:53:01 2007
@@ -59,13 +59,20 @@
List goals = new ArrayList();
goals.add( "test" );
goals.add( "-Dtest=DoesNotExist" );
- verifier.executeGoals( goals );
- verifier.resetStreams();
- try {
+
+ try
+ {
+ verifier.executeGoals( goals );
verifier.verifyErrorFreeLog();
fail( "Build should have failed" );
- } catch (VerificationException e) {
+ }
+ catch ( VerificationException e )
+ {
// as expected
+ }
+ finally
+ {
+ verifier.resetStreams();
}
File reportsDir = new File( testDir, "target/surefire-reports" );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java?rev=602652&r1=602651&r2=602652&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java Sun Dec 9 00:53:01 2007
@@ -22,14 +22,18 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/timeout-forked" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "test" );
- verifier.resetStreams();
+
try {
+ verifier.executeGoal( "test" );
verifier.verifyErrorFreeLog();
fail( "Build didn't fail, but it should have" );
} catch (VerificationException e)
{
// as expected
+ }
+ finally
+ {
+ verifier.resetStreams();
}
}