http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java index fc49322..065ec19 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java @@ -19,14 +19,16 @@ package org.apache.maven.surefire.its.jiras; * under the License. */ -import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase; +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.junit.Test; /** * @author Kristian Rosenvold */ public class Surefire812Log4JClassLoaderIT - extends SurefireIntegrationTestCase + extends SurefireJUnit4IntegrationTestCase { + @Test public void testJunit3ParallelBuildResultCount() { executeErrorFreeTest( "surefire-812-log4j-classloader", 1 );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java index 0fa1692..1bf4c8d 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java @@ -19,7 +19,8 @@ package org.apache.maven.surefire.its.jiras; * under the License. */ -import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase; +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.junit.Test; /** * SUREFIRE-818 @@ -27,8 +28,9 @@ import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase; * @author Kristian Rosenvold */ public class Surefire818NpeIgnoresTestsIT - extends SurefireIntegrationTestCase + extends SurefireJUnit4IntegrationTestCase { + @Test public void testBuildFailingWhenErrors() { unpack( "surefire-818-ignored-tests-on-npe" ).maven().withFailure().executeTest().assertTestSuiteResults( 2, 0, http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java index 5fd6a13..b59bc6a 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java @@ -19,13 +19,15 @@ package org.apache.maven.surefire.its.jiras; */ 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; public class Surefire828EmptyGroupExprIT - extends SurefireIntegrationTestCase + extends SurefireJUnit4IntegrationTestCase { // !CategoryC + @Test public void testJUnitRunEmptyGroups() { OutputValidator validator = unpackJUnit().sysProp( "profile", "emptyGroups" ).executeTest(); @@ -39,6 +41,7 @@ public class Surefire828EmptyGroupExprIT } // CategoryA && CategoryB + @Test public void testJUnitRunEmptyExcludeGroups() { OutputValidator validator = unpackJUnit().sysProp( "profile", "emptyExcludedGroups" ).executeTest(); @@ -54,6 +57,7 @@ public class Surefire828EmptyGroupExprIT } // CategoryA && CategoryB + @Test public void testTestNGRunEmptyExcludeGroups() { OutputValidator validator = unpackTestNG().sysProp( "profile", "emptyExcludedGroups" ).executeTest(); @@ -64,6 +68,7 @@ public class Surefire828EmptyGroupExprIT } // !CategoryC + @Test public void testTestNGRunEmptyGroups() { OutputValidator validator = unpackTestNG().sysProp( "profile", "emptyGroups" ).executeTest(); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java index d5b0550..c694a3d 100755 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java @@ -19,12 +19,14 @@ package org.apache.maven.surefire.its.jiras; */ 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; public class Surefire832ProviderSelectionIT - extends SurefireIntegrationTestCase + extends SurefireJUnit4IntegrationTestCase { + @Test public void testJUnitRunCategoryAB() { OutputValidator validator = unpackJUnit().groups( "junit4.CategoryA AND junit4.CategoryB" ).executeTest(); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java index 85d035b..f267ee8 100755 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java @@ -18,11 +18,13 @@ package org.apache.maven.surefire.its.jiras; * under the License. */ -import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase; +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.junit.Test; public class Surefire847AdditionalFailureIT - extends SurefireIntegrationTestCase + extends SurefireJUnit4IntegrationTestCase { + @Test public void testJUnitRunCategoryAB() { unpack( "surefire-847-testngfail" ).setTestToRun( http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/25e8a593/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java index b8b80ee..e6f9dc6 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java @@ -19,14 +19,16 @@ package org.apache.maven.surefire.its.jiras; * under the License. */ -import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase; +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.junit.Test; /** * @author Kristian Rosenvold */ public class Surefire926FailureWith2ProvidersIT - extends SurefireIntegrationTestCase + extends SurefireJUnit4IntegrationTestCase { + @Test public void testBuildFailingWhenErrors() { unpack( "surefire-926-2-provider-failure" ).maven().withFailure().executeTest();
