Author: krosenvold
Date: Tue Jan 3 20:08:35 2012
New Revision: 1226934
URL: http://svn.apache.org/viewvc?rev=1226934&view=rev
Log:
o Updated a few more IT's
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java?rev=1226934&r1=1226933&r2=1226934&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
Tue Jan 3 20:08:35 2012
@@ -19,47 +19,34 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.surefire.its.misc.HelperAssertions;
-
-import java.io.File;
-import java.util.List;
-
/**
* Test library using a conflicting version of plexus-utils
*
* @author <a href="mailto:[email protected]";>Dan Fabulich</a>
*/
public class PlexusConflictIT
- extends AbstractSurefireIntegrationTestClass
+ extends SurefireVerifierTestClass
{
+
+ public PlexusConflictIT()
+ {
+ super( "/plexus-conflict" );
+ }
+
public void testPlexusConflict()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/plexus-conflict" );
-
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- this.executeGoal( verifier, "test" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
-
- HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+ executeTest();
+ verifyErrorFreeLog();
+ assertTestSuiteResults( 1, 0, 0, 0 );
}
public void testPlexusConflictIsolatedClassLoader()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/plexus-conflict" );
-
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List<String> goals = this.getInitialGoals();
- goals.add( "test" );
- goals.add( "-Dsurefire.useSystemClassLoader=false" );
- executeGoals( verifier, goals );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
-
- HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+ executeTest();
+ verifyErrorFreeLog();
+ addD( "surefire.useSystemClassLoader", "false" );
+ assertTestSuiteResults( 1, 0, 0, 0 );
}
}
\ No newline at end of file
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java?rev=1226934&r1=1226933&r2=1226934&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
Tue Jan 3 20:08:35 2012
@@ -19,19 +19,18 @@ package org.apache.maven.surefire.its;
* under the License.
*/
+import java.io.File;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import org.apache.maven.surefire.its.misc.HelperAssertions;
-import java.io.File;
-
/**
* Test aggregator as a sibling to child modules; invokes modules as "../child"
*
* @author <a href="mailto:[email protected]";>Dan Fabulich</a>
*/
public class SiblingAggregatorIT
- extends AbstractSurefireIntegrationTestClass
+ extends AbstractSurefireIntegrationTestClass // Special
{
public void testSiblingAggregator()
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java?rev=1226934&r1=1226933&r2=1226934&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
Tue Jan 3 20:08:35 2012
@@ -19,36 +19,25 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.io.IOException;
-
/**
* Test when the configured working directory does not exist, SUREFIRE-607
*
* @author <a href="mailto:[email protected]";>Stephen Connolly</a>
*/
public class WorkingDirectoryMissingIT
- extends AbstractSurefireIntegrationTestClass
+ extends SurefireVerifierTestClass
{
-
- private File testDir;
-
- public void setUp()
- throws IOException
+ public WorkingDirectoryMissingIT()
{
- testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/working-directory-missing" );
+ super( "/working-directory-missing" );
}
+
public void testWorkingDirectory()
throws Exception
{
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- this.executeGoal( verifier, "test" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ executeTest();
+ verifyErrorFreeLog();
}
}
