You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/01/06 16:04:26 UTC
svn commit: r1228222 [2/3] - in
/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its:
./ fixture/ jiras/ misc/
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java Fri Jan 6 15:04:22 2012
@@ -19,9 +19,11 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import java.io.IOException;
import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+
+import java.io.IOException;
/**
* Verifies that the providers get the result summary at the bottom of the run correctly, in different forkmodes
@@ -30,15 +32,9 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class ResultCountingIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public ResultCountingIT()
- {
- super( "/result-counting" );
- }
-
- public void testCountingWithJunit481ForkNever()
+ public void testCountingWithJunit481ForkNever()
throws Exception
{
assertForkMode( "never" );
@@ -59,10 +55,8 @@ public class ResultCountingIT
private void assertForkMode( String forkMode )
throws IOException, VerificationException
{
- failNever();
- forkMode( forkMode );
- executeTest();
- assertTestSuiteResults( 36, 23, 4, 2 );
- verifyTextInLog( "Tests run: 36, Failures: 4, Errors: 23, Skipped: 2" );
+ OutputValidator outputValidator = unpack("result-counting").failNever().forkMode(forkMode).executeTest();
+ outputValidator.assertTestSuiteResults(36, 23, 4, 2);
+ outputValidator.verifyTextInLog("Tests run: 36, Failures: 4, Errors: 23, Skipped: 2");
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java Fri Jan 6 15:04:22 2012
@@ -22,7 +22,9 @@ package org.apache.maven.surefire.its;
import java.io.IOException;
import java.util.Calendar;
import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Verifies the runOrder setting and its effect
@@ -30,7 +32,7 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class RunOrderIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
private static final String[] TESTS_IN_ALPHABETICAL_ORDER = { "TA", "TB", "TC" };
@@ -38,30 +40,25 @@ public class RunOrderIT
// testing random is left as an exercise to the reader. Patches welcome
- public RunOrderIT()
- {
- super( "/runOrder" );
- }
-
public void testAlphabetical()
throws Exception
{
- executeWithRunOrder( "alphabetical" );
- assertTestnamesAppearInSpecificOrder( TESTS_IN_ALPHABETICAL_ORDER );
+ OutputValidator validator = executeWithRunOrder("alphabetical");
+ assertTestnamesAppearInSpecificOrder(validator, TESTS_IN_ALPHABETICAL_ORDER );
}
public void testReverseAlphabetical()
throws Exception
{
- executeWithRunOrder( "reversealphabetical" );
- assertTestnamesAppearInSpecificOrder( TESTS_IN_REVERSE_ALPHABETICAL_ORDER );
+ OutputValidator validator = executeWithRunOrder("reversealphabetical");
+ assertTestnamesAppearInSpecificOrder(validator, TESTS_IN_REVERSE_ALPHABETICAL_ORDER );
}
public void testHourly()
throws Exception
{
int startHour = Calendar.getInstance().get( Calendar.HOUR_OF_DAY );
- executeWithRunOrder( "hourly" );
+ OutputValidator validator = executeWithRunOrder("hourly");
int endHour = Calendar.getInstance().get( Calendar.HOUR_OF_DAY );
if ( startHour != endHour )
{
@@ -70,28 +67,20 @@ public class RunOrderIT
String[] testnames =
( ( startHour % 2 ) == 0 ) ? TESTS_IN_ALPHABETICAL_ORDER : TESTS_IN_REVERSE_ALPHABETICAL_ORDER;
- assertTestnamesAppearInSpecificOrder( testnames );
+ assertTestnamesAppearInSpecificOrder(validator, testnames);
}
public void testNonExistingRunOrder()
throws Exception
{
- try
- {
- executeTestsWithRunOrder( "nonExistingRunOrder" );
- }
- catch ( VerificationException e )
- {
- }
- verifyTextInLog( "There's no RunOrder with the name nonExistingRunOrder." );
+ unpack().forkMode(getForkMode()).runOrder("nonExistingRunOrder").executeTestWithFailure()
+ .verifyTextInLog("There's no RunOrder with the name nonExistingRunOrder.");
}
- private void executeWithRunOrder( String runOrder )
+ private OutputValidator executeWithRunOrder(String runOrder)
throws IOException, VerificationException
{
- executeTestsWithRunOrder( runOrder );
- verifyErrorFreeLog();
- assertTestSuiteResults( 3, 0, 0, 0);
+ return unpack().forkMode(getForkMode()).runOrder(runOrder).executeTest().verifyErrorFree(3);
}
@@ -100,18 +89,14 @@ public class RunOrderIT
return "once";
}
- protected void executeTestsWithRunOrder( String runOrder )
- throws VerificationException
- {
- forkMode( getForkMode() );
- runOrder( runOrder );
- executeTest();
+ private SurefireLauncher unpack() {
+ return unpack("runOrder");
}
- private void assertTestnamesAppearInSpecificOrder( String[] testnames )
+ private void assertTestnamesAppearInSpecificOrder(OutputValidator validator, String[] testnames)
throws VerificationException
{
- if ( !stringsAppearInSpecificOrderInLog( testnames ) )
+ if ( !validator.stringsAppearInSpecificOrderInLog(testnames) )
{
throw new VerificationException( "Response does not contain expected item" );
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java Fri Jan 6 15:04:22 2012
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test aggregator as a sibling to child modules; invokes modules as "../child"
@@ -29,7 +29,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class SiblingAggregatorIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testSiblingAggregator()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test system properties
@@ -27,35 +28,30 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class SystemPropertiesTestIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public SystemPropertiesTestIT()
- {
- super( "/system-properties" );
- }
-
public void testSystemProperties()
- throws Exception
{
- addGoal( "-DsetOnMavenCommandLine=baz" );
- addGoal( "-DsetOnArgLineWorkAround=baz" );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 8, 0, 0, 0 );
+ unpack().addGoal( "-DsetOnMavenCommandLine=baz" )
+ .addGoal( "-DsetOnArgLineWorkAround=baz" )
+ .executeTest()
+ .verifyErrorFree(8);
}
public void testSystemPropertiesNoFork()
- throws Exception
{
- addGoal( "-DforkMode=never" );
- addGoal( "-DsetOnArgLineWorkAround=baz" );
- addGoal( "-DsetOnMavenCommandLine=baz" );
+
+ unpack().forkNever().addGoal( "-DsetOnMavenCommandLine=baz" )
+ .addGoal( "-DsetOnArgLineWorkAround=baz" )
// DGF fake the argLine, since we're not forking
- addGoal( "-DsetOnArgLine=bar" );
- executeTest();
- verifyErrorFreeLog();
+ .addGoal( "-DsetOnArgLine=bar" )
+ .executeTest()
+ .verifyErrorFree(8);
+ }
- assertTestSuiteResults( 8, 0, 0, 0 );
+ public SurefireLauncher unpack()
+ {
+ return unpack("/system-properties");
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test project using -Dtest=mtClass#myMethod
@@ -27,7 +27,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:olamy@apache.org">Olivier Lamy</a>
*/
public class TestMethodPatternIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void runMethodPattern( String projectName )
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test that TestNG's @Test(threadPoolSize = n, invocationCount=n) causes tests to be run in parallel.
@@ -28,28 +29,20 @@ import org.apache.maven.surefire.its.fix
*
*/
public class TestNgGroupsIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public TestNgGroupsIT()
+ public void testTestNgGroupThreadParallel()
{
- super( "/testng-groups" );
+ unpack().setExcludedGroups( "notincluded" ).executeTest().verifyErrorFree(1);
}
- public void testTestNgGroupThreadParallel()
- throws Exception
+ public void testGroups()
{
- setExcludedGroups( "notincluded" );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack().setGroups("functional" ).executeTest().verifyErrorFree(2);
}
- public void testGroups()
- throws Exception
+ public SurefireLauncher unpack()
{
- setGroups( "functional" );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 2, 0, 0, 0 );
+ return unpack( "/testng-groups" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test that TestNG's @Test(threadPoolSize = n, invocationCount=n) causes tests to be run in parallel.
@@ -28,18 +28,10 @@ import org.apache.maven.surefire.its.fix
*
*/
public class TestNgParallelWithAnnotationsIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public TestNgParallelWithAnnotationsIT()
- {
- super( "/testng-parallel-with-annotations" );
- }
-
public void testTestNgGroupThreadParallel()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 3, 0, 0, 0 );
+ executeErrorFreeTest("/testng-parallel-with-annotations", 3);
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test project using -Dtest=mtClass#myMethod
@@ -27,7 +27,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:olamy@apache.org">Olivier Lamy</a>
*/
public class TestSingleMethodIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void singleMethod(String projectName)
throws Exception
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java Fri Jan 6 15:04:22 2012
@@ -19,8 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test
@@ -28,28 +27,12 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class TimeoutForkedTestIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public TimeoutForkedTestIT()
- {
- super( "/timeout-forked" );
- }
-
public void testTimeoutForked()
throws Exception
{
- try
- {
- addGoal( "-DsleepLength=10000" );
- addGoal( "-DforkTimeout=1" );
- executeTest();
- verifyErrorFreeLog();
- fail( "Build didn't fail, but it should have" );
- }
- catch ( VerificationException ignore )
- {
- }
+ unpack( "/timeout-forked" ).addGoal("-DsleepLength=10000").addGoal("-DforkTimeout=1").executeTestWithFailure();
// SUREFIRE-468 test that had to be reverted due to SUREFIRE-705
//assertFalse( getSurefireReportsFile( "TEST-timeoutForked.BasicTest.xml" ).exists() );
// assertFalse( getSurefireReportsFile( "timeoutForked.BasicTest.txt" ).exists() );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java Fri Jan 6 15:04:22 2012
@@ -23,11 +23,10 @@ import java.io.File;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.maven.surefire.its.fixture.IntegrationTestSuiteResults;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
-import org.apache.maven.surefire.its.misc.HelperAssertions;
-import org.apache.maven.surefire.its.misc.ReportTestSuite;
+
+import org.apache.maven.surefire.its.fixture.*;
+import org.apache.maven.surefire.its.fixture.HelperAssertions;
+import org.apache.maven.surefire.its.fixture.ReportTestSuite;
/**
* Test running two test cases; confirms reporting works correctly
@@ -35,7 +34,7 @@ import org.apache.maven.surefire.its.mis
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class TwoTestCasesIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testTwoTestCases()
throws Exception
@@ -105,7 +104,7 @@ public class TwoTestCasesIT
assertContains( classNames, "testng.two.TestNGSuiteTest" );
assertEquals( "wrong number of classes", 2, classNames.size() );
IntegrationTestSuiteResults results = HelperAssertions.parseReportList( reports );
- HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, results );
+ HelperAssertions.assertTestSuiteResults(2, 0, 0, 0, results);
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java Fri Jan 6 15:04:22 2012
@@ -25,7 +25,7 @@ import org.apache.maven.it.VerificationE
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.FileUtils;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test a directory with an umlaut
@@ -33,7 +33,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class UmlautDirIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testUmlaut()
throws Exception
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test useSystemClassLoader option
@@ -27,19 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class UseIsolatedClassLoaderIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public UseIsolatedClassLoaderIT()
- {
- super( "/isolated-classloader" );
- }
-
public void testUseSystemClassLoader()
- throws Exception
{
- this.executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ executeErrorFreeTest("/isolated-classloader", 1);
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java Fri Jan 6 15:04:22 2012
@@ -26,7 +26,7 @@ import java.util.Properties;
import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -36,7 +36,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class WorkingDirectoryIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testWorkingDirectory()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java Fri Jan 6 15:04:22 2012
@@ -1,6 +1,6 @@
package org.apache.maven.surefire.its;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test when the configured working directory is an invalid property, SUREFIRE-715
@@ -8,7 +8,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class WorkingDirectoryIsInvalidPropertyIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testWorkingDirectory()
throws Exception
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test when the configured working directory does not exist, SUREFIRE-607
@@ -27,19 +27,12 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:stephenc@apache.org">Stephen Connolly</a>
*/
public class WorkingDirectoryMissingIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public WorkingDirectoryMissingIT()
- {
- super( "/working-directory-missing" );
- }
-
-
public void testWorkingDirectory()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
+
+ unpack("working-directory-missing").executeTest().verifyErrorFreeLog();
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java Fri Jan 6 15:04:22 2012
@@ -19,11 +19,12 @@ package org.apache.maven.surefire.its;
* under the License.
*/
+import org.apache.maven.surefire.its.fixture.*;
+import org.apache.maven.surefire.its.fixture.HelperAssertions;
+import org.apache.maven.surefire.its.fixture.ReportTestSuite;
+
import java.io.File;
import java.util.List;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
-import org.apache.maven.surefire.its.misc.HelperAssertions;
-import org.apache.maven.surefire.its.misc.ReportTestSuite;
/**
* Test reported runtime
@@ -31,21 +32,14 @@ import org.apache.maven.surefire.its.mis
* @author Kristian Rosenvold
*/
public class XmlReporterRunTimeIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public XmlReporterRunTimeIT()
- {
- super( "/runorder-parallel" );
- }
-
public void testForkModeAlways()
throws Exception
{
- parallelMethods( );
- executeTest();
+ OutputValidator outputValidator = unpack("/runorder-parallel").parallelMethods().executeTest();
- List<ReportTestSuite> reports = HelperAssertions.extractReports( ( new File[]{ getTestDir() } ) );
+ List<ReportTestSuite> reports = HelperAssertions.extractReports((new File[]{outputValidator.getBaseDir()}));
for ( ReportTestSuite report : reports )
{
if ( "runorder.parallel.Test1".equals( report.getFullClassName() ) )
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its.misc;
+package org.apache.maven.surefire.its.fixture;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,7 +21,6 @@ package org.apache.maven.surefire.its.mi
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.surefire.its.fixture.IntegrationTestSuiteResults;
import junit.framework.Assert;
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java Fri Jan 6 15:04:22 2012
@@ -19,12 +19,11 @@ package org.apache.maven.surefire.its.fi
* under the License.
*/
-import java.io.File;
-import java.util.List;
-import java.util.Map;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
-import org.apache.maven.surefire.its.misc.HelperAssertions;
+
+import java.io.File;
+import java.util.List;
/**
* A specialized verifier that enforces a standard use case for surefire IT's
@@ -37,19 +36,6 @@ public class OutputValidator
protected final File baseDir;
- public static OutputValidator fromDirectory(File testDir)
- {
- try
- {
- return new OutputValidator( new Verifier( testDir.getAbsolutePath()) );
- }
- catch ( VerificationException e )
- {
- throw new RuntimeException( e );
- }
-
- }
-
public OutputValidator( Verifier verifier )
{
this.verifier = verifier;
@@ -57,32 +43,6 @@ public class OutputValidator
}
- public void assertFilePresent( String file )
- {
- verifier.assertFilePresent( file );
- }
-
- public void assertFileNotPresent( String file )
- {
- verifier.assertFileNotPresent( file );
- }
-
- public void executeGoals( List goals, Map envVars )
- throws VerificationException
- {
- verifier.executeGoals( goals, envVars );
- }
-
- public void setCliOptions( List cliOptions )
- {
- verifier.setCliOptions( cliOptions );
- }
-
- public void resetStreams()
- {
- verifier.resetStreams();
- }
-
public OutputValidator verifyTextInLog( String text )
{
try
@@ -124,17 +84,12 @@ public class OutputValidator
}
}
- public List loadFile( String basedir, String filename, boolean hasCommand )
- throws VerificationException
- {
- return verifier.loadFile( basedir, filename, hasCommand );
- }
-
public List<String> loadFile( File file, boolean hasCommand )
{
//noinspection unchecked
try
{
+ //noinspection unchecked
return verifier.loadFile( file, hasCommand );
}
catch ( VerificationException e )
@@ -143,11 +98,6 @@ public class OutputValidator
}
}
- public String getLogFileName()
- {
- return verifier.getLogFileName();
- }
-
public String getBasedir()
{
@@ -160,17 +110,10 @@ public class OutputValidator
* @param path The subdirectory under basedir
* @return A file
*/
- protected File getSubFile( String path )
+ public File getSubFile( String path )
{
return new File( getBasedir(), path );
}
-
-
- public String getMavenVersion()
- throws VerificationException
- {
- return verifier.getMavenVersion();
- }
public String getArtifactPath( String org, String name, String version, String ext )
@@ -210,4 +153,30 @@ public class OutputValidator
{
return baseDir;
}
+
+ @SuppressWarnings("unchecked")
+ private List<String> getLog()
+ throws VerificationException
+ {
+ return verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
+ }
+
+ public boolean stringsAppearInSpecificOrderInLog( String[] strings )
+ throws VerificationException
+ {
+ int i = 0;
+ for ( String line : getLog() )
+ {
+ if ( line.startsWith( strings[i] ) )
+ {
+ if ( i == strings.length - 1 )
+ {
+ return true;
+ }
+ ++i;
+ }
+ }
+ return false;
+ }
+
}
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestCase.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestCase.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestCase.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestCase.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its.misc;
+package org.apache.maven.surefire.its.fixture;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestSuite.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestSuite.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestSuite.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestSuite.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestSuite.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestSuite.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestSuite.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its.misc;
+package org.apache.maven.surefire.its.fixture;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestSuite.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireIntegrationTestCase.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierTestClass2.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireIntegrationTestCase.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireIntegrationTestCase.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierTestClass2.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierTestClass2.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireIntegrationTestCase.java Fri Jan 6 15:04:22 2012
@@ -34,7 +34,7 @@ import junit.framework.TestCase;
*
* @author Kristian Rosenvold
*/
-public abstract class SurefireVerifierTestClass2
+public abstract class SurefireIntegrationTestCase
extends TestCase
{
public OutputValidator executeErrorFreeTest( String sourceName, int total ){
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireIntegrationTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java Fri Jan 6 15:04:22 2012
@@ -19,12 +19,6 @@ package org.apache.maven.surefire.its.fi
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -34,7 +28,12 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.FileUtils;
import org.apache.maven.it.util.ResourceExtractor;
-import junit.framework.Assert;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* Encapsulate all needed features to start a surefire run
@@ -98,7 +97,7 @@ public class SurefireLauncher
return ResourceExtractor.extractResourcePath( cl, resourcePath, tempDir, true );
}
- protected void reset()
+ public void reset()
{
goals.clear();
goals.addAll( getInitialGoals() );
@@ -118,9 +117,10 @@ public class SurefireLauncher
return new OutputValidator( new Verifier( subFile.getAbsolutePath() ));
}
- protected void addEnvVar( String key, String value )
+ public SurefireLauncher addEnvVar(String key, String value)
{
envvars.put( key, value );
+ return this;
}
private List<String> getInitialGoals()
@@ -179,16 +179,6 @@ public class SurefireLauncher
}
- public void assertPresent( File file )
- {
- verifier.assertFilePresent( file.getAbsolutePath() );
- }
-
- public void assertNotPresent( File file )
- {
- verifier.assertFileNotPresent( file.getAbsolutePath() );
- }
-
public SurefireLauncher assertNotPresent( String subFile )
{
verifier.assertFileNotPresent( surefireVerifier.getSubFile( subFile ).getAbsolutePath());
@@ -252,13 +242,23 @@ public class SurefireLauncher
throw new RuntimeException( "Expecting build failure, got none!" );
}
+ public OutputValidator executeVerifyWithFailure()
+ {
+ try {
+ executeVerify();
+ } catch (SurefireVerifierException ignore) {
+ return surefireVerifier;
+ }
+ throw new RuntimeException( "Expecting build failure, got none!" );
+ }
+
+
protected OutputValidator executeVerify()
- throws VerificationException
{
return execute( "verify" );
}
- private OutputValidator execute( String goal )
+ public OutputValidator execute( String goal )
{
addGoal( goal );
return executeCurrentGoals();
@@ -344,116 +344,11 @@ public class SurefireLauncher
}
- protected boolean assertContainsText( File file, String text )
- throws VerificationException
- {
- final List<String> list = surefireVerifier.loadFile( file, false );
- for ( String line : list )
- {
- if ( line.contains( text ) )
- {
- return true;
- }
- }
- Assert.fail( "Did not find expected message in log" );
- return false; // doh
- }
-
- protected boolean stringsAppearInSpecificOrderInLog( String[] strings )
- throws VerificationException
- {
- int i = 0;
- for ( String line : getLog() )
- {
- if ( line.startsWith( strings[i] ) )
- {
- if ( i == strings.length - 1 )
- {
- return true;
- }
- ++i;
- }
- }
- return false;
- }
-
- private List<String> getLog()
- throws VerificationException
- {
- return verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
- }
-
-
-
- private DefaultArtifactVersion getMavenArtifacteVersion()
- {
- try
- {
- String v = verifier.getMavenVersion();
- // NOTE: If the version looks like "${...}" it has been configured from an undefined expression
- if ( v != null && v.length() > 0 && !v.startsWith( "${" ) )
- {
- return new DefaultArtifactVersion( v );
- }
- }
- catch ( VerificationException e )
- {
- throw new RuntimeException( e );
- }
-
- return null;
- }
-
- /**
- * This allows fine-grained control over execution of individual test methods
- * by allowing tests to adjust to the current maven version, or else simply avoid
- * executing altogether if the wrong version is present.
- */
- private boolean matchesVersionRange( String versionRangeStr )
- {
- VersionRange versionRange;
- try
- {
- versionRange = VersionRange.createFromVersionSpec( versionRangeStr );
- }
- catch ( InvalidVersionSpecificationException e )
- {
- throw (RuntimeException) new IllegalArgumentException(
- "Invalid version range: " + versionRangeStr ).initCause( e );
- }
-
- ArtifactVersion version = getMavenArtifacteVersion();
- if ( version != null )
- {
- return versionRange.containsVersion( version );
- }
- else
- {
- throw new IllegalStateException( "Cannot determine maven version" );
- }
- }
-
protected String getSurefireVersion()
{
return surefireVersion;
}
- protected String getSurefireReportGoal()
- {
- return "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report";
- }
-
- protected String getSurefireReportOnlyGoal()
- {
- return "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report-only";
- }
-
- protected String getFailsafeReportOnlyGoal()
- {
- return "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion()
- + ":failsafe-report-only";
- }
-
public SurefireLauncher parallel( String parallel )
{
return addD( "parallel", parallel );
@@ -508,7 +403,6 @@ public class SurefireLauncher
}
public SurefireLauncher addFailsafeReportOnlyGoal()
- throws VerificationException
{
goals.add( "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":failsafe-report-only");
return this;
@@ -527,10 +421,14 @@ public class SurefireLauncher
}
- public void deleteSiteDir()
- throws IOException
+ public SurefireLauncher deleteSiteDir()
{
- FileUtils.deleteDirectory( surefireVerifier.getSubFile( "site" ));
+ try {
+ FileUtils.deleteDirectory( surefireVerifier.getSubFile( "site" ));
+ } catch (IOException e) {
+ throw new SurefireVerifierException(e);
+ }
+ return this;
}
public SurefireLauncher setTestToRun( String basicTest )
@@ -538,4 +436,8 @@ public class SurefireLauncher
addD( "test", basicTest);
return this;
}
+
+ public OutputValidator getSurefireVerifier() {
+ return surefireVerifier;
+ }
}
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its.misc;
+package org.apache.maven.surefire.its.fixture;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.StringUtils;
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java Fri Jan 6 15:04:22 2012
@@ -25,6 +25,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
+import java.net.URI;
import java.util.List;
import org.apache.commons.io.FileUtils;
@@ -88,7 +89,7 @@ public class TestFile
try
{
StringBuilder sb = new StringBuilder();
- BufferedReader reader = null;
+ BufferedReader reader;
reader = new BufferedReader( new FileReader( file ) );
for ( String line = reader.readLine(); line != null; line = reader.readLine() )
{
@@ -133,4 +134,7 @@ public class TestFile
Assert.fail( "Did not find expected message in log" );
}
+ public URI toURI() {
+ return file.toURI();
+ }
}
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/TestSuiteXmlParser.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/TestSuiteXmlParser.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/TestSuiteXmlParser.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its.misc;
+package org.apache.maven.surefire.its.fixture;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -34,6 +34,8 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.maven.surefire.its.fixture.ReportTestCase;
+import org.apache.maven.surefire.its.fixture.ReportTestSuite;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire141PluggableProvidersIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire141PluggableProvidersIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire141PluggableProvidersIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-613 Asserts proper test counts when running in parallel
@@ -27,7 +27,7 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire141PluggableProvidersIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testParallelBuildResultCount()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test Surefire-146 (forkMode=pertest fails to call setUp)
@@ -27,19 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Surefire146ForkPerTestNoSetupIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire146ForkPerTestNoSetupIT()
- {
- super( "/surefire-146-forkPerTestNoSetup" );
- }
-
public void testForkPerTestNoSetup()
- throws Exception
{
- executeTest();
- assertTestSuiteResults( 1, 0, 0, 0 );
-
+ executeErrorFreeTest("surefire-146-forkPerTestNoSetup", 1);
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,8 @@ package org.apache.maven.surefire.its;
import java.io.File;
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.codehaus.plexus.util.FileUtils;
/**
@@ -30,26 +31,19 @@ import org.codehaus.plexus.util.FileUtil
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Surefire162CharsetProviderIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire162CharsetProviderIT()
- {
- super( "/surefire-162-charsetProvider" );
- }
-
@SuppressWarnings( { "ResultOfMethodCallIgnored" } )
public void testCharsetProvider()
throws Exception
{
- OutputValidator verifier = getDefaultVerifier();
+ SurefireLauncher unpack = unpack("/surefire-162-charsetProvider");
+ OutputValidator verifier = unpack.getSurefireVerifier();
File jarFile = new File( verifier.getArtifactPath( "jcharset", "jcharset", "1.2.1", "jar" ) );
jarFile.getParentFile().mkdirs();
- FileUtils.copyFile( getSubFile( "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar" ), jarFile );
- FileUtils.copyFile( getSubFile( "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom" ),
- new File( verifier.getArtifactPath( "jcharset", "jcharset", "1.2.1", "pom" ) ) );
- executeTest();
-
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ FileUtils.copyFile( verifier.getSubFile("repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar"), jarFile );
+ FileUtils.copyFile(verifier.getSubFile("repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom"),
+ new File(verifier.getArtifactPath("jcharset", "jcharset", "1.2.1", "pom")));
+ unpack.executeTest().verifyErrorFree(1);
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,10 +19,10 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
-import org.apache.maven.surefire.its.misc.HelperAssertions;
-import org.apache.maven.surefire.its.misc.ReportTestCase;
-import org.apache.maven.surefire.its.misc.ReportTestSuite;
+import org.apache.maven.surefire.its.fixture.*;
+import org.apache.maven.surefire.its.fixture.HelperAssertions;
+import org.apache.maven.surefire.its.fixture.ReportTestCase;
+import org.apache.maven.surefire.its.fixture.ReportTestSuite;
import java.io.File;
import java.util.List;
@@ -33,22 +33,15 @@ import java.util.List;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Surefire224WellFormedXmlFailuresIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire224WellFormedXmlFailuresIT()
- {
- super( "/surefire-224-wellFormedXmlFailures" );
- }
-
public void testWellFormedXmlFailures()
- throws Exception
{
- executeTest( );
+ OutputValidator outputValidator = unpack("/surefire-224-wellFormedXmlFailures").executeTest();
- assertTestSuiteResults( 4, 0, 4, 0 );
+ outputValidator.assertTestSuiteResults( 4, 0, 4, 0 );
- ReportTestSuite suite = (ReportTestSuite) HelperAssertions.extractReports( ( new File[]{ getTestDir() } ) ).get( 0 );
+ ReportTestSuite suite = HelperAssertions.extractReports( ( new File[]{ outputValidator.getBaseDir() } ) ).get( 0 );
List<ReportTestCase> testCases = suite.getTestCases();
assertEquals( "Wrong number of test case objects", 4, testCases.size() );
ReportTestCase testQuote = null, testLower = null, testGreater = null, testU0000 = null;
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test Surefire-257 Verifies that surefire does not re-run tests in site build
@@ -27,19 +27,12 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire257NotRerunningTestsIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire257NotRerunningTestsIT()
- {
- super( "/surefire-257-rerunningTests" );
- }
-
public void testShouldNotRerun()
throws Exception
{
- addGoal( getSurefireReportGoal() );
- execute( getSurefireReportGoal() );
- verifyTextInLog( "Skipping execution of surefire because it has already been run for this configuration" );
+ unpack("/surefire-257-rerunningTests").addSurefireReportGoal().addSurefireReportGoal().executeCurrentGoals()
+ .verifyTextInLog("Skipping execution of surefire because it has already been run for this configuration");
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire260TestWithIdenticalNamesIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire260TestWithIdenticalNamesIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire260TestWithIdenticalNamesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,10 +19,11 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URI;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.*;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
@@ -35,24 +36,17 @@ import com.gargoylesoftware.htmlunit.htm
* @author Kristian Rosenvold
*/
public class Surefire260TestWithIdenticalNamesIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire260TestWithIdenticalNamesIT()
- {
- super( "/surefire-260-testWithIdenticalNames" );
- }
+ public void testWithIdenticalNames() throws IOException {
- public void testWithIdenticalNames()
- throws Exception
- {
-
- failNever();
- executeTest();
- reset();
- execute("surefire-report:report" );
+ SurefireLauncher surefireLauncher = unpack("surefire-260-testWithIdenticalNames").failNever();
+ surefireLauncher.executeTest();
+ surefireLauncher.reset();
+ OutputValidator validator = surefireLauncher.addSurefireReportGoal().executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile = validator.getSiteFile("surefire-report.html");
final URI uri = siteFile.toURI();
final WebClient webClient = new WebClient();
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire34SecurityManagerIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire34SecurityManagerIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire34SecurityManagerIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
@@ -27,20 +28,12 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire34SecurityManagerIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire34SecurityManagerIT()
- {
- super( "/surefire-34-securityManager" );
- }
-
public void testSecurityManager()
- throws Exception
{
- failNever();
- executeTest();
- execute( "install" );
- assertTestSuiteResults( 2, 1, 0, 0 );
+ SurefireLauncher surefireLauncher = unpack("/surefire-34-securityManager").failNever();
+ surefireLauncher.executeTest().
+ assertTestSuiteResults(2, 1, 0, 0);
}
}
\ No newline at end of file
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test Surefire-376 (TestNG @AfterSuite failures are ignored)
@@ -28,25 +27,11 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Surefire376TestNgAfterSuiteFailureIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire376TestNgAfterSuiteFailureIT()
- {
- super( "/testng-afterSuiteFailure" );
- }
-
public void testAfterSuiteFailure()
- throws Exception
{
- try
- {
- executeTest();
- fail( "Should fail" );
- }
- catch ( VerificationException e )
- {
+ unpack( "/testng-afterSuiteFailure" ).executeTestWithFailure().
assertTestSuiteResults( 2, 0, 1, 0 );
- }
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-377 (When JUnit and TestNG tests are in same project, only one set gets run).
@@ -27,18 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Surefire377TestNgAndJUnitTogetherIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire377TestNgAndJUnitTogetherIT()
- {
- super( "/testng-junit-together" );
- }
-
public void testTestNgAndJUnitTogether()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 2, 0, 0, 0 );
+ executeErrorFreeTest("/testng-junit-together", 2);
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire408ManualProviderSelectionIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire408ManualProviderSelectionIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire408ManualProviderSelectionIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-613 Asserts proper test counts when running in parallel
@@ -27,18 +27,12 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire408ManualProviderSelectionIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire408ManualProviderSelectionIT()
- {
- super( "/surefire-408-manual-provider-selection" );
- }
-
public void testPaallelBuildResultCount()
- throws Exception
{
- showErrorStackTraces();
- executeTest();
- verifyTextInLog( "Using configured provider org.apache.maven.surefire.junit.JUnit3Provider" );
+ unpack("/surefire-408-manual-provider-selection").showErrorStackTraces()
+ .executeTest()
+ .verifyTextInLog("Using configured provider org.apache.maven.surefire.junit.JUnit3Provider");
}
}
\ No newline at end of file
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCaseIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCaseIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCaseIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test JUnit test that contains inner classes
@@ -27,19 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Surefire42NotExtendingTestCaseIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire42NotExtendingTestCaseIT()
- {
- super( "/junit-notExtendingTestCase" );
- }
-
public void testInnerClass()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ executeErrorFreeTest("junit-notExtendingTestCase", 1);
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTestIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTestIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test JUnit test that contains inner classes
@@ -27,18 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Surefire44InnerClassTestIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire44InnerClassTestIT()
- {
- super( "/junit-innerClass" );
- }
-
public void testInnerClass()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ executeErrorFreeTest("/junit-innerClass", 1);
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java
------------------------------------------------------------------------------
svn:eol-style = native