Author: krosenvold
Date: Sun Jan 1 22:27:48 2012
New Revision: 1226307
URL: http://svn.apache.org/viewvc?rev=1226307&view=rev
Log:
o Changed tests to use simpler base class
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java?rev=1226307&r1=1226306&r2=1226307&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
Sun Jan 1 22:27:48 2012
@@ -19,30 +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 org.apache.maven.surefire.its.misc.HelperAssertions;
-
-import java.io.File;
-
/**
* Test passing an argLine parameter
*
* @author <a href="mailto:[email protected]";>Dan Fabulich</a>
*/
public class ArgLineIT
- extends AbstractSurefireIntegrationTestClass
+ extends SurefireVerifierTestClass
{
+
+ public ArgLineIT()
+ {
+ super( "/argLine-parameter" );
+ }
+
public void testArgLine()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/argLine-parameter" );
-
- 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 );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java?rev=1226307&r1=1226306&r2=1226307&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
Sun Jan 1 22:27:48 2012
@@ -19,30 +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 org.apache.maven.surefire.its.misc.HelperAssertions;
-
-import java.io.File;
-
/**
* Test additionalClasspathElements
*
* @author pgier
*/
public class ClasspathFilteringIT
- extends AbstractSurefireIntegrationTestClass
+ extends SurefireVerifierTestClass
{
+
+ public ClasspathFilteringIT()
+ {
+ super( "/classpath-filtering" );
+ }
+
public void testAdditionalClasspath()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/classpath-filtering" );
-
- 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 );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java?rev=1226307&r1=1226306&r2=1226307&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
Sun Jan 1 22:27:48 2012
@@ -19,31 +19,26 @@ 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;
-
/**
* Test support for POJO tests.
*
* @author Benjamin Bentmann
*/
public class PojoSimpleIT
- extends AbstractSurefireIntegrationTestClass
+ extends SurefireVerifierTestClass
{
+
+ public PojoSimpleIT()
+ {
+ super( "/pojo-simple" );
+ }
+
public void testit()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/pojo-simple" );
-
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- executeGoal( verifier, "test" );
- verifier.resetStreams();
-
- HelperAssertions.assertTestSuiteResults( 2, 0, 1, 0, testDir );
+ executeTest();
+ assertTestSuiteResults( 2, 0, 1, 0);
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java?rev=1226307&r1=1226306&r2=1226307&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
Sun Jan 1 22:27:48 2012
@@ -19,16 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.it.VerificationException;
-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.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import org.apache.maven.it.VerificationException;
/**
* Verifies that the providers get the result summary at the bottom of the run
correctly, in different forkmodes
@@ -37,8 +29,14 @@ import java.util.List;
* @author Kristian Rosenvold
*/
public class ResultCountingIT
- extends AbstractSurefireIntegrationTestClass
+ extends SurefireVerifierTestClass
{
+
+ public ResultCountingIT()
+ {
+ super( "/result-counting" );
+ }
+
public void testCountingWithJunit481ForkNever()
throws Exception
{
@@ -51,7 +49,6 @@ public class ResultCountingIT
assertForkMode( "once" );
}
-
public void testCountingWithJunit481ForkAlways()
throws Exception
{
@@ -61,26 +58,10 @@ public class ResultCountingIT
private void assertForkMode( String forkMode )
throws IOException, VerificationException
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/result-counting" );
-
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- String[] opts = { "-fn" };
- verifier.setCliOptions( new ArrayList<String>( Arrays.asList( opts ) )
);
- List<String> goals = getGoals( forkMode );
- this.executeGoals( verifier, goals );
-
- verifier.resetStreams();
-
- HelperAssertions.assertTestSuiteResults( 36, 23, 4, 2, testDir );
-
- verifier.verifyTextInLog( "Tests run: 36, Failures: 4, Errors: 23,
Skipped: 2" );
- }
-
- private List<String> getGoals( String forkMode )
- {
- List<String> goals = this.getInitialGoals();
- goals.add( "test" );
- goals.add( "-DforkMode=" + forkMode );
- return goals;
+ failNever();
+ forkMode( forkMode );
+ executeTest();
+ assertTestSuiteResults( 36, 23, 4, 2 );
+ verifyTextInLog( "Tests run: 36, Failures: 4, Errors: 23, Skipped: 2"
);
}
}
\ No newline at end of file
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java?rev=1226307&r1=1226306&r2=1226307&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
Sun Jan 1 22:27:48 2012
@@ -19,14 +19,9 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import java.io.File;
import java.io.IOException;
import java.util.Calendar;
-import java.util.List;
import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.surefire.its.misc.HelperAssertions;
/**
* Verifies the runOrder setting and its effect
@@ -34,7 +29,7 @@ import org.apache.maven.surefire.its.mis
* @author Kristian Rosenvold
*/
public class RunOrderIT
- extends AbstractSurefireIntegrationTestClass
+ extends SurefireVerifierTestClass
{
private static final String[] TESTS_IN_ALPHABETICAL_ORDER = { "TA", "TB",
"TC" };
@@ -42,21 +37,9 @@ public class RunOrderIT
// testing random is left as an exercise to the reader. Patches welcome
- private File testDir;
-
- protected Verifier verifier;
-
- public void setUp()
- throws IOException, VerificationException
+ public RunOrderIT()
{
- testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/runOrder" );
- verifier = new Verifier( testDir.getAbsolutePath() );
- }
-
- public void tearDown()
- throws Exception
- {
- verifier.resetStreams();
+ super( "/runOrder" );
}
public void testAlphabetical()
@@ -99,15 +82,15 @@ public class RunOrderIT
catch ( VerificationException e )
{
}
- verifier.verifyTextInLog( "There's no RunOrder with the name
nonExistingRunOrder." );
+ verifyTextInLog( "There's no RunOrder with the name
nonExistingRunOrder." );
}
private void executeWithRunOrder( String runOrder )
throws IOException, VerificationException
{
executeTestsWithRunOrder( runOrder );
- verifier.verifyErrorFreeLog();
- HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, testDir );
+ verifyErrorFreeLog();
+ assertTestSuiteResults( 3, 0, 0, 0);
}
@@ -119,43 +102,17 @@ public class RunOrderIT
protected void executeTestsWithRunOrder( String runOrder )
throws VerificationException
{
- List<String> goals = getInitialGoals();
- goals.add( "-DforkMode=" + getForkMode() );
- goals.add( "-DrunOrder=" + runOrder );
- goals.add( "test" );
- executeGoals( verifier, goals );
+ forkMode( getForkMode() );
+ runOrder( runOrder );
+ executeTest();
}
private void assertTestnamesAppearInSpecificOrder( String[] testnames )
throws VerificationException
{
- if ( !testnamesAppearInSpecificOrder( testnames ) )
+ if ( !stringsAppearInSpecificOrderInLog( testnames ) )
{
throw new VerificationException( "Response does not contain
expected item" );
}
}
-
- private boolean testnamesAppearInSpecificOrder( String[] testnames )
- throws VerificationException
- {
- int i = 0;
- for ( String line : getLog() )
- {
- if ( line.startsWith( testnames[i] ) )
- {
- if ( i == testnames.length - 1 )
- {
- return true;
- }
- ++i;
- }
- }
- return false;
- }
-
- private List<String> getLog()
- throws VerificationException
- {
- return verifier.loadFile( verifier.getBasedir(),
verifier.getLogFileName(), false );
- }
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java?rev=1226307&r1=1226306&r2=1226307&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
Sun Jan 1 22:27:48 2012
@@ -262,6 +262,10 @@ public abstract class SurefireVerifierTe
{
addGoal( "-DforkMode=" + forkMode );
}
+ protected void runOrder( String runOrder )
+ {
+ addGoal( "-DrunOrder=" + runOrder);
+ }
protected void failIfNoTests( boolean fail )
{
@@ -315,6 +319,32 @@ public abstract class SurefireVerifierTe
return false; // doh
}
+ protected boolean stringsAppearInSpecificOrderInLog( String[] strings )
+ throws VerificationException
+ {
+ int i = 0;
+ for ( String line : getLog() )
+ {
+ if ( line.startsWith( strings[i] ) )
+ {
+ if ( i == strings.length - 1 )
+ {
+ return true;
+ }
+ ++i;
+ }
+ }
+ return false;
+ }
+
+ private List<String> getLog()
+ throws VerificationException
+ {
+ return verifier.loadFile( verifier.getBasedir(),
verifier.getLogFileName(), false );
+ }
+
+
+
private DefaultArtifactVersion getMavenVersion()
{
try
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java?rev=1226307&r1=1226306&r2=1226307&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
Sun Jan 1 22:27:48 2012
@@ -19,15 +19,14 @@ 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 org.apache.maven.surefire.its.misc.ReportTestSuite;
-
import java.io.File;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.surefire.its.misc.HelperAssertions;
+import org.apache.maven.surefire.its.misc.ReportTestSuite;
/**
* Test running two test cases; confirms reporting works correctly
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java?rev=1226307&r1=1226306&r2=1226307&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
Sun Jan 1 22:27:48 2012
@@ -19,15 +19,14 @@ package org.apache.maven.surefire.its;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.FileUtils;
import org.apache.maven.it.util.ResourceExtractor;
import org.apache.maven.surefire.its.misc.HelperAssertions;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
/**
* Test a directory with an umlaut
*
