You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/01/06 16:04:26 UTC
svn commit: r1228222 [3/3] - in
/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its:
./ fixture/ jiras/ misc/
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import java.io.File;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
/**
* SUREFIRE-500 Asserts correct error handling for the "odd" surefire-500 (and 625) issues.
@@ -28,21 +29,12 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire500PuzzlingErrorIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire500PuzzlingErrorIT()
- {
- super( "/surefire-500-puzzling-error" );
- }
-
public void testBuildFailingWhenErrors()
- throws Exception
{
- failNever();
- executeTest();
-
- File surefireReportsFile = getSurefireReportsFile( "surefire500.ExplodingTest.txt" );
- assertContainsText( surefireReportsFile, "java.lang.NoClassDefFoundError: whoops!" );
+ OutputValidator outputValidator = unpack("/surefire-500-puzzling-error").failNever().executeTest();
+ TestFile surefireReportsFile = outputValidator.getSurefireReportsFile("surefire500.ExplodingTest.txt");
+ surefireReportsFile.assertContainsText("java.lang.NoClassDefFoundError: whoops!");
}
-
}
\ No newline at end of file
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire510TestClassPathForkModesIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire510TestClassPathForkModesIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire510TestClassPathForkModesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
@@ -27,27 +28,23 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire510TestClassPathForkModesIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire510TestClassPathForkModesIT()
- {
- super( "/surefire-510-testClassPath" );
- }
-
public void testForkAlways()
- throws Exception
{
- forkAlways();
- execute( "test" );
+ unpack().forkAlways().executeTest().
verifyTextInLog( "tcp is set" );
}
public void testForkOnce()
- throws Exception
{
- forkOnce();
- execute( "test" );
+ unpack().forkOnce().executeTest().
verifyTextInLog( "tcp is set" );
}
+
+ public SurefireLauncher unpack()
+ {
+ return unpack("/surefire-510-testClassPath");
+ }
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java?rev=1228222&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java Fri Jan 6 15:04:22 2012
@@ -0,0 +1,68 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
+
+/**
+ * Test Surefire-570 Multiple report directories
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire570MultipleReportDirectoriesIT
+ extends SurefireIntegrationTestCase
+{
+
+ public void testReportWithAggregate()
+ throws Exception
+ {
+
+ SurefireLauncher surefireLauncher = unpack().failNever();
+ surefireLauncher.executeTest();
+ surefireLauncher.addGoal("-Daggregate=true");
+ OutputValidator validator = surefireLauncher.execute("surefire-report:report");
+ TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ siteFile.assertContainsText("MyModule1ClassTest");
+ siteFile.assertContainsText("MyModule2ClassTest");
+ siteFile.assertContainsText("MyDummyClassM1Test");
+ }
+
+ public void testReportWithoutAggregate()
+ throws Exception
+ {
+ SurefireLauncher surefireLauncher = unpack().failNever();
+ surefireLauncher.executeTest();
+ surefireLauncher.reset();
+ surefireLauncher.execute("surefire-report:report");
+ OutputValidator module1 = surefireLauncher.getSubProjectValidator("module1");
+ TestFile siteFile = module1.getSiteFile("surefire-report.html");
+ siteFile.assertContainsText("MyModule1ClassTest");
+ siteFile.assertContainsText("MyDummyClassM1Test");
+ }
+
+ public SurefireLauncher unpack()
+ {
+ return unpack("/surefire-570-multipleReportDirectories");
+ }
+
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire613TestCountInParallelIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire613TestCountInParallelIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire613TestCountInParallelIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-613 Asserts proper test counts when running in parallel
@@ -27,26 +28,16 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire613TestCountInParallelIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire613TestCountInParallelIT()
- {
- super( "/surefire-613-testCount-in-parallel" );
- }
-
public void testPaallelBuildResultCount()
- throws Exception
{
- failNever();
-
- execute( "test" );
-
- verifyTextInLog( "testAllok to stdout" );
- verifyTextInLog( "testAllok to stderr" );
- verifyTextInLog( "testWithException1 to stdout" );
- verifyTextInLog( "testWithException1 to stderr" );
+ OutputValidator validator = unpack("/surefire-613-testCount-in-parallel").failNever().executeTest();
- assertTestSuiteResults( 30, 8, 4, 17 );
+ validator.verifyTextInLog("testAllok to stdout");
+ validator.verifyTextInLog("testAllok to stderr");
+ validator.verifyTextInLog("testWithException1 to stdout");
+ validator.verifyTextInLog("testWithException1 to stderr");
+ validator.assertTestSuiteResults(30, 8, 4, 17);
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire621TestCountingJunit3InParallelIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire621TestCountingJunit3InParallelIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire621TestCountingJunit3InParallelIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
@@ -27,19 +27,11 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire621TestCountingJunit3InParallelIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire621TestCountingJunit3InParallelIT()
- {
- super( "/surefire-621-testCounting-junit3-in-parallel" );
- }
-
public void testJunit3ParallelBuildResultCount()
- throws Exception
{
- failNever();
- execute( "install" );
- assertTestSuiteResults( 6, 0, 0, 0 );
+ unpack( "surefire-621-testCounting-junit3-in-parallel" ).failNever().execute("install").
+ assertTestSuiteResults(6, 0, 0, 0);
}
}
\ No newline at end of file
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire628ConsoleOutputBeforeAndAfterClassIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire628ConsoleOutputBeforeAndAfterClassIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire628ConsoleOutputBeforeAndAfterClassIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Asserts that console output always goes somewhere ;)
@@ -27,26 +28,20 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire628ConsoleOutputBeforeAndAfterClassIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire628ConsoleOutputBeforeAndAfterClassIT()
- {
- super( "/surefire-628-consoleoutputbeforeandafterclass" );
- }
-
public void testJunit3ParallelBuildResultCount()
- throws Exception
{
- failNever();
- executeTest();
+ OutputValidator validator = unpack("surefire-628-consoleoutputbeforeandafterclass")
+ .failNever().executeTest();
- verifyTextInLog( "628Test1" );
- verifyTextInLog( "Before628Test1" );
- verifyTextInLog( "After628Test1" );
- verifyTextInLog( "628Test2" );
- verifyTextInLog( "Before628Test2" );
- verifyTextInLog( "After628Test2" );
+ validator.verifyTextInLog("628Test1");
+ validator.verifyTextInLog("Before628Test1");
+ validator.verifyTextInLog("After628Test1");
+ validator.verifyTextInLog("628Test2");
+ validator.verifyTextInLog("Before628Test2");
+ validator.verifyTextInLog("After628Test2");
}
}
\ No newline at end of file
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire634UnsettableSystemPropertiesWarningIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire634UnsettableSystemPropertiesWarningIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire634UnsettableSystemPropertiesWarningIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-634 Verifies error message on unsettable system properties
@@ -27,18 +27,11 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire634UnsettableSystemPropertiesWarningIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire634UnsettableSystemPropertiesWarningIT()
- {
- super( "/surefire-634-systemPropertiesWarning" );
- }
-
public void testJunit3ParallelBuildResultCount()
- throws Exception
{
- executeTest();
- verifyTextInLog( "java.library.path cannot be set as system property" );
+ unpack( "/surefire-634-systemPropertiesWarning" ).executeTest()
+ .verifyTextInLog("java.library.path cannot be set as system property");
}
}
\ No newline at end of file
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-673 Asserts that a given mockito build works as it should (classloader problem in 2.7)
@@ -27,17 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire673MockitoIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire673MockitoIT()
- {
- super( "/surefire-673-mockito" );
- }
-
public void testBuildFailingWhenErrors()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
+ unpack("/surefire-673-mockito").executeTest().verifyErrorFreeLog();
}
}
\ No newline at end of file
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,25 +19,18 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
- * SUREFIRE-673 Asserts that a given mockito build works as it should (classloader problem in 2.7)
+ * SUREFIRE-674 Asserts that the build fails when tests have errors
*
* @author Kristian Rosenvold
*/
-public class Surefire673MockitoIT
- extends SurefireVerifierTestClass
+public class Surefire674BuildFailingWhenErrorsIT
+ extends SurefireIntegrationTestCase
{
- public Surefire673MockitoIT()
- {
- super( "/surefire-673-mockito" );
- }
-
public void testBuildFailingWhenErrors()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
+ unpack("/surefire-674-buildFailingWhenErrors").executeTestWithFailure().verifyTextInLog("BUILD FAILURE");
}
}
\ No newline at end of file
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,25 +19,19 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
- * SUREFIRE-673 Asserts that a given mockito build works as it should (classloader problem in 2.7)
+ * SUREFIRE-674 Asserts that the build fails when tests have errors
*
* @author Kristian Rosenvold
*/
-public class Surefire673MockitoIT
- extends SurefireVerifierTestClass
+public class Surefire674BuildFailingWhenFailsafeErrorsIT
+ extends SurefireIntegrationTestCase
{
- public Surefire673MockitoIT()
- {
- super( "/surefire-673-mockito" );
- }
-
public void testBuildFailingWhenErrors()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
+ unpack("/failsafe-buildfail").executeVerifyWithFailure().
+ verifyTextInLog("BUILD FAILURE");
}
}
\ No newline at end of file
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire685CommaSeparatedIncludesIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire685CommaSeparatedIncludesIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire685CommaSeparatedIncludesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-685 Asserts that only the specified tests are run with comma separated includes
@@ -27,17 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire685CommaSeparatedIncludesIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire685CommaSeparatedIncludesIT()
- {
- super( "/surefire-685-commaseparatedIncludes" );
- }
-
public void testBuildFailingWhenErrors()
- throws Exception
{
- executeTest();
- assertTestSuiteResults( 2, 0, 0, 0 );
+ executeErrorFreeTest("/surefire-685-commaseparatedIncludes", 2);
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire697NiceSummaryIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire697NiceSummaryIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire697NiceSummaryIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-697 Asserts proper truncation of long exception messages Some say testing this is a bit over the top.
@@ -27,19 +27,11 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire697NiceSummaryIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire697NiceSummaryIT()
- {
- super( "/surefire-697-niceSummary" );
- }
-
public void testBuildFailingWhenErrors()
- throws Exception
{
- failNever();
- executeTest();
- verifyTextInLog( "testShortMultiline(junit.surefire697.BasicTest): A very short multiline message" );
- // Could assert that "Here is line 2" is not present too.
+ unpack( "/surefire-697-niceSummary" ).failNever().executeTest().
+ verifyTextInLog("testShortMultiline(junit.surefire697.BasicTest): A very short multiline message");
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,26 +19,22 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test
*
* @author Kristian Rosenvold
*/
-public class Surefire801ForkModeNoneClassLoaderIT
- extends SurefireVerifierTestClass
+public class Surefire705ParallelForkTimeoutIT
+ extends SurefireIntegrationTestCase
{
-
- public Surefire801ForkModeNoneClassLoaderIT()
- {
- super( "/fork-mode-resource-loading" );
- }
-
- public void testSHouldBeOkWithForkNever()
- throws Exception
+ public void testTimeoutForked()
{
- forkNever();
- executeTest();
+ unpack( "/fork-timeout" ).setJUnitVersion("4.8.1").
+ addGoal( "-Djunit.version=4.8.1" )
+ .addGoal( "-Djunit.parallel=classes" )
+ .addGoal( "-DtimeOut=1" )
+ .executeTestWithFailure();
}
}
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire733AllOverrridesCapturedIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire733AllOverrridesCapturedIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire733AllOverrridesCapturedIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,24 +19,17 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* @author Kristian Rosenvold
*/
public class Surefire733AllOverrridesCapturedIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire733AllOverrridesCapturedIT()
- {
- super( "/surefire-733-allOverridesCaptured" );
- }
-
public void testLogOutput()
- throws VerificationException
{
- executeTest();
- verifyTextInLog( "abc" );
+ unpack( "surefire-733-allOverridesCaptured" ).executeTest()
+ .verifyTextInLog("abc");
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire735ForkFailWithRedirectConsoleOutputIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire735ForkFailWithRedirectConsoleOutputIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire735ForkFailWithRedirectConsoleOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,43 +19,31 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
-
-import junit.framework.Assert;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* @author Kristian Rosenvold
*/
public class Surefire735ForkFailWithRedirectConsoleOutputIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire735ForkFailWithRedirectConsoleOutputIT()
- {
- super( "/fork-fail" );
- }
-
public void testVMStartFail()
throws Exception
{
- failNever();
- executeTest();
- verifyTextInLog( "Invalid maximum heap size: -Xmxxxx712743m" );
+ unpack().failNever().executeTest().verifyTextInLog("Invalid maximum heap size: -Xmxxxx712743m");
}
public void testVMStartFtestVMStartFailail()
throws Exception
{
- try
- {
- executeTest();
- Assert.fail( "The verifier should throw an exception" );
- }
- catch ( VerificationException ignore )
- {
- }
+ unpack().executeTestWithFailure();
+ }
+ public SurefireLauncher unpack()
+ {
+ return unpack( "fork-fail" );
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire740TruncatedCommaIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire740TruncatedCommaIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire740TruncatedCommaIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its.misc;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,9 @@ package org.apache.maven.surefire.its.mi
*/
-import java.io.File;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
/**
* Test Surefire-740 Truncated comma with non us locale
@@ -28,26 +29,18 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire740TruncatedCommaIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire740TruncatedCommaIT()
- {
- super( "/surefire-740-comma-truncated" );
- }
-
public void testRussianLocaleReport()
- throws Exception
{
- addEnvVar( "MAVEN_OPTS", "-Duser.language=ru -Duser.country=RU" );
- failNever();
- execute( getSurefireReportGoal() );
-
+ OutputValidator validator = unpack("/surefire-740-comma-truncated")
+ .addEnvVar("MAVEN_OPTS", "-Duser.language=ru -Duser.country=RU")
+ .failNever().addSurefireReportGoal().executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile = validator.getSiteFile("surefire-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting file", siteFile.exists());
- assertContainsText( siteFile, "027" ); // Avoid asserting with the "," or "." ;)
+ siteFile.assertContainsText("027"); // Avoid asserting with the "," or "." ;)
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,35 +19,29 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* @author Kristian Rosenvold
*/
public class Surefire747MethodParallelWithSuiteCountIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire747MethodParallelWithSuiteCountIT()
+ public void testMethodsParallelWithSuite()
{
- super( "/junit47-parallel-with-suite" );
+ unpack().executeTest().verifyErrorFree(6);
}
- public void testMethodsParallelWithSuite()
- throws Exception
+ public void testClassesParallelWithSuite()
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 6, 0, 0, 0 );
+ unpack().parallelClasses().executeTest().verifyErrorFree(6);
}
- public void testClassesParallelWithSuite()
- throws Exception
+ public SurefireLauncher unpack()
{
- parallel( "classes" );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 6, 0, 0, 0 );
+ return unpack( "junit47-parallel-with-suite" );
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its.misc;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its.mi
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-674 Asserts that the build fails when tests have errors
@@ -27,26 +27,16 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire763EnvironmentForkModeIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire763EnvironmentForkModeIT()
- {
- super( "/environment-variables" );
- }
-
public void testWhenUseSystemClassLoader()
- throws Exception
{
- addGoal( "-DuseSystemClassLoader=true" );
- executeTest();
+ unpack( "/environment-variables" ).addGoal( "-DuseSystemClassLoader=true" ).executeTest();
}
public void testWhenDontUseSystemClassLoader()
- throws Exception
{
- addGoal( "-DuseSystemClassLoader=false" );
- executeTest();
+ unpack( "/environment-variables" ).addGoal( "-DuseSystemClassLoader=false" ).executeTest();
}
}
\ No newline at end of file
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772BothReportsIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772BothReportsIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772BothReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its.misc;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,10 +19,10 @@ package org.apache.maven.surefire.its.mi
*/
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
-
-import java.io.File;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
/**
* Test Surefire-740 Truncated comma with non us locale
@@ -30,36 +30,27 @@ import java.io.File;
* @author Kristian Rosenvold
*/
public class Surefire772BothReportsIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public Surefire772BothReportsIT()
- {
- super( "/surefire-772-both-reports" );
- }
-
- @Override
- protected void setUp()
- throws Exception
+ public SurefireLauncher unpack()
{
- super.setUp();
- FileUtils.deleteDirectory( getTargetFile( "site" ) );
- addGoal( "-Dclean.skip=true" );
+ return unpack("/surefire-772-both-reports").deleteSiteDir().addGoal("-Dclean.skip=true").failNever();
}
public void testReportGeneration()
throws Exception
{
- failNever();
- addGoal( getFailsafeReportOnlyGoal() );
- assertFalse( "Expecting not site directory", getTargetFile( "site" ).isDirectory() );
- execute( getSurefireReportOnlyGoal() );
+ OutputValidator outputValidator = unpack()
+ .addFailsafeReportOnlyGoal()
+ .addSurefireReportOnlyGoal()
+ .executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile = outputValidator.getSiteFile("surefire-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting surefire report file", siteFile.isFile() );
- siteFile = getSiteFile( "failsafe-report.html" );
+ siteFile = outputValidator.getSiteFile("failsafe-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
@@ -67,17 +58,15 @@ public class Surefire772BothReportsIT
public void testSkippedFailsafeReportGeneration()
throws Exception
{
- failNever();
- activateProfile( "skipFailsafe" );
- addGoal( getFailsafeReportOnlyGoal() );
- assertFalse( "Expecting not site directory", getTargetFile( "site" ).isDirectory() );
- execute( getSurefireReportOnlyGoal() );
+ OutputValidator validator = unpack().
+ activateProfile("skipFailsafe")
+ .addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile =validator.getSiteFile("surefire-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting surefire report file", siteFile.isFile() );
- siteFile = getSiteFile( "failsafe-report.html" );
+ siteFile = validator.getSiteFile("failsafe-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no failsafe report file", siteFile.isFile() );
}
@@ -85,17 +74,15 @@ public class Surefire772BothReportsIT
public void testSkippedSurefireReportGeneration()
throws Exception
{
- failNever();
- activateProfile( "skipSurefire" );
- addGoal( getFailsafeReportOnlyGoal() );
- assertFalse( "Expecting not site directory", getTargetFile( "site" ).isDirectory() );
- execute( getSurefireReportOnlyGoal() );
+ OutputValidator validator = unpack().failNever().
+ activateProfile("skipSurefire").addFailsafeReportOnlyGoal()
+ .addSurefireReportOnlyGoal().executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile = validator.getSiteFile("surefire-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no surefire report file", siteFile.isFile() );
- siteFile = getSiteFile( "failsafe-report.html" );
+ siteFile = validator.getSiteFile("failsafe-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772NoFailsafeReportsIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772NoFailsafeReportsIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772NoFailsafeReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its.misc;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,7 +23,7 @@ import java.io.IOException;
import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -32,7 +32,7 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire772NoFailsafeReportsIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testReportGeneration()
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772NoSurefireReportsIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772NoSurefireReportsIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772NoSurefireReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its.misc;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,10 +19,10 @@ package org.apache.maven.surefire.its.mi
*/
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
-
-import java.io.File;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
/**
* Test Surefire-740 Truncated comma with non us locale
@@ -30,93 +30,65 @@ import java.io.File;
* @author Kristian Rosenvold
*/
public class Surefire772NoSurefireReportsIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire772NoSurefireReportsIT()
- {
- super( "/surefire-772-no-surefire-reports" );
- }
-
- @Override
- protected void setUp()
- throws Exception
- {
- super.setUp();
- FileUtils.deleteDirectory( getTargetFile( "site" ) );
- addGoal( "-Dclean.skip=true" );
- }
-
public void testReportGeneration()
- throws Exception
{
- failNever();
- addGoal( getFailsafeReportOnlyGoal() );
- assertFalse( "Expecting not site directory", getTargetFile( "site" ).isDirectory() );
- execute( getSurefireReportOnlyGoal() );
+ OutputValidator validator = unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile = validator.getSiteFile("surefire-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting surefire report file", siteFile.isFile() );
- siteFile = getSiteFile( "failsafe-report.html" );
+ siteFile = validator.getSiteFile("failsafe-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
public void testSkippedSurefireReportGeneration()
- throws Exception
{
- failNever();
- activateProfile( "skipSurefire" );
- addGoal( getFailsafeReportOnlyGoal() );
- assertFalse( "Expecting not site directory", getTargetFile( "site" ).isDirectory() );
- execute( getSurefireReportOnlyGoal() );
+ OutputValidator validator = unpack().activateProfile("skipSurefire").addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile = validator.getSiteFile("surefire-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no surefire report file", siteFile.isFile() );
- siteFile = getSiteFile( "failsafe-report.html" );
+ siteFile = validator.getSiteFile("failsafe-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
public void testOptionalSurefireReportGeneration()
- throws Exception
{
- failNever();
- activateProfile( "optionalSurefire" );
- addGoal( getFailsafeReportOnlyGoal() );
- assertFalse( "Expecting not site directory", getTargetFile( "site" ).isDirectory() );
- execute( getSurefireReportOnlyGoal() );
+ OutputValidator validator = unpack().activateProfile("optionalSurefire").addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile = validator.getSiteFile("surefire-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no surefire report file", siteFile.isFile() );
- siteFile = getSiteFile( "failsafe-report.html" );
+ siteFile = validator.getSiteFile("failsafe-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
public void testSkipOptionalSurefireReportGeneration()
- throws Exception
{
- failNever();
- activateProfile( "optionalSurefire" );
- activateProfile( "skipSurefire" );
- addGoal( getFailsafeReportOnlyGoal() );
- assertFalse( "Expecting not site directory", getTargetFile( "site" ).isDirectory() );
- execute( getSurefireReportOnlyGoal() );
+ OutputValidator validator = unpack().activateProfile("optionalSurefire").activateProfile("skipSurefire").addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile = validator.getSiteFile("surefire-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no surefire report file", siteFile.isFile() );
- siteFile = getSiteFile( "failsafe-report.html" );
+ siteFile = validator.getSiteFile("failsafe-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
+ public SurefireLauncher unpack()
+ {
+ return unpack("/surefire-772-no-surefire-reports").failNever()
+ .deleteSiteDir().addGoal("-Dclean.skip=true");
+
+ }
+
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772SpecifiedReportsIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772SpecifiedReportsIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772SpecifiedReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its.misc;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,10 +19,10 @@ package org.apache.maven.surefire.its.mi
*/
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
-
-import java.io.File;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
/**
* Test Surefire-740 Truncated comma with non us locale
@@ -30,74 +30,50 @@ import java.io.File;
* @author Kristian Rosenvold
*/
public class Surefire772SpecifiedReportsIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire772SpecifiedReportsIT()
- {
- super( "/surefire-772-specified-reports" );
- }
-
- @Override
- protected void setUp()
- throws Exception
- {
- super.setUp();
- FileUtils.deleteDirectory( getTargetFile( "site" ) );
- addGoal( "-Dclean.skip=true" );
- }
-
public void testReportGeneration()
- throws Exception
{
- failNever();
- addGoal( getFailsafeReportOnlyGoal() );
- assertFalse( "Expecting not site directory", getTargetFile( "site" ).isDirectory() );
- execute( getSurefireReportOnlyGoal() );
+ OutputValidator validator = unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile = validator.getSiteFile("surefire-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting surefire report file", siteFile.isFile() );
- siteFile = getSiteFile( "failsafe-report.html" );
+ siteFile = validator.getSiteFile("failsafe-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
- assertTrue( "Expecting failsafe report file", siteFile.isFile() );
+ assertTrue("Expecting failsafe report file", siteFile.isFile());
}
public void testSkippedFailsafeReportGeneration()
- throws Exception
{
- failNever();
- activateProfile( "skipFailsafe" );
- addGoal( getFailsafeReportOnlyGoal() );
- assertFalse( "Expecting not site directory", getTargetFile( "site" ).isDirectory() );
- execute( getSurefireReportOnlyGoal() );
+ OutputValidator validator = unpack().activateProfile( "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile = validator.getSiteFile("surefire-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting surefire report file", siteFile.isFile() );
- siteFile = getSiteFile( "failsafe-report.html" );
+ siteFile = validator.getSiteFile("failsafe-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
- assertFalse( "Expecting no failsafe report file", siteFile.isFile() );
+ assertFalse("Expecting no failsafe report file", siteFile.isFile());
}
public void testSkippedSurefireReportGeneration()
- throws Exception
{
- failNever();
- activateProfile( "skipSurefire" );
- addGoal( getFailsafeReportOnlyGoal() );
- assertFalse( "Expecting not site directory", getTargetFile( "site" ).isDirectory() );
- execute( getSurefireReportOnlyGoal() );
+ OutputValidator validator = unpack().activateProfile( "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- File siteFile = getSiteFile( "surefire-report.html" );
+ TestFile siteFile = validator.getSiteFile("surefire-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no surefire report file", siteFile.isFile() );
- siteFile = getSiteFile( "failsafe-report.html" );
+ siteFile = validator.getSiteFile("failsafe-report.html");
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
- assertTrue( "Expecting failsafe report file", siteFile.isFile() );
+ assertTrue("Expecting failsafe report file", siteFile.isFile());
+ }
+
+ public SurefireLauncher unpack()
+ {
+ return unpack("/surefire-772-specified-reports").deleteSiteDir().addGoal( "-Dclean.skip=true" ).failNever();
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java (from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java&r1=1227906&r2=1228222&rev=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java Fri Jan 6 15:04:22 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.its.jiras;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test
@@ -27,18 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Surefire801ForkModeNoneClassLoaderIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Surefire801ForkModeNoneClassLoaderIT()
- {
- super( "/fork-mode-resource-loading" );
- }
-
public void testSHouldBeOkWithForkNever()
- throws Exception
{
- forkNever();
- executeTest();
+ unpack( "fork-mode-resource-loading" ).forkNever().executeTest();
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java
------------------------------------------------------------------------------
svn:eol-style = native