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 2013/02/14 22:44:44 UTC
[3/3] git commit: Ported all ITs to JUnit4
Updated Branches:
refs/heads/master d7eb244b0 -> 25e8a5933
Ported all ITs to JUnit4
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/25e8a593
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/25e8a593
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/25e8a593
Branch: refs/heads/master
Commit: 25e8a593368b34e2bc27b375869eb16f5ac4bc0b
Parents: d7eb244
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Thu Feb 14 22:00:46 2013 +0100
Committer: Kristian Rosenvold <kr...@apache.org>
Committed: Thu Feb 14 22:37:40 2013 +0100
----------------------------------------------------------------------
.../maven/surefire/its/AbstractTestCaseIT.java | 9 ++-
.../maven/surefire/its/AdditionalClasspathIT.java | 8 ++-
.../maven/surefire/its/AggregateReportIT.java | 15 ++--
.../org/apache/maven/surefire/its/ArgLineIT.java | 8 ++-
.../maven/surefire/its/CheckSingleTestIT.java | 22 ++++---
.../its/CheckTestFailIfNoTestsForkModeIT.java | 23 ++++--
.../surefire/its/CheckTestFailIfNoTestsIT.java | 19 +++--
.../its/CheckTestNgBeforeMethodFailureIT.java | 8 ++-
.../surefire/its/CheckTestNgBeforeMethodIT.java | 8 ++-
.../its/CheckTestNgGroupThreadParallelIT.java | 8 ++-
.../maven/surefire/its/CheckTestNgJdk14IT.java | 13 ++--
.../its/CheckTestNgListenerReporterIT.java | 8 ++-
.../surefire/its/CheckTestNgPathWithSpacesIT.java | 8 ++-
.../surefire/its/CheckTestNgReportTestIT.java | 8 ++-
.../maven/surefire/its/CheckTestNgSuiteXmlIT.java | 11 ++-
.../surefire/its/CheckTestNgSuiteXmlSingleIT.java | 8 ++-
.../maven/surefire/its/CheckTestNgVersionsIT.java | 30 +++++++--
.../maven/surefire/its/ClassPathOrderIT.java | 8 ++-
.../maven/surefire/its/ClasspathFilteringIT.java | 8 ++-
.../surefire/its/ClasspathScopeFilteringIT.java | 8 ++-
.../apache/maven/surefire/its/ConsoleOutputIT.java | 8 ++-
.../maven/surefire/its/CrashDetectionIT.java | 14 +++--
.../maven/surefire/its/DefaultConfigurationIT.java | 8 ++-
.../maven/surefire/its/EnvironmentVariableIT.java | 8 ++-
.../maven/surefire/its/ForkConsoleOutputIT.java | 28 +++++---
.../its/ForkConsoleOutputWithErrorsIT.java | 8 ++-
.../org/apache/maven/surefire/its/ForkModeIT.java | 25 ++++++--
.../surefire/its/IncludesExcludesFromFileIT.java | 31 +++++---
.../maven/surefire/its/IncludesExcludesIT.java | 9 ++-
.../maven/surefire/its/JUnit44HamcrestIT.java | 6 +-
.../surefire/its/JUnit47RedirectOutputIT.java | 13 +++-
.../surefire/its/JUnit48TestCategoriesIT.java | 26 +++++---
.../its/JUnit4ForkAlwaysStaticInitPollutionIT.java | 6 +-
.../maven/surefire/its/JUnit4RunListenerIT.java | 12 ++--
.../org/apache/maven/surefire/its/JUnitDepIT.java | 9 ++-
.../maven/surefire/its/Junit47concurrencyIT.java | 6 +-
.../apache/maven/surefire/its/Junit4IgnoreIT.java | 7 ++-
.../maven/surefire/its/Junit4VersionsIT.java | 19 +++--
.../surefire/its/NoRunnableTestsInClassIT.java | 6 +-
.../surefire/its/PlainOldJavaClasspathIT.java | 6 +-
.../maven/surefire/its/PlexusConflictIT.java | 7 ++-
.../apache/maven/surefire/its/PojoSimpleIT.java | 6 +-
.../org/apache/maven/surefire/its/ReportersIT.java | 6 +-
.../maven/surefire/its/ResultCountingIT.java | 11 ++-
.../org/apache/maven/surefire/its/RunOrderIT.java | 9 ++-
.../maven/surefire/its/SiblingAggregatorIT.java | 6 +-
.../maven/surefire/its/SystemPropertiesTestIT.java | 7 ++-
.../maven/surefire/its/TestMethodPatternIT.java | 10 ++-
.../maven/surefire/its/TestMultipleMethodsIT.java | 7 ++-
.../its/TestNgParallelWithAnnotationsIT.java | 6 +-
.../maven/surefire/its/TestSingleMethodIT.java | 10 ++-
.../maven/surefire/its/TimeoutForkedTestIT.java | 6 +-
.../apache/maven/surefire/its/TwoTestCasesIT.java | 15 +++--
.../org/apache/maven/surefire/its/UmlautDirIT.java | 7 ++-
.../surefire/its/UseIsolatedClassLoaderIT.java | 6 +-
.../maven/surefire/its/WorkingDirectoryIT.java | 16 +++--
.../its/WorkingDirectoryIsInvalidPropertyIT.java | 6 +-
.../surefire/its/WorkingDirectoryMissingIT.java | 7 +-
.../maven/surefire/its/XmlReporterRunTimeIT.java | 14 +++--
.../its/fixture/SurefireIntegrationTestCase.java | 53 ---------------
.../its/jiras/Surefire146ForkPerTestNoSetupIT.java | 6 +-
.../its/jiras/Surefire162CharsetProviderIT.java | 9 +--
.../jiras/Surefire224WellFormedXmlFailuresIT.java | 14 +++-
.../its/jiras/Surefire257NotRerunningTestsIT.java | 8 ++-
.../jiras/Surefire260TestWithIdenticalNamesIT.java | 13 ++--
.../its/jiras/Surefire34SecurityManagerIT.java | 7 ++-
.../Surefire376TestNgAfterSuiteFailureIT.java | 6 +-
.../jiras/Surefire377TestNgAndJUnitTogetherIT.java | 6 +-
.../Surefire408ManualProviderSelectionIT.java | 6 +-
.../jiras/Surefire42NotExtendingTestCaseIT.java | 6 +-
.../its/jiras/Surefire44InnerClassTestIT.java | 6 +-
.../its/jiras/Surefire500PuzzlingErrorIT.java | 6 +-
.../jiras/Surefire510TestClassPathForkModesIT.java | 7 ++-
.../Surefire570MultipleReportDirectoriesIT.java | 10 ++--
.../jiras/Surefire613TestCountInParallelIT.java | 8 ++-
.../Surefire621TestCountingJunit3InParallelIT.java | 6 +-
...efire628ConsoleOutputBeforeAndAfterClassIT.java | 6 +-
...fire634UnsettableSystemPropertiesWarningIT.java | 6 +-
.../surefire/its/jiras/Surefire673MockitoIT.java | 6 +-
.../jiras/Surefire674BuildFailingWhenErrorsIT.java | 6 +-
...urefire674BuildFailingWhenFailsafeErrorsIT.java | 6 +-
.../jiras/Surefire685CommaSeparatedIncludesIT.java | 6 +-
.../its/jiras/Surefire697NiceSummaryIT.java | 6 +-
.../jiras/Surefire705ParallelForkTimeoutIT.java | 6 +-
.../jiras/Surefire733AllOverrridesCapturedIT.java | 6 +-
.../its/jiras/Surefire740TruncatedCommaIT.java | 8 ++-
.../Surefire747MethodParallelWithSuiteCountIT.java | 7 ++-
.../jiras/Surefire763EnvironmentForkModeIT.java | 7 ++-
.../its/jiras/Surefire772BothReportsIT.java | 15 +++--
.../its/jiras/Surefire772NoFailsafeReportsIT.java | 15 +++--
.../its/jiras/Surefire772NoSurefireReportsIT.java | 12 +++-
.../its/jiras/Surefire772SpecifiedReportsIT.java | 14 +++--
.../Surefire801ForkModeNoneClassLoaderIT.java | 6 +-
.../its/jiras/Surefire803MultiFailsafeExecsIT.java | 7 ++-
.../its/jiras/Surefire812Log4JClassLoaderIT.java | 6 +-
.../its/jiras/Surefire818NpeIgnoresTestsIT.java | 6 +-
.../its/jiras/Surefire828EmptyGroupExprIT.java | 9 ++-
.../its/jiras/Surefire832ProviderSelectionIT.java | 6 +-
.../its/jiras/Surefire847AdditionalFailureIT.java | 6 +-
.../jiras/Surefire926FailureWith2ProvidersIT.java | 6 +-
100 files changed, 632 insertions(+), 384 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
index ee84d45..0260ba0 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test files with "Abstract" in their name that aren't really abstract,
@@ -29,10 +30,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class AbstractTestCaseIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
-
- public void testAbstractTestCase()
+ @Test
+ public void abstractTestCase()
{
unpack( "/default-configuration-abstract" ).executeTest().verifyErrorFree( 1 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
index c9f5cfb..0819196 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test additionalClasspathElements
@@ -28,9 +29,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class AdditionalClasspathIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testAdditionalClasspath()
+ @Test
+ public void additionalClasspath()
{
unpack( "/additional-classpath" ).executeTest().verifyErrorFree( 1 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
index b747165..ee167df 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
@@ -20,11 +20,11 @@ package org.apache.maven.surefire.its;
*/
import java.io.File;
-import org.apache.maven.surefire.its.fixture.HelperAssertions;
-import org.apache.maven.surefire.its.fixture.IntegrationTestSuiteResults;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.TestFile;
+
+import org.apache.maven.surefire.its.fixture.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
/**
* Test report aggregation
@@ -33,10 +33,11 @@ import org.apache.maven.surefire.its.fixture.TestFile;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class AggregateReportIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testAggregateReport()
+ @Test
+ public void aggregateReport()
{
final OutputValidator outputValidator =
unpack( "/aggregate-report" ).addSurefireReportGoal().executeCurrentGoals();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
index 36d0d9e..c1ad8f7 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test passing an argLine parameter
@@ -28,9 +29,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class ArgLineIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testArgLine()
+ @Test
+ public void argLine()
{
unpack( "/argLine-parameter" ).executeTest().verifyErrorFree( 1 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
index 4958937..85d0f95 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
@@ -19,10 +19,10 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.TestFile;
+import org.apache.maven.surefire.its.fixture.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
/**
* Test running a single test with -Dtest=BasicTest
@@ -31,26 +31,30 @@ import org.apache.maven.surefire.its.fixture.TestFile;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckSingleTestIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testSingleTest()
+ @Test
+ public void singleTest()
{
unpack().setTestToRun( "BasicTest" ).executeTest().verifyErrorFree( 1 );
}
- public void testSingleTestDotJava()
+ @Test
+ public void singleTestDotJava()
{
unpack().setTestToRun( "BasicTest.java" ).executeTest().verifyErrorFree( 1 );
}
- public void testSingleTestNonExistent()
+ @Test
+ public void singleTestNonExistent()
{
final OutputValidator output = unpack().setTestToRun( "DoesNotExist" ).maven().withFailure().executeTest();
TestFile reportsDir = output.getTargetFile( "surefire-reports" );
assertFalse( "Unexpected reports directory", reportsDir.exists() );
}
- public void testSingleTestNonExistentOverride()
+ @Test
+ public void singleTestNonExistentOverride()
{
final OutputValidator output =
unpack().setTestToRun( "DoesNotExist" ).failIfNoTests( false ).executeTest().verifyErrorFreeLog();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
index f6710ed..6e2a67a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
@@ -19,8 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
/**
* Test failIfNoTests with various forkModes.
@@ -29,34 +30,40 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestFailIfNoTestsForkModeIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testFailIfNoTestsForkModeAlways()
+ @Test
+ public void failIfNoTestsForkModeAlways()
{
unpack().forkAlways().failIfNoTests( true ).maven().withFailure().executeTest();
}
- public void testFailIfNoTestsForkModeNever()
+ @Test
+ public void failIfNoTestsForkModeNever()
{
unpack().forkNever().failIfNoTests( true ).maven().withFailure().executeTest();
}
- public void testFailIfNoTestsForkModeOnce()
+ @Test
+ public void failIfNoTestsForkModeOnce()
{
unpack().forkOnce().failIfNoTests( true ).maven().withFailure().executeTest();
}
- public void testDontFailIfNoTestsForkModeAlways()
+ @Test
+ public void dontFailIfNoTestsForkModeAlways()
{
doTest( unpack().forkAlways().failIfNoTests( false ) );
}
- public void testDontFailIfNoTestsForkModeNever()
+ @Test
+ public void dontFailIfNoTestsForkModeNever()
{
doTest( unpack().forkNever().failIfNoTests( false ) );
}
- public void testDontFailIfNoTestsForkModeOnce()
+ @Test
+ public void dontFailIfNoTestsForkModeOnce()
{
doTest( unpack().forkOnce().failIfNoTests( false ) );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
index c36d6c5..787037c 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
@@ -19,10 +19,10 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.TestFile;
+import org.apache.maven.surefire.its.fixture.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
/**
* Test failIfNoTests
@@ -31,19 +31,21 @@ import org.apache.maven.surefire.its.fixture.TestFile;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestFailIfNoTestsIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
private SurefireLauncher unpack()
{
return unpack( "/default-configuration-noTests" );
}
- public void testFailIfNoTests()
+ @Test
+ public void failIfNoTests()
{
unpack().failIfNoTests( true ).maven().withFailure().executeTest();
}
- public void testDontFailIfNoTests()
+ @Test
+ public void dontFailIfNoTests()
{
final OutputValidator outputValidator = unpack().failIfNoTests( false ).executeTest();
outputValidator.verifyErrorFreeLog();
@@ -51,7 +53,8 @@ public class CheckTestFailIfNoTestsIT
assertFalse( "Unexpected reports directory", reportsDir.exists() );
}
- public void test48CategoriesFailWhenNoTests()
+ @Test
+ public void jUnit48CategoriesFailWhenNoTests()
{
unpack().failIfNoTests( false ).activateProfile( "junit47" ).setJUnitVersion(
"4.8.1" ).executeTest().verifyErrorFreeLog();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
index ea40e1e..9e9d688 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test failures in @BeforeMethod annotation on TestNg suite
@@ -28,10 +29,11 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgBeforeMethodFailureIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testTestNgBeforeMethodFailure()
+ @Test
+ public void TestNgBeforeMethodFailure()
throws Exception
{
unpack( "/testng-beforeMethodFailure" ).maven().withFailure().executeTest().assertTestSuiteResults( 2, 0, 1, 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
index c86ab1b..ab25279 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test @BeforeMethod annotation on TestNg suite
@@ -28,9 +29,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgBeforeMethodIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testTestNgBeforeMethod()
+ @Test
+ public void TestNgBeforeMethod()
throws Exception
{
unpack( "/testng-beforeMethod" ).executeTest().verifyErrorFree( 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
index a7bdddb..36ef57e 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test TestNG groups, together with TestNG parallelism
@@ -28,9 +29,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgGroupThreadParallelIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testTestNgGroupThreadParallel()
+ @Test
+ public void TestNgGroupThreadParallel()
{
unpack( "testng-group-thread-parallel" ).executeTest().verifyErrorFree( 3 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
index 9be6a18..9cabd7e 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test TestNG running in the JDK 1.4 JavaDoc style
@@ -27,15 +28,11 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgJdk14IT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public CheckTestNgJdk14IT()
- {
- unpack( "/testng-jdk14" );
- }
-
- public void testTestNgJdk14()
+ @Test
+ public void TestNgJdk14()
throws Exception
{
unpack( "/testng-jdk14" ).executeTest().verifyErrorFree( 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
index d7a20fc..af46906 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
@@ -19,8 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
/**
* Test simple TestNG listener and reporter
@@ -29,9 +30,10 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgListenerReporterIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testTestNgListenerReporter()
+ @Test
+ public void TestNgListenerReporter()
{
final SurefireLauncher verifierStarter = unpack( "testng-listener-reporter" );
verifierStarter.executeTest().verifyErrorFree( 1 ).getTargetFile(
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
index fcb8798..bf713d3 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test TestNG test in a directory with spaces
@@ -27,9 +28,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgPathWithSpacesIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testTestNgTestWithSpaces()
+ @Test
+ public void TestWithSpaces()
{
unpack( "testng-path with spaces" ).executeTest().verifyErrorFree( 1 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
index 83e580a..6453003 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
@@ -20,7 +20,8 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test surefire-report on TestNG test
@@ -28,9 +29,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgReportTestIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testTestNgReport()
+ @Test
+ public void testNgReport()
throws Exception
{
final OutputValidator outputValidator =
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
index 6702b7e..d0d30bc 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
@@ -19,8 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
/**
* Test simple TestNG suite XML file
@@ -28,14 +29,16 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgSuiteXmlIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testTestNgSuiteXml()
+ @Test
+ public void suiteXml()
{
unpack().executeTest().verifyErrorFree( 1 );
}
- public void testTestNgSuiteXmlForkModeAlways()
+ @Test
+ public void suiteXmlForkModeAlways()
{
unpack().forkAlways().executeTest().verifyErrorFree( 1 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
index 3d600fb..903c14a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Use -Dtest to run a single TestNG test, overriding the suite XML parameter.
@@ -27,9 +28,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgSuiteXmlSingleIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testTestNGSuite()
+ @Test
+ public void TestNgSuite()
{
unpack( "/testng-twoTestCaseSuite" ).setTestToRun( "TestNGTestTwo" ).executeTest().verifyErrorFree( 1 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
index 707e31e..025b455 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
@@ -20,7 +20,9 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Ignore;
+import org.junit.Test;
/**
* Basic suite test using all known versions of TestNG. Used for regression testing Surefire against old versions.
@@ -31,120 +33,138 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgVersionsIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void test47()
throws Exception
{
runTestNgTest( "4.7" );
}
- // DGF SUREFIRE-375 + MAVENUPLOAD-1024
- // The 5.0 and 5.0.1 jars on central are malformed
-
+ @Test
+ @Ignore("5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024")
public void XXXtest50()
throws Exception
{
runTestNgTest( "5.0" );
}
+ @Test
+ @Ignore("5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024")
public void XXXtest501()
throws Exception
{
runTestNgTest( "5.0.1" );
}
+ @Test
public void test502()
throws Exception
{
runTestNgTest( "5.0.2" );
}
+ @Test
public void test51()
throws Exception
{
runTestNgTest( "5.1" );
}
+ @Test
public void test55()
throws Exception
{
runTestNgTest( "5.5" );
}
+ @Test
public void test56()
throws Exception
{
runTestNgTest( "5.6" );
}
+ @Test
public void test57()
throws Exception
{
runTestNgTest( "5.7" );
}
+ @Test
public void test58()
throws Exception
{
runTestNgTest( "5.8" );
}
+ @Test
public void test59()
throws Exception
{
runTestNgTest( "5.9" );
}
+ @Test
public void test510()
throws Exception
{
runTestNgTest( "5.10" );
}
+ @Test
public void test511()
throws Exception
{
runTestNgTest( "5.11" );
}
+ @Test
public void test512()
throws Exception
{
runTestNgTest( "5.12.1" );
}
+ @Test
public void test513()
throws Exception
{
runTestNgTest( "5.13" );
}
+ @Test
public void test5131()
throws Exception
{
runTestNgTest( "5.13.1" );
}
+ @Test
public void test514()
throws Exception
{
runTestNgTest( "5.14" );
}
+ @Test
public void test5141()
throws Exception
{
runTestNgTest( "5.14.1" );
}
+ @Test
public void test5142()
throws Exception
{
runTestNgTest( "5.14.2" );
}
+ @Test
public void test60()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
index ecb53b1..dfea90a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test for checking the order of class path elements
@@ -28,9 +29,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class ClassPathOrderIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testClassPathOrder()
+ @Test
+ public void classPathOrder()
{
unpack( "/classpath-order" ).executeTest().verifyErrorFree( 2 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
index 86817b8..89aada7 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test additionalClasspathElements
@@ -27,9 +28,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author pgier
*/
public class ClasspathFilteringIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testAdditionalClasspath()
+ @Test
+ public void additionalClasspath()
throws Exception
{
unpack( "classpath-filtering" ).debugLogging().executeTest().verifyErrorFree( 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
index be766cc..ca64d87 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test additionalClasspathElements
@@ -28,9 +29,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class ClasspathScopeFilteringIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testAdditionalClasspath()
+ @Test
+ public void additionalClasspath()
{
unpack( "classpath-scope-filtering" ).executeTest().verifyErrorFree( 1 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
index 9b4b048..36d1ff5 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
@@ -20,8 +20,9 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
/**
* Basic suite test using all known versions of JUnit 4.x
@@ -29,9 +30,10 @@ import org.apache.maven.surefire.its.fixture.TestFile;
* @author Kristian Rosenvold
*/
public class ConsoleOutputIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testProperNewlines()
+ @Test
+ public void properNewlines()
{
final OutputValidator outputValidator =
unpack( "/consoleOutput" ).redirectToFile( true ).setJUnitVersion( "4.7" ).executeTest();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java
index 88e50f6..90c4630 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java
@@ -19,25 +19,29 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CrashDetectionIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testCrashInFork()
+ @Test
+ public void crashInFork()
{
unpack( "crash-detection" ).maven().withFailure().executeTest();
}
- public void testCrashInReusableFork()
+ @Test
+ public void crashInReusableFork()
{
unpack( "crash-detection" ).forkOncePerThread().threadCount( 1 ).maven().withFailure().executeTest();
}
- public void testHardCrashInReusableFork()
+ @Test
+ public void hardCrashInReusableFork()
{
unpack( "crash-detection" ).forkOncePerThread().threadCount( 1 ).addGoal( "-DkillHard=true" ).maven().withFailure().executeTest();
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
index 61e4cfc..b0907b8 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test basic default configuration, runs the JUnit 3 test in the src/test directory.
@@ -27,9 +28,10 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class DefaultConfigurationIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testDefaultConfiguration()
+ @Test
+ public void defaultConfiguration()
{
executeErrorFreeTest( "default-configuration", 1 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
index f68f558..7f38a73 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test basic default configuration, runs the JUnit 3 test in the src/test directory.
@@ -27,10 +28,11 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class EnvironmentVariableIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testEnvironmentVariable()
+ @Test
+ public void environmentVariable()
{
executeErrorFreeTest( "junit44-environment", 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
index 2fc0fcf..7ec0039 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
@@ -20,8 +20,9 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
/**
* Asserts proper behaviour of console output when forking
@@ -31,37 +32,40 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* @author Kristian Rosenvold
*/
public class ForkConsoleOutputIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
-
- private SurefireLauncher unpack()
- {
- return unpack( "/fork-consoleOutput" );
- }
-
- public void testPrintSummaryTrueWithRedirect()
+ @Test
+ public void printSummaryTrueWithRedirect()
{
final OutputValidator outputValidator = unpack().redirectToFile( true ).printSummary( true ).executeTest();
outputValidator.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ).assertFileExists();
}
- public void testPrintSummaryTrueWithoutRedirect()
+ @Test
+ public void printSummaryTrueWithoutRedirect()
{
final OutputValidator outputValidator = unpack().redirectToFile( false ).printSummary( true ).executeTest();
outputValidator.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ).assertFileNotExists();
}
- public void testPrintSummaryFalseWithRedirect()
+ @Test
+ public void printSummaryFalseWithRedirect()
{
final OutputValidator outputValidator =
unpack().redirectToFile( true ).printSummary( false ).debugLogging().showErrorStackTraces().executeTest();
outputValidator.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ).assertFileExists();
}
- public void testPrintSummaryFalseWithoutRedirect()
+ @Test
+ public void printSummaryFalseWithoutRedirect()
{
final OutputValidator outputValidator = unpack().redirectToFile( false ).printSummary( false ).executeTest();
outputValidator.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ).assertFileNotExists();
}
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/fork-consoleOutput" );
+ }
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
index fa32bee..8652512 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
@@ -20,8 +20,9 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
/**
* Asserts proper behaviour of console output when forking
@@ -31,9 +32,10 @@ import org.apache.maven.surefire.its.fixture.TestFile;
* @author Kristian Rosenvold
*/
public class ForkConsoleOutputWithErrorsIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public void testXmlFileContainsConsoleOutput()
+ @Test
+ public void xmlFileContainsConsoleOutput()
{
final OutputValidator outputValidator = unpack( "/fork-consoleOutputWithErrors" ).
failNever().redirectToFile( true ).executeTest();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
index 1077f4f..e3f3c05 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
@@ -23,10 +23,13 @@ import java.lang.management.ManagementFactory;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.TestFile;
+
+import org.apache.maven.surefire.its.fixture.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
/**
* Test forkMode
@@ -34,8 +37,9 @@ import org.apache.maven.surefire.its.fixture.TestFile;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class ForkModeIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void testForkModeAlways()
{
String[] pids = doTest( unpack( getProject() ).setForkJvm( true ).forkAlways() );
@@ -44,6 +48,7 @@ public class ForkModeIT
assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMyPID() ) );
}
+ @Test
public void testForkModePerTest()
{
String[] pids = doTest( unpack( getProject() ).setForkJvm( true ).forkPerTest() );
@@ -52,6 +57,7 @@ public class ForkModeIT
assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMyPID() ) );
}
+ @Test
public void testForkModeNever()
{
String[] pids = doTest( unpack( getProject() ).forkNever() );
@@ -60,6 +66,7 @@ public class ForkModeIT
assertEquals( "my pid is equal to pid 1 of the test", getMyPID(), pids[0] );
}
+ @Test
public void testForkModeNone()
{
String[] pids = doTest( unpack( getProject() ).forkMode( "none" ) );
@@ -68,6 +75,7 @@ public class ForkModeIT
assertEquals( "my pid is equal to pid 1 of the test", getMyPID(), pids[0] );
}
+ @Test
public void testForkModeOncePerThreadSingleThread()
{
String[] pids = doTest( unpack( getProject() ).setForkJvm( true ).forkOncePerThread().threadCount( 1 ) );
@@ -76,6 +84,7 @@ public class ForkModeIT
assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMyPID() ) );
}
+ @Test
public void testForkModeOncePerThreadTwoThreads()
{
String[] pids = doTest( unpack( getProject() ).forkOncePerThread().threadCount( 2 ).addGoal( "-DsleepLength=1200" ) );
@@ -83,6 +92,7 @@ public class ForkModeIT
assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMyPID() ) );
}
+ @Test
public void testForkCountZero()
{
String[] pids = doTest( unpack( getProject() ).forkCount( 0 ) );
@@ -91,6 +101,7 @@ public class ForkModeIT
assertEquals( "my pid is equal to pid 1 of the test", getMyPID(), pids[0] );
}
+ @Test
public void testForkCountOneNoReuse()
{
String[] pids = doTest( unpack( getProject() ).setForkJvm( true ).forkCount( 1 ).reuseForks( false ) );
@@ -99,6 +110,7 @@ public class ForkModeIT
assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMyPID() ) );
}
+ @Test
public void testForkCountOneReuse()
{
String[] pids = doTest( unpack( getProject() ).setForkJvm( true ).forkCount( 1 ).reuseForks( true ) );
@@ -107,6 +119,7 @@ public class ForkModeIT
assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMyPID() ) );
}
+ @Test
public void testForkCountTwoNoReuse()
{
String[] pids = doTest( unpack( getProject() ).forkCount( 2 ).reuseForks( false ).addGoal( "-DsleepLength=1200" ) );
@@ -114,6 +127,7 @@ public class ForkModeIT
assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMyPID() ) );
}
+ @Test
public void testForkCountTwoReuse()
{
String[] pids = doTest( unpack( getProject() ).forkCount( 2 ).reuseForks( true ).addGoal( "-DsleepLength=1200" ) );
@@ -139,6 +153,7 @@ public class ForkModeIT
assertEquals( "number of different pids is not as expected", numOfDifferentPids, pidSet.size() );
}
+ @Test
public void testForkModeOnce()
{
String[] pids = doTest( unpack( getProject() ).forkOnce() );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
index 4895422..58d270a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
@@ -20,8 +20,9 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
/**
* Test include/exclude from files.
@@ -29,52 +30,58 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* Based on {@link IncludesExcludesIT}.
*/
public class IncludesExcludesFromFileIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
private SurefireLauncher unpack()
{
return unpack( "/includes-excludes-from-file" );
}
+ @Test
public void testSimple()
{
testWithProfile( "simple" );
}
+ @Test
public void testSimpleMixed()
{
testWithProfile( "simple-mixed" );
}
+ @Test
public void testRegex()
{
testWithProfile( "regex" );
}
+ @Test
public void testPath()
{
testWithProfile( "path" );
}
- private void testWithProfile( String profile )
- {
- final OutputValidator outputValidator = unpack().
- activateProfile( profile ).executeTest().verifyErrorFree( 2 );
-
- outputValidator.getTargetFile( "testTouchFile.txt" ).assertFileExists();
- outputValidator.getTargetFile( "defaultTestTouchFile.txt" ).assertFileExists();
- }
-
+ @Test
public void testMissingExcludes()
{
- expectBuildFailure( "missing-excludes-file", "Failed to load list from file", "no-such-excludes-file" );
+ expectBuildFailure("missing-excludes-file", "Failed to load list from file", "no-such-excludes-file");
}
+ @Test
public void testMissingIncludes()
{
expectBuildFailure( "missing-includes-file", "Failed to load list from file", "no-such-includes-file" );
}
+ private void testWithProfile( String profile )
+ {
+ final OutputValidator outputValidator = unpack().
+ activateProfile( profile ).executeTest().verifyErrorFree( 2 );
+
+ outputValidator.getTargetFile( "testTouchFile.txt" ).assertFileExists();
+ outputValidator.getTargetFile( "defaultTestTouchFile.txt" ).assertFileExists();
+ }
+
private void expectBuildFailure( final String profile, final String... messages )
{
final OutputValidator outputValidator = unpack().activateProfile( profile )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
index c884ade..46bdeb6 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
@@ -20,8 +20,9 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
/**
* Test include/exclude patterns.
@@ -29,7 +30,7 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* @author Benjamin Bentmann
*/
public class IncludesExcludesIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
private SurefireLauncher unpack()
{
@@ -39,16 +40,19 @@ public class IncludesExcludesIT
/**
* Test surefire inclusions/exclusions
*/
+ @Test
public void testIncludesExcludes()
{
testWithProfile( "simple" );
}
+ @Test
public void testRegexIncludesExcludes()
{
testWithProfile( "regex" );
}
+ @Test
public void testPathBasedIncludesExcludes()
{
testWithProfile( "path" );
@@ -61,5 +65,4 @@ public class IncludesExcludesIT
outputValidator.getTargetFile( "testTouchFile.txt" ).assertFileExists();
outputValidator.getTargetFile( "defaultTestTouchFile.txt" ).assertFileExists();
}
-
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
index 80b597d..7bf90f0 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test project using JUnit4.4 (including Hamcrest extensions)
@@ -27,8 +28,9 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class JUnit44HamcrestIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void testJUnit44Hamcrest()
{
executeErrorFreeTest( "junit44-hamcrest", 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
index f4e41fa..aa38dac 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
@@ -19,15 +19,21 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import java.io.IOException;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
public class JUnit47RedirectOutputIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void testPrintSummaryTrueWithRedirect()
throws Exception
{
@@ -35,6 +41,7 @@ public class JUnit47RedirectOutputIT
checkReports( clean );
}
+ @Test
public void testClassesParallel()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
index d60aa8c..70b614f 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
@@ -19,10 +19,12 @@ 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.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import java.io.IOException;
/**
* Test project using "groups" support
@@ -31,8 +33,9 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class JUnit48TestCategoriesIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void testCategoriesAB()
throws Exception
{
@@ -40,25 +43,28 @@ public class JUnit48TestCategoriesIT
}
+ @Test
public void testCategoriesABForkAlways()
throws Exception
{
runAB( unpacked() );
}
- private void runAB( SurefireLauncher unpacked )
- throws VerificationException
- {
- unpacked.executeTest().verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 ).verifyTextInLog(
- "catA: 1" ).verifyTextInLog( "catB: 1" ).verifyTextInLog( "catC: 0" ).verifyTextInLog( "catNone: 0" );
- }
-
+ @Test
public void testCategoriesAC()
throws Exception
{
runAC( unpacked() );
}
+ private void runAB( SurefireLauncher unpacked )
+ throws VerificationException
+ {
+ unpacked.executeTest().verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 ).verifyTextInLog(
+ "catA: 1" ).verifyTextInLog( "catB: 1" ).verifyTextInLog( "catC: 0" ).verifyTextInLog( "catNone: 0" );
+ }
+
+ @Test
public void testCategoriesACForkAlways()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
index 1cfa910..19b937d 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test JUnit 4 tests marked with "Ignore" attribute
@@ -27,8 +28,9 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class JUnit4ForkAlwaysStaticInitPollutionIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void testJunit4Ignore()
{
executeErrorFreeTest( "junit4-forkAlways-staticInit", 2 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
index c315b31..433863e 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
@@ -20,8 +20,9 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
/**
* JUnit4 RunListener Integration Test.
@@ -29,18 +30,14 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
*/
public class JUnit4RunListenerIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public JUnit4RunListenerIT()
- {
- unpack();
- }
-
private SurefireLauncher unpack()
{
return unpack( "/junit4-runlistener" );
}
+ @Test
public void testJUnit4RunListener()
throws Exception
{
@@ -52,6 +49,7 @@ public class JUnit4RunListenerIT
outputValidator.verifyTextInLog( "testRunFinished org.junit.runner.Result" );
}
+ @Test
public void testRunlistenerJunitCoreProvider()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
index 0744d56..0757a17 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
@@ -19,8 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
/**
* Test project using JUnit4.4 -dep. junit-dep includes only junit.* classes, and depends explicitly on hamcrest-core
@@ -28,13 +29,14 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class JUnitDepIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
public SurefireLauncher unpack()
{
return unpack( "/junit44-dep" );
}
+ @Test
public void testJUnit44Dep()
throws Exception
{
@@ -42,6 +44,7 @@ public class JUnitDepIT
"surefire-junit4" ); // Ahem. Will match on the 4.7 provider too
}
+ @Test
public void testJUnit44DepWithSneaky381()
throws Exception
{
@@ -49,6 +52,7 @@ public class JUnitDepIT
"provided381" ).executeTest().verifyErrorFree( 1 );
}
+ @Test
public void testJUnit47Dep()
throws Exception
{
@@ -56,6 +60,7 @@ public class JUnitDepIT
"surefire-junit47" );
}
+ @Test
public void testJUnit48Dep()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
index 6c7a3f0..ba3ecf5 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Basic suite test using all known versions of JUnit 4.x
@@ -27,8 +28,9 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author Kristian Rosenvold
*/
public class Junit47concurrencyIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void test47()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
index 781cdfb..0e050ce 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
@@ -19,8 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
/**
* Test JUnit 4 tests marked with "Ignore" attribute
@@ -28,14 +29,16 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Junit4IgnoreIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void testJunit4Ignore()
{
// Todo: Support assumption failure == ignore for junit4
unpack().executeTest().verifyErrorFreeLog().assertTestSuiteResults( 7, 0, 0, 6 );
}
+ @Test
public void testJunit47ParallelIgnore()
{
unpack().setJUnitVersion( "4.8.1" ).parallelClasses().executeTest().verifyErrorFreeLog().assertTestSuiteResults(
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
index eac579e..cf82e64 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
@@ -19,8 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
/**
* Basic suite test using all known versions of JUnit 4.x
@@ -28,67 +29,71 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Junit4VersionsIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
- public Junit4VersionsIT()
- {
- unpack();
- }
-
private SurefireLauncher unpack()
{
return unpack( "/junit4" );
}
+ @Test
public void test40()
throws Exception
{
runJUnitTest( "4.0" );
}
+ @Test
public void test41()
throws Exception
{
runJUnitTest( "4.1" );
}
+ @Test
public void test42()
throws Exception
{
runJUnitTest( "4.2" );
}
+ @Test
public void test43()
throws Exception
{
runJUnitTest( "4.3" );
}
+ @Test
public void test431()
throws Exception
{
runJUnitTest( "4.3.1" );
}
+ @Test
public void test44()
throws Exception
{
runJUnitTest( "4.4" );
}
+ @Test
public void test45()
throws Exception
{
runJUnitTest( "4.5" );
}
+ @Test
public void test46()
throws Exception
{
runJUnitTest( "4.6" );
}
+ @Test
public void test47()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
index 67457a8..1be88b7 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
@@ -27,8 +28,9 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author Kristian Rosenvold
*/
public class NoRunnableTestsInClassIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void testJunit3ParallelBuildResultCount()
{
unpack( "norunnableTests" ).failNever().executeTest().verifyTextInLog(
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
index 7bbca3c..71bccd6 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test useManifestOnlyJar option
@@ -27,8 +28,9 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class PlainOldJavaClasspathIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void testPlainOldJavaClasspath()
{
executeErrorFreeTest( "plain-old-java-classpath", 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
index f0ee92e..bec3e99 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
@@ -19,8 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
/**
* Test library using a conflicting version of plexus-utils
@@ -28,13 +29,15 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class PlexusConflictIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void testPlexusConflict()
{
unpack().executeTest().verifyErrorFree( 1 );
}
+ @Test
public void testPlexusConflictIsolatedClassLoader()
{
unpack().useSystemClassLoader(false).executeTest().verifyErrorFree( 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
index bda3cf1..03902ef 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Test support for POJO tests.
@@ -27,8 +28,9 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author Benjamin Bentmann
*/
public class PojoSimpleIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void testit()
{
unpack( "pojo-simple" ).executeTest().assertTestSuiteResults( 2, 0, 1, 0 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
index b6342c1..701342f 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
@@ -20,7 +20,8 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
/**
* Asserts proper behaviour of console output when forking
@@ -29,8 +30,9 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
* @author Kristian Rosenvold
*/
public class ReportersIT
- extends SurefireIntegrationTestCase
+ extends SurefireJUnit4IntegrationTestCase
{
+ @Test
public void testRedirectOutputTestNg()
{
OutputValidator reporters = unpack( "reporters" ).redirectToFile( true ).printSummary( true ).executeTest();