You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by st...@apache.org on 2010/01/07 12:51:26 UTC
svn commit: r896852 [1/2] - in
/maven/surefire/trunk/surefire-integration-tests: ./
src/test/java/org/apache/maven/surefire/its/
Author: stephenc
Date: Thu Jan 7 11:44:07 2010
New Revision: 896852
URL: http://svn.apache.org/viewvc?rev=896852&view=rev
Log:
[SUREFIRE-584] Fix the verifier based tests so that they work during mvn release:prepare
o I have used invoker:install to stage the artifacts required for the integration tests
o I use a JUnit test to setup the settings.xml that uses the staged local repository and uses the actual local repository as a remote repository while retaining all the running machine's settings (e.g. proxies) that should mean that the integration tests will work from behind a corporate proxy and they should be fast
o I use both surefire and failsafe maven plugins for test execution, failsafe is used for the integration tests and surefire runs the JUnit test that creates the settings.xml for the staged local repository. I could have just used exec-maven-plugin and used a executible java class to create the staged settings.xml, but my concern is that that would introduce another dependency and complicate bootstrapping... failsafe will not be an issue in this respect as I will be adding it to surefire.
o All the integration tests have been renamed to be picked up by failsafe's default patterns.
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgExecuteErrorTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgJdk14Test.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgListenerReporter.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgReportTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ChekcTestNgVersionsIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgVersionsTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IntegrationTestSuiteResults.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ITSuiteResults.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit4ForkAlwaysStaticInitPollution.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java (with props)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/StagedLocalRepoHelper.java (with props)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCaseIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCase.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTestIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestUseIsolatedClassLoader.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java (contents, props changed)
- copied, changed from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryTest.java
Removed:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ITSuiteResults.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCase.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit4ForkAlwaysStaticInitPollution.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgExecuteErrorTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgJdk14Test.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgListenerReporter.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgReportTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgVersionsTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestUseIsolatedClassLoader.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryTest.java
Modified:
maven/surefire/trunk/surefire-integration-tests/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java
Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=896852&r1=896851&r2=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Thu Jan 7 11:44:07 2010
@@ -18,8 +18,9 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.surefire</groupId>
@@ -41,12 +42,51 @@
<version>${project.version}</version>
<type>maven-plugin</type>
</dependency>
+ <dependency>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>${project.version}</version>
+ <type>maven-plugin</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-testng</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <!-- SC don't want our surefire getting confulsed and trying to use the testng runner -->
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
<version>1.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>2.0.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -57,31 +97,102 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-help-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>settings.xml</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>effective-settings</goal>
+ </goals>
+ <configuration>
+ <output>${project.build.directory}/private/settings.xml</output>
+ <showPasswords>${it.settings.showPasswords}</showPasswords>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- DGF only include the "org" package; don't try to run the
- tests of the projects under test directly -->
- <includes>
- <include>org/**/Test*.java</include>
- <include>org/**/*Test.java</include>
- <include>org/**/*TestCase.java</include>
- </includes>
+ <test>SetUpForIntegrationTest</test>
<!-- Pass current surefire version to the main suite so that it -->
<!-- can forward to all integration test projects. SUREFIRE-513 -->
<systemProperties>
<property>
- <name>surefire.version</name>
- <value>${project.version}</value>
+ <name>surefire.version</name>
+ <value>${project.version}</value>
+ </property>
+ <property>
+ <name>maven.home</name>
+ <value>${maven.home}</value>
+ </property>
+ <property>
+ <name>maven.settings.file</name>
+ <value>${project.build.directory}/private/settings.xml</value>
+ </property>
+ <property>
+ <name>maven.staged.local.repo</name>
+ <value>${project.build.directory}/it-repo</value>
+ </property>
+ </systemProperties>
+
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>failsafe-maven-plugin</artifactId>
+ <version>2.4.3-alpha-1</version>
+ <configuration>
+ <!-- Pass current surefire version to the main suite so that it -->
+ <!-- can forward to all integration test projects. SUREFIRE-513 -->
+ <systemProperties>
+ <property>
+ <name>surefire.version</name>
+ <value>${project.version}</value>
+ </property>
+ <property>
+ <name>maven.home</name>
+ <value>${maven.home}</value>
+ </property>
+ <property>
+ <name>maven.settings.file</name>
+ <value>${project.build.directory}/private/settings.xml</value>
</property>
<property>
- <name>maven.home</name>
- <value>${maven.home}</value>
+ <name>maven.staged.local.repo</name>
+ <value>${project.build.directory}/it-repo</value>
</property>
</systemProperties>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
+
+ <properties>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <it.settings.showPasswords>false</it.settings.showPasswords>
+ </properties>
</project>
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java Thu Jan 7 11:44:07 2010
@@ -1,20 +1,19 @@
package org.apache.maven.surefire.its;
-import java.util.ArrayList;
-
import junit.framework.TestCase;
-
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
+import java.util.ArrayList;
+
/**
* Base class of all integration test cases. Mainly used to pickup surefire version
* from system property
- * @author Dan T. Tran
*
+ * @author Dan T. Tran
*/
-public abstract class AbstractSurefireIT
+public abstract class AbstractSurefireIntegrationTestClass
extends TestCase
{
private String surefireVersion = System.getProperty( "surefire.version" );
@@ -25,12 +24,17 @@
goals.add( "-Dsurefire.version=" + surefireVersion );
return goals;
}
-
+
protected void executeGoal( Verifier verifier, String goal )
throws VerificationException
{
ArrayList goals = this.getInitialGoals();
- goals.add( goal );
+ goals.add( goal );
+ if ( !verifier.getCliOptions().contains( "-s" ) )
+ {
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( System.getProperty( "maven.staged.local.repo" ) );
+ }
verifier.executeGoals( goals );
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class AbstractTestCaseTest
- extends AbstractSurefireIT
+public class AbstractTestCaseIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testAbstractTestCase ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class AdditionalClasspathTest
- extends AbstractSurefireIT
+public class AdditionalClasspathIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testAdditionalClasspath ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java Thu Jan 7 11:44:07 2010
@@ -13,8 +13,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class AggregateReportTest
- extends AbstractSurefireIT
+public class AggregateReportIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testAggregateReport ()
throws Exception
@@ -37,7 +37,7 @@
File[] testDirs = new File[2];
testDirs[0] = new File( testDir, "child1" );
testDirs[1] = new File( testDir, "child2" );
- ITSuiteResults suite = HelperAssertions.parseTestResults( testDirs );
+ IntegrationTestSuiteResults suite = HelperAssertions.parseTestResults( testDirs );
HelperAssertions.assertTestSuiteResults( 2, 0, 1, 0, suite );
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class ArgLineTest
- extends AbstractSurefireIT
+public class ArgLineIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testArgLine ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java Thu Jan 7 11:44:07 2010
@@ -2,7 +2,6 @@
import java.io.File;
-import java.util.ArrayList;
import java.util.List;
import org.apache.maven.it.VerificationException;
@@ -15,8 +14,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestSingleTest
- extends AbstractSurefireIT
+public class CheckSingleTestIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testSingleTest ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java Thu Jan 7 11:44:07 2010
@@ -16,8 +16,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestFailIfNoTestsForkMode
- extends AbstractSurefireIT
+public class CheckTestFailIfNoTestsForkModeIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testFailIfNoTestsForkModeAlways () throws Exception
{
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java Thu Jan 7 11:44:07 2010
@@ -14,8 +14,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestFailIfNoTests
- extends AbstractSurefireIT
+public class CheckTestFailIfNoTestsIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testFailIfNoTests ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java Thu Jan 7 11:44:07 2010
@@ -13,8 +13,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestNgBeforeMethodFailure
- extends AbstractSurefireIT
+public class CheckTestNgBeforeMethodFailureIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testTestNgBeforeMethodFailure ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestNgBeforeMethod
- extends AbstractSurefireIT
+public class CheckTestNgBeforeMethodIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testTestNgBeforeMethod ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgExecuteErrorTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgExecuteErrorTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgExecuteErrorTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestNgExecuteErrorTest
- extends AbstractSurefireIT
+public class CheckTestNgExecuteErrorIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testExecuteError()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestNgGroupThreadParallel
- extends AbstractSurefireIT
+public class CheckTestNgGroupThreadParallelIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testTestNgGroupThreadParallel ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgJdk14Test.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgJdk14Test.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgJdk14Test.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestNgJdk14Test
- extends AbstractSurefireIT
+public class CheckTestNgJdk14IT
+ extends AbstractSurefireIntegrationTestClass
{
public void testTestNgJdk14 ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgListenerReporter.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgListenerReporter.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgListenerReporter.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestNgListenerReporter
- extends AbstractSurefireIT
+public class CheckTestNgListenerReporterIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testTestNgListenerReporter ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestNgPathWithSpaces
- extends AbstractSurefireIT
+public class CheckTestNgPathWithSpacesIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testTestNgTestWithSpaces ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgReportTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgReportTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgReportTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java Thu Jan 7 11:44:07 2010
@@ -13,8 +13,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestNgReportTest
- extends AbstractSurefireIT
+public class CheckTestNgReportTestIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testTestNgReport ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java Thu Jan 7 11:44:07 2010
@@ -14,8 +14,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestNgSuiteXmlTest
- extends AbstractSurefireIT
+public class CheckTestNgSuiteXmlIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testTestNgSuiteXml ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java Thu Jan 7 11:44:07 2010
@@ -13,8 +13,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestNgSuiteXmlSingleTest
- extends AbstractSurefireIT
+public class CheckTestNgSuiteXmlSingleIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testTestNGSuite()
throws Exception
@@ -30,7 +30,7 @@
verifier.resetStreams();
List reports = HelperAssertions.extractReports( ( new File[] { testDir } ) );
- ITSuiteResults results = HelperAssertions.parseReportList( reports );
+ IntegrationTestSuiteResults results = HelperAssertions.parseReportList( reports );
HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, results );
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ChekcTestNgVersionsIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgVersionsTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ChekcTestNgVersionsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ChekcTestNgVersionsIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgVersionsTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgVersionsTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ChekcTestNgVersionsIT.java Thu Jan 7 11:44:07 2010
@@ -13,8 +13,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestNgVersionsTest
- extends AbstractSurefireIT
+public class ChekcTestNgVersionsIT
+ extends AbstractSurefireIntegrationTestClass
{
public void test47 () throws Exception
@@ -74,7 +74,7 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- ITSuiteResults suite = HelperAssertions.parseTestResults( testDir );
+ IntegrationTestSuiteResults suite = HelperAssertions.parseTestResults( testDir );
HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, suite );
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ChekcTestNgVersionsIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class ClassPathOrderTest
- extends AbstractSurefireIT
+public class ClassPathOrderIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testClassPathOrder ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class DefaultConfigurationTest
- extends AbstractSurefireIT
+public class DefaultConfigurationIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testDefaultConfiguration ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class EnvironmentVariableTest
- extends AbstractSurefireIT
+public class EnvironmentVariableIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testEnvironmentVariable ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java Thu Jan 7 11:44:07 2010
@@ -17,8 +17,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class ForkModeTest
- extends AbstractSurefireIT
+public class ForkModeIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testForkModeAlways()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java?rev=896852&r1=896851&r2=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java Thu Jan 7 11:44:07 2010
@@ -13,12 +13,12 @@
/** assert that the reports in the specified testDir have the right summary statistics */
public static void assertTestSuiteResults( int total, int errors, int failures, int skipped,
File testDir ) throws MavenReportException {
- ITSuiteResults suite = parseTestResults( new File[] { testDir } );
+ IntegrationTestSuiteResults suite = parseTestResults( new File[] { testDir } );
assertTestSuiteResults( total, errors, failures, skipped, suite );
}
protected static void assertTestSuiteResults( int total, int errors, int failures, int skipped,
- ITSuiteResults actualSuite )
+ IntegrationTestSuiteResults actualSuite )
{
Assert.assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
Assert.assertEquals( "wrong number of errors", errors, actualSuite.getErrors() );
@@ -26,22 +26,22 @@
Assert.assertEquals( "wrong number of skipped", skipped, actualSuite.getSkipped() );
}
- protected static ITSuiteResults parseTestResults( File testDir )
+ protected static IntegrationTestSuiteResults parseTestResults( File testDir )
throws MavenReportException
{
return parseTestResults( new File[] { testDir } );
}
- protected static ITSuiteResults parseTestResults( File[] testDirs )
+ protected static IntegrationTestSuiteResults parseTestResults( File[] testDirs )
throws MavenReportException
{
List reports = extractReports( testDirs );
- ITSuiteResults results = parseReportList( reports );
+ IntegrationTestSuiteResults results = parseReportList( reports );
return results;
}
- /** Converts a list of ReportTestSuites into an ITSuiteResults object, suitable for summary assertions */
- protected static ITSuiteResults parseReportList( List reports )
+ /** Converts a list of ReportTestSuites into an IntegrationTestSuiteResults object, suitable for summary assertions */
+ protected static IntegrationTestSuiteResults parseReportList( List reports )
{
Assert.assertTrue( "No reports!", reports.size() > 0 );
int total = 0, errors = 0, failures = 0, skipped = 0;
@@ -52,7 +52,7 @@
failures += suite.getNumberOfFailures();
skipped += suite.getNumberOfSkipped();
}
- ITSuiteResults results = new ITSuiteResults(total, errors, failures, skipped);
+ IntegrationTestSuiteResults results = new IntegrationTestSuiteResults(total, errors, failures, skipped);
return results;
}
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java Thu Jan 7 11:44:07 2010
@@ -30,8 +30,8 @@
* @author Benjamin Bentmann
* @version $Id$
*/
-public class IncludesExcludesTest
- extends AbstractSurefireIT
+public class IncludesExcludesIT
+ extends AbstractSurefireIntegrationTestClass
{
/**
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IntegrationTestSuiteResults.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ITSuiteResults.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IntegrationTestSuiteResults.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IntegrationTestSuiteResults.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ITSuiteResults.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ITSuiteResults.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IntegrationTestSuiteResults.java Thu Jan 7 11:44:07 2010
@@ -1,10 +1,10 @@
package org.apache.maven.surefire.its;
-public class ITSuiteResults
+public class IntegrationTestSuiteResults
{
private int total, errors, failures, skipped;
- public ITSuiteResults( int total, int errors, int failures, int skipped )
+ public IntegrationTestSuiteResults( int total, int errors, int failures, int skipped )
{
this.total = total;
this.errors = errors;
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IntegrationTestSuiteResults.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java?rev=896852&r1=896851&r2=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java Thu Jan 7 11:44:07 2010
@@ -13,7 +13,7 @@
*
*/
public class JUnit44Dep
- extends AbstractSurefireIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testJUnit44Dep ()
throws Exception
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestJUnit44Hamcrest
- extends AbstractSurefireIT
+public class JUnit44HamcrestIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testJUnit44Hamcrest ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit4ForkAlwaysStaticInitPollution.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit4ForkAlwaysStaticInitPollution.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit4ForkAlwaysStaticInitPollution.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestJUnit4ForkAlwaysStaticInitPollution
- extends AbstractSurefireIT
+public class JUnit4ForkAlwaysStaticInitPollutionIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testJunit4Ignore ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestJunit4Ignore
- extends AbstractSurefireIT
+public class Junit4IgnoreIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testJunit4Ignore ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java Thu Jan 7 11:44:07 2010
@@ -13,8 +13,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class Junit4VersionsTest
- extends AbstractSurefireIT
+public class Junit4VersionsIT
+ extends AbstractSurefireIntegrationTestClass
{
public void test40 () throws Exception
@@ -62,7 +62,7 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- ITSuiteResults suite = HelperAssertions.parseTestResults( new File[] { testDir } );
+ IntegrationTestSuiteResults suite = HelperAssertions.parseTestResults( new File[] { testDir } );
HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, suite );
}
}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class TestPlainOldJavaClasspath
- extends AbstractSurefireIT
+public class PlainOldJavaClasspathIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testPlainOldJavaClasspath ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java Thu Jan 7 11:44:07 2010
@@ -13,8 +13,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class PlexusConflictTest
- extends AbstractSurefireIT
+public class PlexusConflictIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testPlexusConflict ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java?rev=896852&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java Thu Jan 7 11:44:07 2010
@@ -0,0 +1,45 @@
+package org.apache.maven.surefire.its;
+/*
+* 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 junit.framework.TestCase;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.Object;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @author Stephen Connolly
+ * @since 05-Jan-2010 08:17:17
+ */
+public class SetUpForIntegrationTest
+ extends TestCase
+{
+ public void testSmokes()
+ throws IOException
+ {
+ // if the properties are missing we'll fail the test with an NPE and stop the build.
+ File originalSettings = new File( System.getProperty( "maven.settings.file" ) );
+ File newRepo = new File( System.getProperty( "maven.staged.local.repo" ) );
+ File newSettings = new File( originalSettings.getParentFile(), originalSettings.getName()+".staged" );
+ StagedLocalRepoHelper.createStagedSettingsXml( originalSettings, newRepo, newSettings );
+ }
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java (from r895927, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java&r1=895927&r2=896852&rev=896852&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java Thu Jan 7 11:44:07 2010
@@ -12,8 +12,8 @@
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*
*/
-public class SiblingAggregatorTest
- extends AbstractSurefireIT
+public class SiblingAggregatorIT
+ extends AbstractSurefireIntegrationTestClass
{
public void testSiblingAggregator ()
throws Exception
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
------------------------------------------------------------------------------
svn:eol-style = native