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 01:24:36 UTC
svn commit: r1227906 [1/2] - in
/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its:
./ fixture/ misc/
Author: krosenvold
Date: Fri Jan 6 00:24:34 2012
New Revision: 1227906
URL: http://svn.apache.org/viewvc?rev=1227906&view=rev
Log:
o Converted to latest generation fluent test
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java (contents, props changed)
- copied, changed from r1227727, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AsbtractTestMethodPattern.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java (contents, props changed)
- copied, changed from r1227727, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestSingleMethod.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java (contents, props changed)
- copied, changed from r1227727, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IntegrationTestSuiteResults.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java (contents, props changed)
- copied, changed from r1227727, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java
Removed:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestSingleMethod.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AsbtractTestMethodPattern.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IntegrationTestSuiteResults.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestMethodPatternIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestSingleMethodIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestMethodPatternIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestSingleMethodIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternBeforeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierTestClass2.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772NoFailsafeReportsIT.java
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java Fri Jan 6 00:24:34 2012
@@ -19,29 +19,22 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
/**
* Test files with "Abstract" in their name that aren't really abstract,
* and abstract classes that don't say "Abstract" in their name
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class AbstractTestCaseIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
- public AbstractTestCaseIT()
- {
- super( "/default-configuration-abstract" );
- }
-
public void testAbstractTestCase()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack( "/default-configuration-abstract" ).executeTest().verifyErrorFree( 1);
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java Fri Jan 6 00:24:34 2012
@@ -19,27 +19,19 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
/**
* Test additionalClasspathElements
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class AdditionalClasspathIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public AdditionalClasspathIT()
- {
- super( "/additional-classpath" );
- }
-
public void testAdditionalClasspath()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack( "/additional-classpath" ).executeTest().verifyErrorFree( 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java Fri Jan 6 00:24:34 2012
@@ -20,36 +20,34 @@ package org.apache.maven.surefire.its;
*/
import java.io.File;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+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.fixture.TestFile;
import org.apache.maven.surefire.its.misc.HelperAssertions;
/**
* Test report aggregation
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class AggregateReportIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
- public AggregateReportIT()
- {
- super( "/aggregate-report" );
- }
-
public void testAggregateReport()
- throws Exception
{
- execute( "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report" );
-
- File surefireReportHtml = getSiteFile( "surefire-report.html" );
+ final OutputValidator outputValidator =
+ unpack( "/aggregate-report" ).addSurefireReportGoal().executeCurrentGoals();
+ TestFile surefireReportHtml = outputValidator.getSiteFile( "surefire-report.html" );
assertTrue( "surefire report missing: " + surefireReportHtml.getAbsolutePath(), surefireReportHtml.exists() );
// TODO HtmlUnit tests on the surefire report
File[] testDirs = new File[2];
- testDirs[0] = new File( getTestDir(), "child1" );
- testDirs[1] = new File( getTestDir(), "child2" );
+ testDirs[0] = new File( outputValidator.getBaseDir(), "child1" );
+ testDirs[1] = new File( outputValidator.getBaseDir(), "child2" );
IntegrationTestSuiteResults suite = HelperAssertions.parseTestResults( testDirs );
HelperAssertions.assertTestSuiteResults( 2, 0, 1, 0, suite );
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java Fri Jan 6 00:24:34 2012
@@ -19,27 +19,19 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
/**
* Test passing an argLine parameter
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class ArgLineIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public ArgLineIT()
- {
- super( "/argLine-parameter" );
- }
-
public void testArgLine()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack( "/argLine-parameter" ).executeTest().verifyErrorFree( 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java Fri Jan 6 00:24:34 2012
@@ -19,70 +19,47 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import java.io.File;
-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.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.TestFile;
/**
* Test running a single test with -Dtest=BasicTest
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckSingleTestIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public CheckSingleTestIT()
- {
- super( "/default-configuration" );
- }
-
public void testSingleTest()
- throws Exception
{
- addD( "test", "BasicTest" );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack().setTestToRun("BasicTest" ).executeTest().verifyErrorFree( 1 );
}
public void testSingleTestDotJava()
- throws Exception
{
- addD( "test", "BasicTest.java" );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack().setTestToRun("BasicTest.java" ).executeTest().verifyErrorFree( 1 );
}
public void testSingleTestNonExistent()
- throws Exception
{
- addD( "test", "DoesNotExist" );
- try
- {
- executeTest();
- verifyErrorFreeLog();
- fail( "Build should have failed" );
- }
- catch ( VerificationException e )
- {
- // as expected
- }
-
- File reportsDir = getTargetFile( "surefire-reports" );
+ final OutputValidator output = unpack().setTestToRun( "DoesNotExist" ).executeTestWithFailure();
+ TestFile reportsDir = output.getTargetFile( "surefire-reports" );
assertFalse( "Unexpected reports directory", reportsDir.exists() );
}
public void testSingleTestNonExistentOverride()
- throws Exception
{
- addD( "test", "DoesNotExist.java" );
- failIfNoTests( false );
- executeTest();
- verifyErrorFreeLog();
-
- File reportsDir = getTargetFile( "surefire-reports" );
+ final OutputValidator output = unpack().setTestToRun( "DoesNotExist" ).failIfNoTests(false).executeTest().verifyErrorFreeLog();
+ TestFile reportsDir = output.getTargetFile( "surefire-reports" );
assertFalse( "Unexpected reports directory", reportsDir.exists() );
}
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/default-configuration" );
+ }
+
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java Fri Jan 6 00:24:34 2012
@@ -19,8 +19,6 @@ 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.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
@@ -28,49 +26,43 @@ import org.apache.maven.surefire.its.fix
* Test failIfNoTests with various forkModes.
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestFailIfNoTestsForkModeIT
extends SurefireVerifierTestClass2
{
public void testFailIfNoTestsForkModeAlways()
- throws Exception
{
doTest( unpack().forkAlways().failIfNoTests( true ) );
}
public void testFailIfNoTestsForkModeNever()
- throws Exception
{
doTest( unpack().forkNever().failIfNoTests( true ) );
}
public void testFailIfNoTestsForkModeOnce()
- throws Exception
{
doTest( unpack().forkOnce().failIfNoTests( true ) );
}
public void testDontFailIfNoTestsForkModeAlways()
- throws Exception
{
doTest( unpack().forkAlways().failIfNoTests( false) );
}
public void testDontFailIfNoTestsForkModeNever()
- throws Exception
{
doTest( unpack().forkNever().failIfNoTests( false) );
}
public void testDontFailIfNoTestsForkModeOnce()
- throws Exception
{
doTest( unpack().forkOnce().failIfNoTests( false) );
}
private void doTest( SurefireLauncher launcher )
- throws IOException, VerificationException
{
if ( launcher.isFailIfNoTests() )
{
@@ -83,7 +75,6 @@ public class CheckTestFailIfNoTestsForkM
}
private SurefireLauncher unpack()
- throws VerificationException, IOException
{
return unpack("default-configuration-classWithNoTests");
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java Fri Jan 6 00:24:34 2012
@@ -19,61 +19,42 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
-
-import java.io.File;
+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.TestFile;
/**
* Test failIfNoTests
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestFailIfNoTestsIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public CheckTestFailIfNoTestsIT()
+ private SurefireLauncher unpack()
{
- super( "/default-configuration-noTests" );
+ return unpack( "/default-configuration-noTests" );
}
public void testFailIfNoTests()
- throws Exception
{
- failIfNoTests( true );
-
- try
- {
- executeTest();
- verifyErrorFreeLog();
- fail( "Build didn't fail, but it should" );
- }
- catch ( VerificationException ignore )
- {
- }
-
+ unpack().failIfNoTests( true ).executeTestWithFailure();
}
public void testDontFailIfNoTests()
- throws Exception
{
- failIfNoTests( false );
- executeTest();
- verifyErrorFreeLog();
-
- File reportsDir = getSurefireReportsFile( "" );
+ final OutputValidator outputValidator = unpack().failIfNoTests( false ).executeTest();
+ outputValidator.verifyErrorFreeLog();
+ TestFile reportsDir = outputValidator.getSurefireReportsFile( "" );
assertFalse( "Unexpected reports directory", reportsDir.exists() );
}
public void test48CategoriesFailWhenNoTests()
- throws Exception
{
- failIfNoTests( false );
- activateProfile( "junit47" );
- addD( "junit.version", "4.8.1" );
- executeTest();
- verifyErrorFreeLog();
+ unpack().failIfNoTests( false ).activateProfile( "junit47" ).setJUnitVersion( "4.8.1" )
+ .executeTest().verifyErrorFreeLog();
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java Fri Jan 6 00:24:34 2012
@@ -19,35 +19,21 @@ 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.SurefireVerifierTestClass2;
/**
* Test failures in @BeforeMethod annotation on TestNg suite
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgBeforeMethodFailureIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
- public CheckTestNgBeforeMethodFailureIT()
- {
- super( "/testng-beforeMethodFailure" );
- }
-
public void testTestNgBeforeMethodFailure()
throws Exception
{
- try
- {
- executeTest();
- verifyErrorFreeLog();
- fail( "Build didn't fail, but it should" );
- }
- catch ( VerificationException ignore )
- {
- }
- assertTestSuiteResults( 2, 0, 1, 1 );
+ unpack( "/testng-beforeMethodFailure" ).executeTestWithFailure().assertTestSuiteResults( 2, 0, 1, 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java Fri Jan 6 00:24:34 2012
@@ -19,27 +19,20 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
/**
* Test @BeforeMethod annotation on TestNg suite
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgBeforeMethodIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public CheckTestNgBeforeMethodIT()
- {
- super( "/testng-beforeMethod" );
- }
-
public void testTestNgBeforeMethod()
throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack( "/testng-beforeMethod" ).executeTest().verifyErrorFree( 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java Fri Jan 6 00:24:34 2012
@@ -19,34 +19,21 @@ 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.SurefireVerifierTestClass2;
/**
* Test for checking that the output from a forked suite is properly captured even if the suite encounters a severe error.
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgExecuteErrorIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public CheckTestNgExecuteErrorIT()
- {
- super( "/testng-execute-error" );
- }
-
public void testExecuteError()
throws Exception
{
- try
- {
- executeTest();
- }
- catch ( VerificationException ignore )
- {
- } // expected
-
- verifyTextInLog( "at org.apache.maven.surefire.testng.TestNGExecutor.run" );
+ unpack( "/testng-execute-error" ).executeTestWithFailure()
+ .verifyTextInLog( "at org.apache.maven.surefire.testng.TestNGExecutor.run" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java Fri Jan 6 00:24:34 2012
@@ -31,9 +31,7 @@ public class CheckTestNgGroupThreadParal
extends SurefireVerifierTestClass2
{
public void testTestNgGroupThreadParallel()
- throws Exception
{
- unpack( "testng-group-thread-parallel" ).executeTest().verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0,
- 0 );
+ unpack( "testng-group-thread-parallel" ).executeTest().verifyErrorFree(3);
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java Fri Jan 6 00:24:34 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.SurefireVerifierTestClass2;
/**
* Test TestNG running in the JDK 1.4 JavaDoc style
@@ -27,20 +27,18 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgJdk14IT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
public CheckTestNgJdk14IT()
{
- super( "/testng-jdk14" );
+ unpack( "/testng-jdk14" );
}
public void testTestNgJdk14()
throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack( "/testng-jdk14" ).executeTest().verifyErrorFree( 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java Fri Jan 6 00:24:34 2012
@@ -32,10 +32,9 @@ public class CheckTestNgListenerReporter
extends SurefireVerifierTestClass2
{
public void testTestNgListenerReporter()
- throws Exception
{
final SurefireLauncher verifierStarter = unpack( "testng-listener-reporter" );
- verifierStarter.executeTest().verifyErrorFreeLog().assertTestSuiteResults( 1, 0, 0, 0 )
+ verifierStarter.executeTest().verifyErrorFree(1)
.getTargetFile( "resultlistener-output.txt" ).assertFileExists()
.getTargetFile( "suitelistener-output.txt" ).assertFileExists()
.getTargetFile( "reporter-output.txt" ).assertFileExists();
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java Fri Jan 6 00:24:34 2012
@@ -30,8 +30,7 @@ public class CheckTestNgPathWithSpacesIT
extends SurefireVerifierTestClass2
{
public void testTestNgTestWithSpaces()
- throws Exception
{
- unpack( "testng-path with spaces" ).executeTest().verifyErrorFreeLog().assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack( "testng-path with spaces" ).executeTest().verifyErrorFree(1);
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java Fri Jan 6 00:24:34 2012
@@ -19,11 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import java.io.File;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
-import org.apache.maven.surefire.its.misc.HelperAssertions;
-
-import junit.framework.Assert;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
/**
* Test surefire-report on TestNG test
@@ -31,22 +28,13 @@ import junit.framework.Assert;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgReportTestIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public CheckTestNgReportTestIT()
- {
- super( "/testng-simple" );
- }
-
public void testTestNgReport()
throws Exception
{
- execute( getSurefireReportGoal() );
- verifyErrorFreeLog();
-
- HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, getTestDir() );
- File reportHtml = new File( getTestDir(), "target/site/surefire-report.html" );
- Assert.assertTrue( "surefire-report is missing", reportHtml.exists() );
+ final OutputValidator outputValidator =
+ unpack( "/testng-simple" ).addSurefireReportGoal().executeCurrentGoals().verifyErrorFree( 1 );
+ outputValidator.getSiteFile( "surefire-report.html" ).assertFileExists();
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java Fri Jan 6 00:24:34 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.SurefireVerifierTestClass2;
/**
* Test simple TestNG suite XML file
@@ -27,26 +28,22 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgSuiteXmlIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public CheckTestNgSuiteXmlIT()
+ public void testTestNgSuiteXml()
{
- super( "/testng-suite-xml" );
+ unpack().executeTest().verifyErrorFree( 1) ;
}
- public void testTestNgSuiteXml()
- throws Exception
+ public void testTestNgSuiteXmlForkModeAlways()
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack().forkAlways().executeTest().verifyErrorFree( 1) ;
}
- public void testTestNgSuiteXmlForkModeAlways()
- throws Exception
+ private SurefireLauncher unpack()
{
- forkAlways();
- testTestNgSuiteXml();
+ return unpack( "testng-suite-xml" );
}
+
+
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java Fri Jan 6 00:24:34 2012
@@ -19,12 +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.misc.HelperAssertions;
-import org.apache.maven.surefire.its.misc.ReportTestSuite;
-
-import java.io.File;
-import java.util.List;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
/**
* Use -Dtest to run a single TestNG test, overriding the suite XML parameter.
@@ -32,23 +27,11 @@ import java.util.List;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgSuiteXmlSingleIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
- public CheckTestNgSuiteXmlSingleIT()
- {
- super( "/testng-twoTestCaseSuite" );
- }
-
public void testTestNGSuite()
- throws Exception
{
- addGoal( "-Dtest=TestNGTestTwo" );
- executeTest();
- verifyErrorFreeLog();
-
- List<ReportTestSuite> reports = HelperAssertions.extractReports( ( new File[]{ getTestDir() } ) );
- IntegrationTestSuiteResults results = HelperAssertions.parseReportList( reports );
- HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, results );
+ unpack( "/testng-twoTestCaseSuite" ).setTestToRun( "TestNGTestTwo" ).executeTest().verifyErrorFree( 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java Fri Jan 6 00:24:34 2012
@@ -28,6 +28,7 @@ import org.apache.maven.surefire.its.fix
* -Dtestng.version=5.14.2 (for example)
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgVersionsIT
extends SurefireVerifierTestClass2
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java Fri Jan 6 00:24:34 2012
@@ -19,27 +19,19 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
/**
* Test for checking the order of class path elements
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class ClassPathOrderIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public ClassPathOrderIT()
- {
- super( "/classpath-order" );
- }
-
public void testClassPathOrder()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 2, 0, 0, 0 );
+ unpack( "/classpath-order" ).executeTest().verifyErrorFree( 2 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java Fri Jan 6 00:24:34 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.SurefireVerifierTestClass2;
/**
* Test additionalClasspathElements
@@ -27,19 +27,11 @@ import org.apache.maven.surefire.its.fix
* @author pgier
*/
public class ClasspathFilteringIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public ClasspathFilteringIT()
- {
- super( "/classpath-filtering" );
- }
-
public void testAdditionalClasspath()
throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack( "classpath-filtering" ).executeTest().verifyErrorFree( 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java Fri Jan 6 00:24:34 2012
@@ -31,8 +31,7 @@ public class ClasspathScopeFilteringIT
extends SurefireVerifierTestClass2
{
public void testAdditionalClasspath()
- throws Exception
{
- unpack( "classpath-scope-filtering" ).executeTest().verifyErrorFreeLog().assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack( "classpath-scope-filtering" ).executeTest().verifyErrorFree(1);
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java Fri Jan 6 00:24:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import java.io.File;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
/**
* Basic suite test using all known versions of JUnit 4.x
@@ -28,21 +28,12 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class ConsoleOutputIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public ConsoleOutputIT()
- {
- super( "/consoleOutput" );
- }
-
public void testProperNewlines()
- throws Exception
{
- redirectToFile(true);
- addGoal( "-DjunitVersion=4.7" );
- executeTest();
- final File surefireReportsFile = getSurefireReportsFile( "consoleOutput.Test1-output.txt" );
- assertContainsText( surefireReportsFile, "SoutAgain" );
+ final OutputValidator outputValidator =
+ unpack( "/consoleOutput" ).redirectToFile( true ).setJUnitVersion( "4.7" ).executeTest();
+ outputValidator.getSurefireReportsFile( "consoleOutput.Test1-output.txt" ).assertContainsText( "SoutAgain" );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java Fri Jan 6 00:24:34 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.SurefireVerifierTestClass2;
/**
* Test basic default configuration, runs the JUnit 3 test in the src/test directory.
@@ -27,19 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class DefaultConfigurationIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
- public DefaultConfigurationIT()
- {
- super( "/default-configuration" );
- }
-
public void testDefaultConfiguration()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
-
- assertTestSuiteResults( 1, 0, 0, 0 );
+ executeErrorFreeTest( "default-configuration" , 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java Fri Jan 6 00:24:34 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.SurefireVerifierTestClass2;
/**
* Test basic default configuration, runs the JUnit 3 test in the src/test directory.
@@ -27,19 +27,12 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class EnvironmentVariableIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
- public EnvironmentVariableIT()
- {
- super( "/junit44-environment" );
- }
-
public void testEnvironmentVariable()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+
+ executeErrorFreeTest( "junit44-environment", 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java Fri Jan 6 00:24:34 2012
@@ -19,7 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-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.SurefireVerifierTestClass2;
/**
* Asserts proper behaviour of console output when forking
@@ -29,54 +31,36 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class ForkConsoleOutputIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
- public ForkConsoleOutputIT()
+ private SurefireLauncher unpack()
{
- super( "/fork-consoleOutput" );
+ return unpack( "/fork-consoleOutput" );
}
public void testPrintSummaryTrueWithRedirect()
- throws Exception
{
- redirectToFile( true );
- printSummary( true );
-
- execute( "test" );
- assertPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ) );
+ final OutputValidator outputValidator = unpack().redirectToFile( true ).printSummary( true ).executeTest();
+ outputValidator.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ).assertFileExists();
}
public void testPrintSummaryTrueWithoutRedirect()
- throws Exception
{
- redirectToFile( false );
- printSummary( true );
-
- execute( "test" );
- assertNotPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ) );
+ final OutputValidator outputValidator = unpack().redirectToFile( false ).printSummary( true ).executeTest();
+ outputValidator.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ).assertFileNotExists();
}
public void testPrintSummaryFalseWithRedirect()
- throws Exception
{
- redirectToFile( true );
- printSummary( false );
- debugLogging();
- showErrorStackTraces();
-
- execute( "test" );
- assertPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ) );
+ final OutputValidator outputValidator = unpack().redirectToFile( true ).printSummary( false).debugLogging().showErrorStackTraces().executeTest();
+ outputValidator.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ).assertFileExists();
}
public void testPrintSummaryFalseWithoutRedirect()
- throws Exception
{
- redirectToFile( false );
- printSummary( false );
-
- execute( "test" );
- assertNotPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ) );
+ final OutputValidator outputValidator = unpack().redirectToFile( false ).printSummary( false).executeTest();
+ outputValidator.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ).assertFileNotExists();
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java Fri Jan 6 00:24:34 2012
@@ -19,8 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import java.io.File;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.TestFile;
/**
* Asserts proper behaviour of console output when forking
@@ -30,22 +31,15 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class ForkConsoleOutputWithErrorsIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public ForkConsoleOutputWithErrorsIT()
- {
- super( "/fork-consoleOutputWithErrors" );
- }
-
public void testXmlFileContainsConsoleOutput()
- throws Exception
{
- failNever();
- redirectToFile( true );
- execute( "test" );
- final File surefireReportsFile = getSurefireReportsFile( "TEST-forkConsoleOutput.Test2.xml" );
- assertContainsText( surefireReportsFile, "sout: Will Fail soon" );
- assertContainsText( surefireReportsFile, "serr: Will Fail now" );
+ final OutputValidator outputValidator = unpack( "/fork-consoleOutputWithErrors" ).
+ failNever().redirectToFile( true ).executeTest();
+ final TestFile
+ surefireReportsFile = outputValidator.getSurefireReportsFile( "TEST-forkConsoleOutput.Test2.xml" );
+ surefireReportsFile.assertContainsText( "sout: Will Fail soon" );
+ surefireReportsFile.assertContainsText( "serr: Will Fail now" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java Fri Jan 6 00:24:34 2012
@@ -19,8 +19,6 @@ 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.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
@@ -35,7 +33,6 @@ public class ForkModeIT
extends SurefireVerifierTestClass2
{
public void testForkModeAlways()
- throws Exception
{
String[] pids = doTest( unpack( getProject() ).forkAlways());
@@ -43,21 +40,18 @@ public class ForkModeIT
}
public void testForkModePerTest()
- throws Exception
{
String[] pids = doTest( unpack( getProject() ).forkPerTest());
assertDifferentPids( pids );
}
public void testForkModeNever()
- throws Exception
{
String[] pids = doTest( unpack( getProject() ).forkNever() );
assertSamePids( pids );
}
public void testForkModeNone()
- throws Exception
{
String[] pids = doTest( unpack( getProject() ).forkMode( "none" ));
@@ -65,7 +59,6 @@ public class ForkModeIT
}
public void testForkModeOnce()
- throws Exception
{
String[] pids = doTest( unpack( getProject() ).forkOnce());
// DGF It would be nice to assert that "once" was different
@@ -100,7 +93,6 @@ public class ForkModeIT
}
private String[] doTest( SurefireLauncher forkMode )
- throws IOException, VerificationException
{
final OutputValidator outputValidator = forkMode.executeTest();
outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java Fri Jan 6 00:24:34 2012
@@ -19,8 +19,9 @@ 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.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
/**
* Test include/exclude patterns.
@@ -29,43 +30,37 @@ import org.apache.maven.surefire.its.fix
* @version $Id$
*/
public class IncludesExcludesIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
- public IncludesExcludesIT()
+ private SurefireLauncher unpack()
{
- super( "/includes-excludes" );
+ return unpack( "/includes-excludes" );
}
/**
* Test surefire inclusions/exclusions
*/
public void testIncludesExcludes()
- throws Exception
{
testWithProfile( "-Psimple" );
}
public void testRegexIncludesExcludes()
- throws Exception
{
testWithProfile( "-Pregex" );
}
public void testPathBasedIncludesExcludes()
- throws Exception
{
testWithProfile( "-Ppath" );
}
private void testWithProfile( String profile )
- throws VerificationException
{
- addGoal( profile );
- execute( "test" );
- assertPresent( getTargetFile( "testTouchFile.txt" ) );
- assertPresent( getTargetFile( "defaultTestTouchFile.txt" ) );
- verifyErrorFreeLog();
- assertTestSuiteResults( 2, 0, 0, 0 );
+ final OutputValidator outputValidator = unpack().
+ addGoal( profile ).executeTest().verifyErrorFree( 2 );
+ outputValidator.getTargetFile( "testTouchFile.txt" ).assertFileExists();
+ outputValidator.getTargetFile( "defaultTestTouchFile.txt" ).assertFileExists();
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java Fri Jan 6 00:24:34 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.SurefireVerifierTestClass2;
/**
* Test project using JUnit4.4 (including Hamcrest extensions)
@@ -27,18 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class JUnit44HamcrestIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
- public JUnit44HamcrestIT()
- {
- super( "/junit44-hamcrest" );
- }
-
public void testJUnit44Hamcrest()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ executeErrorFreeTest( "junit44-hamcrest", 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java Fri Jan 6 00:24:34 2012
@@ -20,51 +20,43 @@ package org.apache.maven.surefire.its;
*/
import java.io.IOException;
-
-import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
-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.SurefireVerifierTestClass2;
public class JUnit47RedirectOutputIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
- public JUnit47RedirectOutputIT()
- {
- super( "/junit47-redirect-output" );
- }
-
public void testPrintSummaryTrueWithRedirect()
throws Exception
{
- redirectToFile( true );
-
- addGoal( "clean" );
- executeTest();
- checkReports();
+ final OutputValidator clean = unpack().redirectToFile( true ).addGoal( "clean" ).executeTest();
+ checkReports(clean);
}
public void testClassesParallel()
throws Exception
{
- redirectToFile( true );
-
- addGoal( "clean" );
- addGoal( "-Dparallel=classes" );
- executeTest();
- checkReports();
+ final OutputValidator clean = unpack().redirectToFile( true ).addGoal( "clean" ).parallelClasses().executeTest();
+ checkReports(clean);
}
- private void checkReports()
+ private void checkReports( OutputValidator validator )
throws IOException
{
- String report = StringUtils.trimToNull(
- FileUtils.readFileToString( getSurefireReportsFile( "junit47ConsoleOutput.Test1-output.txt" ) ) );
+ String report = StringUtils.trimToNull( validator.getSurefireReportsFile( "junit47ConsoleOutput.Test1-output.txt" ).readFileToString() ) ;
assertNotNull( report );
- String report2 =
- StringUtils.trimToNull( FileUtils.readFileToString( getSurefireReportsFile( "junit47ConsoleOutput.Test2-output.txt" ) ) );
+ String report2 = StringUtils.trimToNull( validator.getSurefireReportsFile( "junit47ConsoleOutput.Test2-output.txt" ).readFileToString() );
assertNotNull( report2 );
- assertFalse( getSurefireReportsFile( "junit47ConsoleOutput.Test3-output.txt" ).exists() );
+ assertFalse( validator.getSurefireReportsFile( "junit47ConsoleOutput.Test3-output.txt" ).exists() );
+ }
+
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/junit47-redirect-output" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java Fri Jan 6 00:24:34 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.SurefireVerifierTestClass2;
/**
* Test JUnit 4 tests marked with "Ignore" attribute
@@ -27,19 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class JUnit4ForkAlwaysStaticInitPollutionIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
-
- public JUnit4ForkAlwaysStaticInitPollutionIT()
- {
- super( "/junit4-forkAlways-staticInit" );
- }
-
public void testJunit4Ignore()
- throws Exception
{
- this.executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 2, 0, 0, 0 );
+ executeErrorFreeTest( "junit4-forkAlways-staticInit", 2 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java Fri Jan 6 00:24:34 2012
@@ -19,8 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import java.io.File;
-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.SurefireVerifierTestClass2;
/**
* JUnit4 RunListener Integration Test.
@@ -28,51 +29,46 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
*/
public class JUnit4RunListenerIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
public JUnit4RunListenerIT()
{
- super( "/junit4-runlistener" );
+ unpack();
}
- public void testJUnit4RunListener()
- throws Exception
+ private SurefireLauncher unpack()
{
- addGoal( "-Dprovider=surefire-junit4" );
- addGoal( "-DjunitVersion=4.4" );
- executeTest();
- verifyErrorFreeLog();
- assertResults();
- verifyTextInLog( "testRunStarted null" );
- verifyTextInLog( "testFinished simpleTest" );
- verifyTextInLog( "testRunFinished org.junit.runner.Result" );
+ return unpack( "/junit4-runlistener" );
}
- private void assertResults()
+ public void testJUnit4RunListener()
+ throws Exception
{
- assertTestSuiteResults( 1, 0, 0, 0 );
- final File targetDir = getSubFile( "target" );
-
- assertFileExists( new File( targetDir, "runlistener-output-1.txt" ) );
- assertFileExists( new File( targetDir, "runlistener-output-2.txt" ) );
+ final OutputValidator outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion(
+ "4.4" ).executeTest().verifyErrorFreeLog();
+ assertResults(outputValidator);
+ outputValidator.verifyTextInLog( "testRunStarted null" );
+ outputValidator.verifyTextInLog( "testFinished simpleTest" );
+ outputValidator.verifyTextInLog( "testRunFinished org.junit.runner.Result" );
}
public void testRunlistenerJunitCoreProvider()
throws Exception
{
- addGoal( "-Dprovider=surefire-junit47" );
- addGoal( "-DjunitVersion=4.8.1" );
- executeTest();
- verifyErrorFreeLog();
- assertResults();
- verifyTextInLog( "testRunStarted null" );
- verifyTextInLog( "testFinished simpleTest" );
- verifyTextInLog( "testRunFinished org.junit.runner.Result" );
+ final OutputValidator outputValidator = unpack().addGoal( "-Dprovider=surefire-junit47" ).setJUnitVersion(
+ "4.8.1" ).addGoal( "-DjunitVersion=4.8.1" ).executeTest().verifyErrorFreeLog(); // Todo: Fix junitVesion
+ assertResults(outputValidator);
+ outputValidator.verifyTextInLog( "testRunStarted null" );
+ outputValidator.verifyTextInLog( "testFinished simpleTest" );
+ outputValidator.verifyTextInLog( "testRunFinished org.junit.runner.Result" );
}
- private void assertFileExists( final File file )
+ private void assertResults( OutputValidator outputValidator )
{
- assertTrue( "File doesn't exist: " + file.getAbsolutePath(), file.exists() );
+ outputValidator.assertTestSuiteResults( 1, 0, 0, 0 );
+ outputValidator.getTargetFile( "runlistener-output-1.txt" ).assertFileExists();
+ outputValidator.getTargetFile( "runlistener-output-2.txt" ).assertFileExists();
}
+
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java Fri Jan 6 00:24:34 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.SurefireVerifierTestClass2;
/**
* Test JUnit 4 tests marked with "Ignore" attribute
@@ -27,30 +28,20 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Junit4IgnoreIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
- public Junit4IgnoreIT()
- {
- super( "/junit-ignore" );
- }
-
public void testJunit4Ignore()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 3, 0, 0, 3 );
+ unpack().executeTest().verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 3 );
}
public void testJunit47ParallelIgnore()
- throws Exception
{
-
- addGoal( "-Djunit.version=4.8.1" );
- addGoal( "-Dsurefire.parallel=classes" );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 3, 0, 0, 3 );
+ unpack().setJUnitVersion( "4.8.1" ).parallelClasses().executeTest().verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 3 );
}
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/junit-ignore" );
+ }
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java?rev=1227906&r1=1227905&r2=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java Fri Jan 6 00:24:34 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.SurefireVerifierTestClass2;
/**
* Basic suite test using all known versions of JUnit 4.x
@@ -27,12 +28,17 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Junit4VersionsIT
- extends SurefireVerifierTestClass
+ extends SurefireVerifierTestClass2
{
public Junit4VersionsIT()
{
- super( "/junit4" );
+ unpack();
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/junit4" );
}
public void test40()
@@ -93,9 +99,6 @@ public class Junit4VersionsIT
public void runJUnitTest( String version )
throws Exception
{
- addGoal( "-DjunitVersion=" + version );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack().setJUnitVersion( version ).executeTest().verifyErrorFree( 1 );
}
}
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java (from r1227727, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AsbtractTestMethodPattern.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AsbtractTestMethodPattern.java&r1=1227727&r2=1227906&rev=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AsbtractTestMethodPattern.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java Fri Jan 6 00:24:34 2012
@@ -19,26 +19,44 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
/**
* Test project using -Dtest=mtClass#myMethod
*
* @author <a href="mailto:olamy@apache.org">Olivier Lamy</a>
*/
-public abstract class AsbtractTestMethodPattern
- extends SurefireVerifierTestClass
+public class TestMethodPatternIT
+ extends SurefireVerifierTestClass2
{
- public AsbtractTestMethodPattern( String projectResource )
+ public void runMethodPattern( String projectName )
{
- super( projectResource );
+ unpack( projectName ).executeTest().assertTestSuiteResults( 2, 0, 0, 0 );
}
- public void testMethodPattern()
- throws Exception
+ public void testJUnit44()
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 2, 0, 0, 0 );
+ runMethodPattern( "junit44-method-pattern" );
}
+
+ public void testJUnit48()
+ {
+ runMethodPattern( "junit48-method-pattern" );
+ }
+
+ public void testTestNgMethodBefore()
+ {
+ runMethodPattern( "testng-method-pattern-before" );
+ }
+
+ public void testTestNGMethodPattern()
+ {
+ runMethodPattern( "/testng-method-pattern" );
+ }
+
+ public void testMethodPatternAfter()
+ {
+ unpack( "testng-method-pattern-after" ).executeTest().verifyErrorFree( 2 ).verifyTextInLog( "Called tearDown" );
+ }
+
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java (from r1227727, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestSingleMethod.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestSingleMethod.java&r1=1227727&r2=1227906&rev=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestSingleMethod.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java Fri Jan 6 00:24:34 2012
@@ -19,26 +19,44 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
/**
* Test project using -Dtest=mtClass#myMethod
*
* @author <a href="mailto:olamy@apache.org">Olivier Lamy</a>
*/
-public abstract class AbstractTestSingleMethod
- extends SurefireVerifierTestClass
+public class TestSingleMethodIT
+ extends SurefireVerifierTestClass2
{
- public AbstractTestSingleMethod( String projectResource )
+ public void singleMethod(String projectName)
+ throws Exception
+ {
+ unpack( projectName ).executeTest().verifyErrorFreeLog().assertTestSuiteResults( 1, 0, 0, 0 );
+ }
+
+ public void testJunit44()
+ throws Exception
+ {
+ singleMethod( "junit44-single-method");
+ }
+
+ public void testJunit48()
+ throws Exception
{
- super( projectResource );
+ singleMethod( "junit48-single-method");
}
- public void testSingleMethod()
+ public void testTestNg()
throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ singleMethod( "testng-single-method");
}
+
+ public void testTestNg5149()
+ throws Exception
+ {
+ singleMethod( "/testng-single-method-5-14-9");
+ }
+
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
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=1227906&r1=1227905&r2=1227906&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 00:24:34 2012
@@ -23,6 +23,7 @@ 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;
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java (from r1227727, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IntegrationTestSuiteResults.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IntegrationTestSuiteResults.java&r1=1227727&r2=1227906&rev=1227906&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IntegrationTestSuiteResults.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java Fri Jan 6 00:24:34 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+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/IntegrationTestSuiteResults.java
------------------------------------------------------------------------------
svn:eol-style = native