You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/07/28 03:34:29 UTC
svn commit: r680222 [4/6] -
/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0127AntrunDependencies.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0127AntrunDependencies.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0127AntrunDependencies.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0127AntrunDependencies.java Sun Jul 27 18:34:23 2008
@@ -35,13 +35,13 @@
{
File testDir = extractTestResources( getClass(), "/it0127-antrunDependencies" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.it0127", "parent", "1.0-SNAPSHOT", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.it0127", "a", "1.0-SNAPSHOT", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.it0127", "b", "1.0-SNAPSHOT", "jar" );
- verifier.executeGoal( "compile" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.it0127", "parent", "1.0-SNAPSHOT", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.it0127", "a", "1.0-SNAPSHOT", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.it0127", "b", "1.0-SNAPSHOT", "jar" );
+ itr.executeGoal( "compile" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java Sun Jul 27 18:34:23 2008
@@ -15,10 +15,10 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0128-distMgmtSiteUrlParentCalc" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "integration-test" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "integration-test" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java Sun Jul 27 18:34:23 2008
@@ -15,27 +15,27 @@
File testDir =
extractTestResources( getClass(), "/it0129-resourcesForAPluginProvidedAsAPluginDependency" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
// Install the parent POM, extension and the plugin
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.it0129", "it0129-plugin-runner", "1.0", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.it0129", "it0129-extension", "1.0", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.it0129", "it0129-plugin", "1.0", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.it0129", "it0129-parent", "1.0", "pom" );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.it0129", "it0129-plugin-runner", "1.0", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.it0129", "it0129-extension", "1.0", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.it0129", "it0129-plugin", "1.0", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.it0129", "it0129-parent", "1.0", "pom" );
List cliOptions = new ArrayList();
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
//now run the test
testDir = extractTestResources( getClass(), "/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-project" );
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
cliOptions = new ArrayList();
- verifier.executeGoal( "verify" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "verify" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1412DependenciesOrderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1412DependenciesOrderTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1412DependenciesOrderTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1412DependenciesOrderTest.java Sun Jul 27 18:34:23 2008
@@ -28,12 +28,12 @@
// The testdir is computed from the location of this file.
File testDir = extractTestResources( getClass(), "/mng-1412-DependenciesOrder" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
- verifier.executeGoal( "test", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "test", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1491ReactorArtifactIdCollision.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1491ReactorArtifactIdCollision.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1491ReactorArtifactIdCollision.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1491ReactorArtifactIdCollision.java Sun Jul 27 18:34:23 2008
@@ -13,15 +13,15 @@
{
File testDir = extractTestResources( getClass(), "/mng-1491-reactorArtifactIdCollision" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
try
{
- verifier.executeGoal( "initialize" );
+ itr.executeGoal( "initialize" );
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
fail( "Build should fail due to duplicate artifactId's in the reactor." );
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java Sun Jul 27 18:34:23 2008
@@ -19,11 +19,11 @@
{
File testDir = extractTestResources( getClass(), "/mng-1493-nonstandardModulePomNames" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "initialize" );
+ itr.executeGoal( "initialize" );
/*
* This is the simplest way to check a build
@@ -31,9 +31,9 @@
* an IT test: make the build pass when the test
* should pass, and make the build fail when the
* test should fail. There are other methods
- * supported by the verifier. They can be seen here:
- * http://maven.apache.org/shared/maven-verifier/apidocs/index.html
+ * supported by the itr. They can be seen here:
+ * http://maven.apache.org/shared/maven-itr/apidocs/index.html
*/
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2045testJarDependenciesBrokenInReactorTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2045testJarDependenciesBrokenInReactorTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2045testJarDependenciesBrokenInReactorTest.java Sun Jul 27 18:34:23 2008
@@ -25,16 +25,16 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/mng-2045-testJarDependenciesBrokenInReactor" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "testing", "mng-2045-test", "1.0-SNAPSHOT", "pom" );
- verifier.deleteArtifact( "testing", "first-project", "1.0-SNAPSHOT", "jar" );
- verifier.deleteArtifact( "testing", "second-project", "1.0-SNAPSHOT", "jar" );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "testing", "mng-2045-test", "1.0-SNAPSHOT", "pom" );
+ itr.deleteArtifact( "testing", "first-project", "1.0-SNAPSHOT", "jar" );
+ itr.deleteArtifact( "testing", "second-project", "1.0-SNAPSHOT", "jar" );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2068ReactorRelativeParentsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2068ReactorRelativeParentsTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2068ReactorRelativeParentsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2068ReactorRelativeParentsTest.java Sun Jul 27 18:34:23 2008
@@ -51,22 +51,22 @@
File testDir = extractTestResources( getClass(), "/mng-2068-reactorRelativeParents" );
File projectDir = new File( testDir, "frameworks" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
/*
* We must first make sure that any artifact created
* by this test has been removed from the local
* repository. Failing to do this could cause
- * unstable test results. Fortunately, the verifier
+ * unstable test results. Fortunately, the itr
* makes it easy to do this.
*/
- verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
- verifier.deleteArtifact( "samplegroup", "master", "0.0.1", "pom" );
- verifier.deleteArtifact( "samplegroup", "frameworks", "0.0.1", "pom" );
- verifier.deleteArtifact( "samplegroup", "core", "1.0.0", "pom" );
+ itr.deleteArtifact( "samplegroup", "master", "0.0.1", "pom" );
+ itr.deleteArtifact( "samplegroup", "frameworks", "0.0.1", "pom" );
+ itr.deleteArtifact( "samplegroup", "core", "1.0.0", "pom" );
- verifier.executeGoal( "validate" );
+ itr.executeGoal( "validate" );
/*
* This is the simplest way to check a build
@@ -74,15 +74,15 @@
* an IT test: make the build pass when the test
* should pass, and make the build fail when the
* test should fail. There are other methods
- * supported by the verifier. They can be seen here:
- * http://maven.apache.org/shared/maven-verifier/apidocs/index.html
+ * supported by the itr. They can be seen here:
+ * http://maven.apache.org/shared/maven-itr/apidocs/index.html
*/
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
/*
- * Reset the streams before executing the verifier
+ * Reset the streams before executing the itr
* again.
*/
- verifier.resetStreams();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java Sun Jul 27 18:34:23 2008
@@ -27,24 +27,24 @@
// file.
File testDir = extractTestResources( getClass(), "/mng-2123-npe-with-conflicting-ranges" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
/*
* We must first make sure that any artifact created
* by this test has been removed from the local
* repository. Failing to do this could cause
- * unstable test results. Fortunately, the verifier
+ * unstable test results. Fortunately, the itr
* makes it easy to do this.
*/
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng2123", "parent", "1.0", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2123", "artifact-combined", "1.0", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2123", "artifact-fix", "1.0", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2123", "artifact-range", "1.0", "jar" );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.mng2123", "parent", "1.0", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2123", "artifact-combined", "1.0", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2123", "artifact-fix", "1.0", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2123", "artifact-range", "1.0", "jar" );
/*
* The Command Line Options (CLI) are passed to the
- * verifier as a list. This is handy for things like
+ * itr as a list. This is handy for things like
* redefining the local repository if needed. In
* this case, we use the -N flag so that Maven won't
* recurse. We are only installing the parent pom to
@@ -52,7 +52,7 @@
*/
List cliOptions = new ArrayList();
cliOptions.add( "-N" );
- verifier.executeGoal( "install" );
+ itr.executeGoal( "install" );
/*
* This is the simplest way to check a build
@@ -60,32 +60,32 @@
* an IT test: make the build pass when the test
* should pass, and make the build fail when the
* test should fail. There are other methods
- * supported by the verifier. They can be seen here:
- * http://maven.apache.org/shared/maven-verifier/apidocs/index.html
+ * supported by the itr. They can be seen here:
+ * http://maven.apache.org/shared/maven-itr/apidocs/index.html
*/
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
/*
- * Reset the streams before executing the verifier
+ * Reset the streams before executing the itr
* again.
*/
- verifier.resetStreams();
+ itr.resetStreams();
/*
* Build the artifact with a fix version of commons-collections
*/
- verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-fix" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-fix" ).getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
/*
* Build the artifact with a version range of commons-collections
*/
- verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-range" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-range" ).getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
/*
* Now we are running the actual test.
@@ -93,10 +93,10 @@
* artifact that uses the artifacts above.
* On any version >= 2.0.9 it should work
*/
- verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-combined" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-combined" ).getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java Sun Jul 27 18:34:23 2008
@@ -20,14 +20,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/mng-2234-activeProfilesFromSettings" );
- IntegrationTestRunner verifier;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr;
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
cliOptions.add( "settings.xml" );
- verifier.executeGoal( "install", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.resetStreams();
+ itr.executeGoal( "install", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.assertFilePresent( "target/touch.txt" );
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java Sun Jul 27 18:34:23 2008
@@ -29,14 +29,14 @@
// file.
File testDir = extractTestResources( getClass(), "/mng-2254-PomEncoding" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-N" );
- verifier.executeGoal( "compile" );
+ itr.executeGoal( "compile" );
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java Sun Jul 27 18:34:23 2008
@@ -28,31 +28,31 @@
// file.
File testDir = extractTestResources( getClass(), "/mng2277aggregatorPlugins" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
/*
* We must first make sure that any artifact created
* by this test has been removed from the local
* repository. Failing to do this could cause
- * unstable test results. Fortunately, the verifier
+ * unstable test results. Fortunately, the itr
* makes it easy to do this.
*/
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng2277", "parent", "1.0", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2277", "test", "1.0", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2277", "assembly", "1.0", "jar" );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.mng2277", "parent", "1.0", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2277", "test", "1.0", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2277", "assembly", "1.0", "jar" );
/*
* The Command Line Options (CLI) are passed to the
- * verifier as a list. This is handy for things like
+ * itr as a list. This is handy for things like
* redefining the local repository if needed. In
* this case, we use the -N flag so that Maven won't
* recurse. We are only installing the parent pom to
* the local repo here.
*/
List cliOptions = new ArrayList();
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-all:aggregator-dependencies" );
+ itr.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-all:aggregator-dependencies" );
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.java Sun Jul 27 18:34:23 2008
@@ -38,13 +38,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/mng-2339-badProjectInterpolation/a" );
- IntegrationTestRunner verifier;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr;
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dversion=foo" );
- verifier.executeGoal( "validate", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "validate", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
// test that -Dversion=1.0 is still available for interpolation.
@@ -53,27 +53,27 @@
{
File testDir = extractTestResources( getClass(), "/mng-2339-badProjectInterpolation/b" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "initialize" );
+ itr.executeGoal( "initialize" );
assertTrue( "Touchfile using ${project.version} for ${version} does not exist.",
new File( testDir, "target/touch-1.txt" ).exists() );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
File logFile = new File( testDir, "log.txt" );
logFile.renameTo( new File( testDir, "log-pom-specified.txt" ) );
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dversion=2" );
- verifier.executeGoal( "initialize", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "initialize", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
logFile.renameTo( new File( testDir, "log-cli-specified.txt" ) );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2562Timestamp.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2562Timestamp.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2562Timestamp.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2562Timestamp.java Sun Jul 27 18:34:23 2008
@@ -16,10 +16,10 @@
public void testitMNG2562() throws Exception {
File testDir = extractTestResources(getClass(),
"/mng-2562-timestamp");
- IntegrationTestRunner verifier = new IntegrationTestRunner(testDir.getAbsolutePath());
- verifier.executeGoal("verify");
+ IntegrationTestRunner itr = new IntegrationTestRunner(testDir.getAbsolutePath());
+ itr.executeGoal("verify");
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2695OfflinePluginSnapshotsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2695OfflinePluginSnapshotsTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2695OfflinePluginSnapshotsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2695OfflinePluginSnapshotsTest.java Sun Jul 27 18:34:23 2008
@@ -78,15 +78,15 @@
File testPlugin = new File( testParentDir, "plugin" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testPlugin.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testPlugin.getAbsolutePath() );
// Deploy the dependency to the test repository.
- verifier.executeGoal( "deploy" );
+ itr.executeGoal( "deploy" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
- String pluginPath = verifier.getArtifactPath( "org.apache.maven.its.mng2695", "plugin", "1.0-SNAPSHOT", "pom" );
+ String pluginPath = itr.getArtifactPath( "org.apache.maven.its.mng2695", "plugin", "1.0-SNAPSHOT", "pom" );
File plugin = new File( pluginPath );
plugin = plugin.getParentFile().getParentFile();
@@ -96,7 +96,7 @@
File testProject = new File( testParentDir, "project" );
- verifier = new IntegrationTestRunner( testProject.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testProject.getAbsolutePath() );
// Conditions for this build:
// 1. plugin is NOT in local repository
@@ -107,7 +107,7 @@
{
List cliOptions = new ArrayList();
cliOptions.add( "-o" );
- verifier.executeGoal( "compile", cliOptions );
+ itr.executeGoal( "compile", cliOptions );
fail( "Plugin should be missing from local repo, and in offline this should make the project build fail." );
}
catch( IntegrationTestException e )
@@ -116,7 +116,7 @@
}
finally
{
- verifier.resetStreams();
+ itr.resetStreams();
}
// move this log file off to a new name to make room for the next build.
@@ -133,12 +133,12 @@
// Expected outcome: build success
try
{
- verifier.executeGoal( "compile" );
+ itr.executeGoal( "compile" );
}
finally
{
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
// move this log file off to a new name to make room for the next build.
@@ -156,12 +156,12 @@
{
List cliOptions = new ArrayList();
cliOptions.add( "-o" );
- verifier.executeGoal( "compile", cliOptions );
+ itr.executeGoal( "compile", cliOptions );
}
finally
{
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2739RequiredRepositoryElements.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2739RequiredRepositoryElements.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2739RequiredRepositoryElements.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2739RequiredRepositoryElements.java Sun Jul 27 18:34:23 2008
@@ -50,13 +50,13 @@
{
File testDir = extractTestResources( getClass(), "/mng-2739/repo-id" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
try
{
- verifier.executeGoal( "validate" );
+ itr.executeGoal( "validate" );
fail( "POM should NOT validate: repository <id/> element is missing in: "
+ new File( testDir, "pom.xml" ) );
@@ -65,9 +65,9 @@
{
}
- verifier.resetStreams();
+ itr.resetStreams();
- List listing = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ List listing = itr.loadFile( new File( testDir, "log.txt" ), false );
boolean foundNpe = false;
for ( Iterator it = listing.iterator(); it.hasNext(); )
{
@@ -89,13 +89,13 @@
// file.
File testDir = extractTestResources( getClass(), "/mng-2739/repo-url" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
try
{
- verifier.executeGoal( "validate" );
+ itr.executeGoal( "validate" );
fail( "POM should NOT validate: repository <url/> element is missing in: "
+ new File( testDir, "pom.xml" ) );
@@ -104,9 +104,9 @@
{
}
- verifier.resetStreams();
+ itr.resetStreams();
- List listing = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ List listing = itr.loadFile( new File( testDir, "log.txt" ), false );
boolean foundNpe = false;
for ( Iterator it = listing.iterator(); it.hasNext(); )
{
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.java Sun Jul 27 18:34:23 2008
@@ -26,16 +26,16 @@
{
File testDir = extractTestResources( getClass(), "/mng-2744-checksumVerification" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng2744", "a", "1", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2744", "a", "1", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2744", "b", "1", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2744", "b", "1", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2744", "a", "1", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2744", "a", "1", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2744", "b", "1", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2744", "b", "1", "jar" );
- verifier.executeGoal( "compile" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "compile" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java Sun Jul 27 18:34:23 2008
@@ -24,24 +24,24 @@
// file.
File testDir = extractTestResources( getClass(), "/mng-2861relocationsAndRanges" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
/*
* We must first make sure that any artifact created
* by this test has been removed from the local
* repository. Failing to do this could cause
- * unstable test results. Fortunately, the verifier
+ * unstable test results. Fortunately, the itr
* makes it easy to do this.
*/
- verifier = new IntegrationTestRunner( new File(testDir,"MNG-2861").getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng2861", "MNG-2861", "1.0-SNAPSHOT", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2861", "A", "1.0-SNAPSHOT", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2861", "B", "1.0-SNAPSHOT", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2861", "C", "1.0-SNAPSHOT", "jar" );
+ itr = new IntegrationTestRunner( new File(testDir,"MNG-2861").getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.mng2861", "MNG-2861", "1.0-SNAPSHOT", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2861", "A", "1.0-SNAPSHOT", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2861", "B", "1.0-SNAPSHOT", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2861", "C", "1.0-SNAPSHOT", "jar" );
- verifier.executeGoal( "install" );
+ itr.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java Sun Jul 27 18:34:23 2008
@@ -22,7 +22,7 @@
* This is a sample integration test. The IT tests typically
* operate by having a sample project in the
* /src/test/resources folder along with a junit test like
- * this one. The junit test uses the verifier (which uses
+ * this one. The junit test uses the itr (which uses
* the invoker) to invoke a new instance of Maven on the
* project in the resources folder. It then checks the
* results. This is a non-trivial example that shows two
@@ -48,9 +48,9 @@
"/mng-2883-legacy-repo-offline/"
+ testName );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
File settings = writeSettings( testDir );
List cliOptions = new ArrayList();
@@ -62,7 +62,7 @@
try
{
// this will ensure that all relevant plugins are present.
- verifier.executeGoal( "initialize", cliOptions );
+ itr.executeGoal( "initialize", cliOptions );
}
catch ( IntegrationTestException e )
{
@@ -74,7 +74,7 @@
// clear out the parent POM if it's in the local repository.
- verifier.deleteArtifact( "org.apache.maven.its.mng2883", "parent", "1.0-SNAPSHOT", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2883", "parent", "1.0-SNAPSHOT", "pom" );
try
{
@@ -83,7 +83,7 @@
.setCliOptions( cliOptions )
.setAutoclean( false );
- verifier.invoke( r );
+ itr.invoke( r );
fail( "Build should fail with unresolvable parent POM." );
}
@@ -95,7 +95,7 @@
missingMessages.add( "System is offline." );
missingMessages.add( "org.apache.maven.its.mng2883:parent:pom:1.0-SNAPSHOT" );
- List lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ List lines = itr.loadFile( new File( testDir, "log.txt" ), false );
for ( Iterator it = lines.iterator(); it.hasNext(); )
{
@@ -139,9 +139,9 @@
"/mng-2883-legacy-repo-offline/"
+ testName );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
@@ -154,7 +154,7 @@
try
{
// this will ensure that all relevant plugins are present.
- verifier.executeGoal( "compile", cliOptions );
+ itr.executeGoal( "compile", cliOptions );
}
catch ( IntegrationTestException e )
{
@@ -165,12 +165,12 @@
cliOptions.add( "-o" );
// clear out the dependency if it's in the local repository.
- verifier.deleteArtifact( "org.apache.maven.its.mng2883", "dep", "1.0-SNAPSHOT", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2883", "dep", "1.0-SNAPSHOT", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2883", "dep", "1.0-SNAPSHOT", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2883", "dep", "1.0-SNAPSHOT", "jar" );
try
{
- verifier.executeGoal( "compile", cliOptions );
+ itr.executeGoal( "compile", cliOptions );
fail( "Build should fail with unresolvable dependency artifact." );
}
@@ -184,7 +184,7 @@
missingMessages.add( "offline mode." );
missingMessages.add( "org.apache.maven.its.mng2883:dep:jar:1.0-SNAPSHOT" );
- List lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ List lines = itr.loadFile( new File( testDir, "log.txt" ), false );
for ( Iterator it = lines.iterator(); it.hasNext(); )
{
@@ -228,9 +228,9 @@
"/mng-2883-legacy-repo-offline/"
+ testName );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
@@ -244,12 +244,12 @@
cliOptions.add( settings.getAbsolutePath() );
// clear out the dependency if it's in the local repository.
- verifier.deleteArtifact( "org.apache.maven.its.mng2883", "plugin", "1.0-SNAPSHOT", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2883", "plugin", "1.0-SNAPSHOT", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2883", "plugin", "1.0-SNAPSHOT", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2883", "plugin", "1.0-SNAPSHOT", "jar" );
try
{
- verifier.executeGoal( "org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run", cliOptions );
+ itr.executeGoal( "org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run", cliOptions );
fail( "Build should fail with unresolvable plugin artifact." );
}
@@ -261,7 +261,7 @@
missingMessages.add( "System is offline." );
missingMessages.add( "org.apache.maven.its.mng2883:plugin:pom:1.0-SNAPSHOT" );
- List lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ List lines = itr.loadFile( new File( testDir, "log.txt" ), false );
for ( Iterator it = lines.iterator(); it.hasNext(); )
{
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java Sun Jul 27 18:34:23 2008
@@ -26,36 +26,36 @@
// file.
File testDir = extractTestResources( getClass(), "/mng2972-overridingPluginDependency" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
/*
* We must first make sure that any artifact created by this test has been removed from the local repository.
- * Failing to do this could cause unstable test results. Fortunately, the verifier makes it easy to do this.
+ * Failing to do this could cause unstable test results. Fortunately, the itr makes it easy to do this.
*/
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng2972", "user", "1.0", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2972", "mojo", "0.0.1-SNAPSHOT", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2972", "dep", "1.0", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2972", "dep", "2.0", "jar" );
-
- verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "dep1" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
-
- verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "dep2" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
-
- verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
-
- verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath() );
- verifier.executeGoal( "validate" );
- verifier.verifyErrorFreeLog();
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.mng2972", "user", "1.0", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2972", "mojo", "0.0.1-SNAPSHOT", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2972", "dep", "1.0", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng2972", "dep", "2.0", "jar" );
+
+ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "dep1" ).getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+
+ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "dep2" ).getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+
+ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo" ).getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+
+ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath() );
+ itr.executeGoal( "validate" );
+ itr.verifyErrorFreeLog();
List lines =
- verifier.loadFile( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath(), "log.txt", false );
+ itr.loadFile( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath(), "log.txt", false );
int foundVersionOne = 0;
int foundVersionTwo = 0;
for ( Iterator i = lines.iterator(); i.hasNext(); )
@@ -68,7 +68,7 @@
foundVersionTwo++;
}
- verifier.resetStreams();
+ itr.resetStreams();
Assert.assertEquals( "Should not be using plugin dependency version 1", 0, foundVersionOne );
Assert.assertEquals( "Should be using plugin version 2 once.", 1, foundVersionTwo );
@@ -77,11 +77,11 @@
* Now try to execute the plugin directly
*/
- verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath() );
- verifier.executeGoal( "org.apache.maven.its.mng2972:mojo:0.0.1-SNAPSHOT:test" );
- verifier.verifyErrorFreeLog();
+ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath() );
+ itr.executeGoal( "org.apache.maven.its.mng2972:mojo:0.0.1-SNAPSHOT:test" );
+ itr.verifyErrorFreeLog();
- lines = verifier.loadFile( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath(), "log.txt", false );
+ lines = itr.loadFile( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath(), "log.txt", false );
foundVersionOne = 0;
foundVersionTwo = 0;
for ( Iterator i = lines.iterator(); i.hasNext(); )
@@ -94,7 +94,7 @@
foundVersionTwo++;
}
- verifier.resetStreams();
+ itr.resetStreams();
Assert.assertEquals( "Should not be using plugin dependency version 1", 0, foundVersionOne );
Assert.assertEquals( "Should be using plugin version 2 once.", 1, foundVersionTwo );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java Sun Jul 27 18:34:23 2008
@@ -81,27 +81,27 @@
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
// First, build the two levels of dependencies that will be resolved.
// This one is a transitive dependency, and will be deployed to a
// repository that is NOT listed in the main project's POM (wombat).
- verifier = new IntegrationTestRunner( foo.getAbsolutePath() );
- verifier.executeGoal( "deploy", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr = new IntegrationTestRunner( foo.getAbsolutePath() );
+ itr.executeGoal( "deploy", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
// This one is a direct dependency that will be deployed to a repository
// that IS listed in the main project's POM (wombat). It lists its own
// repository entry that should enable resolution of the transitive
// dependency it lists (foo, above).
- verifier = new IntegrationTestRunner( bar.getAbsolutePath() );
- verifier.executeGoal( "deploy", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr = new IntegrationTestRunner( bar.getAbsolutePath() );
+ itr.executeGoal( "deploy", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
- String artifactPath = verifier.getArtifactPath( "org.mule", "mule-foo", "1.0-SNAPSHOT", "jar" );
+ String artifactPath = itr.getArtifactPath( "org.mule", "mule-foo", "1.0-SNAPSHOT", "jar" );
File artifact = new File( artifactPath );
File dir = artifact.getParentFile().getParentFile().getParentFile();
@@ -111,10 +111,10 @@
// project (above) was deployed. It should be able to use the
// repositories declared in the bar POM to find the transitive dependency
// (foo, top).
- verifier = new IntegrationTestRunner( wombat.getAbsolutePath() );
- verifier.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr = new IntegrationTestRunner( wombat.getAbsolutePath() );
+ itr.executeGoal( "package", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
private void rewritePom( File pomFile,
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.java Sun Jul 27 18:34:23 2008
@@ -13,7 +13,7 @@
/**
* This is a sample integration test. The IT tests typically operate by having a sample project in
* the /src/test/resources folder along with a junit test like this one. The junit test uses the
- * verifier (which uses the invoker) to invoke a new instance of Maven on the project in the
+ * itr (which uses the invoker) to invoke a new instance of Maven on the project in the
* resources folder. It then checks the results. This is a non-trivial example that shows two
* phases. See more information inline in the code.
*
@@ -38,19 +38,19 @@
File plugin = new File( testDir, "plugin" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( plugin.getAbsolutePath() );
+ itr = new IntegrationTestRunner( plugin.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ itr.executeGoal( "install" );
/*
- * Reset the streams before executing the verifier
+ * Reset the streams before executing the itr
* again.
*/
- verifier.resetStreams();
+ itr.resetStreams();
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
/*
* Use the settings for this test, which contains the profile we're looking for.
@@ -64,9 +64,9 @@
.setCliOptions( cliOptions )
.setAutoclean( false );
- verifier.invoke( r );
+ itr.invoke( r );
- List lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ List lines = itr.loadFile( new File( testDir, "log.txt" ), false );
boolean found = false;
for ( Iterator it = lines.iterator(); it.hasNext(); )
{
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3106ProfileMultipleActivators.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3106ProfileMultipleActivators.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3106ProfileMultipleActivators.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3106ProfileMultipleActivators.java Sun Jul 27 18:34:23 2008
@@ -32,18 +32,18 @@
{
File testDir = extractTestResources( getClass(), "/mng-3106-ProfileMultipleActivators" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dprofile1.on=true" );
- verifier.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/profile1/touch.txt" );
- verifier.assertFilePresent( "target/profile2/touch.txt" );
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.assertFilePresent( "target/profile1/touch.txt" );
+ itr.assertFilePresent( "target/profile2/touch.txt" );
+ itr.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java Sun Jul 27 18:34:23 2008
@@ -24,19 +24,19 @@
"/mng-3220-importedDepMgmt/imported-pom-depMgmt" );
File dmDir = new File( testDir, "dm-pom" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( dmDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( dmDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ itr.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
File projectDir = new File( testDir, "project" );
- verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "package" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
public void testitMNG3220b()
@@ -45,20 +45,20 @@
File testDir = extractTestResources( getClass(),
"/mng-3220-importedDepMgmt/depMgmt-pom-module-notImported" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
try
{
- verifier.executeGoal( "install" );
+ itr.executeGoal( "install" );
fail( "Should fail to build with missing junit version." );
}
catch ( IntegrationTestException e )
{
}
- verifier.resetStreams();
+ itr.resetStreams();
- List lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ List lines = itr.loadFile( new File( testDir, "log.txt" ), false );
boolean found = false;
for ( Iterator it = lines.iterator(); it.hasNext(); )
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java Sun Jul 27 18:34:23 2008
@@ -25,30 +25,30 @@
File reportDir = new File( testDir, "report" );
File projectDir = new File( testDir, "user" );
- IntegrationTestRunner verifier = null;
+ IntegrationTestRunner itr = null;
try
{
- verifier = new IntegrationTestRunner( reportDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( reportDir.getAbsolutePath() );
- verifier.deleteArtifact( "tests", "maven-forking-report-plugin", "1", "jar" );
+ itr.deleteArtifact( "tests", "maven-forking-report-plugin", "1", "jar" );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
- verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Psite" );
- verifier.executeGoal( "site", cliOptions );
- verifier.verifyErrorFreeLog();
+ itr.executeGoal( "site", cliOptions );
+ itr.verifyErrorFreeLog();
}
finally
{
- if ( verifier != null )
+ if ( itr != null )
{
- verifier.resetStreams();
+ itr.resetStreams();
}
File logFile = new File( projectDir, "log.txt" );
@@ -67,30 +67,30 @@
File pluginDir = new File( testDir, "plugin" );
File projectDir = new File( testDir, "user" );
- IntegrationTestRunner verifier = null;
+ IntegrationTestRunner itr = null;
try
{
- verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
- verifier.deleteArtifact( "tests", "maven-forking-test-plugin", "1", "jar" );
+ itr.deleteArtifact( "tests", "maven-forking-test-plugin", "1", "jar" );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
- verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Pplugin" );
- verifier.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
+ itr.executeGoal( "package", cliOptions );
+ itr.verifyErrorFreeLog();
}
finally
{
- if ( verifier != null )
+ if ( itr != null )
{
- verifier.resetStreams();
+ itr.resetStreams();
}
File logFile = new File( projectDir, "log.txt" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java Sun Jul 27 18:34:23 2008
@@ -13,15 +13,15 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/mng-3259-depsDroppedInMultiModuleBuild" );
- IntegrationTestRunner verifier;
- verifier = new IntegrationTestRunner( new File( testDir, "parent" ).getAbsolutePath() );
+ IntegrationTestRunner itr;
+ itr = new IntegrationTestRunner( new File( testDir, "parent" ).getAbsolutePath() );
List cliOptions = new ArrayList();
- verifier.executeGoal( "install", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "install", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3268MultipleDashPCommandLine.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3268MultipleDashPCommandLine.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3268MultipleDashPCommandLine.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3268MultipleDashPCommandLine.java Sun Jul 27 18:34:23 2008
@@ -21,20 +21,20 @@
{
File testDir = extractTestResources( getClass(), "/mng-3268-MultipleDashPCommandLine" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Pprofile1,profile2" );
cliOptions.add( "-Pprofile3" );
cliOptions.add( "-P profile4" );
- verifier.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/profile1/touch.txt" );
- verifier.assertFilePresent( "target/profile2/touch.txt" );
- verifier.assertFilePresent( "target/profile3/touch.txt" );
- verifier.assertFilePresent( "target/profile4/touch.txt" );
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.assertFilePresent( "target/profile1/touch.txt" );
+ itr.assertFilePresent( "target/profile2/touch.txt" );
+ itr.assertFilePresent( "target/profile3/touch.txt" );
+ itr.assertFilePresent( "target/profile4/touch.txt" );
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java Sun Jul 27 18:34:23 2008
@@ -29,32 +29,32 @@
// file.
File testDir = extractTestResources( getClass(), "/mng3284-usingCachedPlugins" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
/*
* Build Mojo v1
*/
- verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo" ).getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
/*
* Build Mojo v2
*/
- verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo2" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo2" ).getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
/*
* Run the simple build
*/
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
- List lines = verifier.loadFile( testDir.getAbsolutePath(), "log.txt", false );
+ List lines = itr.loadFile( testDir.getAbsolutePath(), "log.txt", false );
int foundVersionOne = 0;
int foundVersionTwo = 0;
for ( Iterator i = lines.iterator(); i.hasNext(); )
@@ -67,7 +67,7 @@
foundVersionTwo++;
}
- verifier.resetStreams();
+ itr.resetStreams();
Assert.assertEquals( "Should be using plugin version 1 only once.", 1,foundVersionOne );
Assert.assertEquals( "Should be using plugin version 2 only once.", 1,foundVersionTwo );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3314OfflineSnapshotsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3314OfflineSnapshotsTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3314OfflineSnapshotsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3314OfflineSnapshotsTest.java Sun Jul 27 18:34:23 2008
@@ -78,15 +78,15 @@
File testDep = new File( testParentDir, "dep" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDep.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDep.getAbsolutePath() );
// Deploy the dependency to the test repository.
- verifier.executeGoal( "deploy" );
+ itr.executeGoal( "deploy" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
- String depPath = verifier.getArtifactPath( "org.apache.maven.its.mng3314", "dep", "1.0-SNAPSHOT", "pom" );
+ String depPath = itr.getArtifactPath( "org.apache.maven.its.mng3314", "dep", "1.0-SNAPSHOT", "pom" );
File dep = new File( depPath );
dep = dep.getParentFile().getParentFile();
@@ -96,7 +96,7 @@
File testProject = new File( testParentDir, "project" );
- verifier = new IntegrationTestRunner( testProject.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testProject.getAbsolutePath() );
// Conditions for this build:
// 1. dependency is NOT in local repository
@@ -107,7 +107,7 @@
{
List cliOptions = new ArrayList();
cliOptions.add( "-o" );
- verifier.executeGoal( "compile", cliOptions );
+ itr.executeGoal( "compile", cliOptions );
fail( "Dependency should be missing from local repo, and in offline this should make the project build fail." );
}
@@ -117,7 +117,7 @@
}
finally
{
- verifier.resetStreams();
+ itr.resetStreams();
}
// move this log file off to a new name to make room for the next build.
@@ -134,12 +134,12 @@
// Expected outcome: build success
try
{
- verifier.executeGoal( "compile" );
+ itr.executeGoal( "compile" );
}
finally
{
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
// move this log file off to a new name to make room for the next build.
@@ -157,12 +157,12 @@
{
List cliOptions = new ArrayList();
cliOptions.add( "-o" );
- verifier.executeGoal( "compile", cliOptions );
+ itr.executeGoal( "compile", cliOptions );
}
finally
{
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3331ModulePathNormalization.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3331ModulePathNormalization.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3331ModulePathNormalization.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3331ModulePathNormalization.java Sun Jul 27 18:34:23 2008
@@ -8,7 +8,7 @@
* This is a sample integration test. The IT tests typically
* operate by having a sample project in the
* /src/test/resources folder along with a junit test like
- * this one. The junit test uses the verifier (which uses
+ * this one. The junit test uses the itr (which uses
* the invoker) to invoke a new instance of Maven on the
* project in the resources folder. It then checks the
* results. This is a non-trivial example that shows two
@@ -26,11 +26,11 @@
//testMNG3331ModuleWithSpaces
File testDir = extractTestResources( getClass(), "/mng-3331-modulePathNormalization/with-spaces" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "initialize" );
+ itr.executeGoal( "initialize" );
/*
* This is the simplest way to check a build
@@ -38,16 +38,16 @@
* an IT test: make the build pass when the test
* should pass, and make the build fail when the
* test should fail. There are other methods
- * supported by the verifier. They can be seen here:
- * http://maven.apache.org/shared/maven-verifier/apidocs/index.html
+ * supported by the itr. They can be seen here:
+ * http://maven.apache.org/shared/maven-itr/apidocs/index.html
*/
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
/*
- * Reset the streams before executing the verifier
+ * Reset the streams before executing the itr
* again.
*/
- verifier.resetStreams();
+ itr.resetStreams();
}
public void testitMNG3331b ()
@@ -56,11 +56,11 @@
//testMNG3331ModuleWithRelativeParentDirRef
File testDir = extractTestResources( getClass(), "/mng-3331-modulePathNormalization/with-relative-parentDir-ref" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( new File( testDir, "parent" ).getAbsolutePath() );
+ itr = new IntegrationTestRunner( new File( testDir, "parent" ).getAbsolutePath() );
- verifier.executeGoal( "initialize" );
+ itr.executeGoal( "initialize" );
/*
* This is the simplest way to check a build
@@ -68,16 +68,16 @@
* an IT test: make the build pass when the test
* should pass, and make the build fail when the
* test should fail. There are other methods
- * supported by the verifier. They can be seen here:
- * http://maven.apache.org/shared/maven-verifier/apidocs/index.html
+ * supported by the itr. They can be seen here:
+ * http://maven.apache.org/shared/maven-itr/apidocs/index.html
*/
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
/*
- * Reset the streams before executing the verifier
+ * Reset the streams before executing the itr
* again.
*/
- verifier.resetStreams();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.java Sun Jul 27 18:34:23 2008
@@ -32,16 +32,16 @@
FileUtils.deleteDirectory( targetRepository );
FileUtils.copyDirectoryStructure( new File( testDir, "deployment-repository" ), targetRepository );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
cliOptions.add( "settings.xml" );
- verifier.executeGoal( "deploy", cliOptions );
+ itr.executeGoal( "deploy", cliOptions );
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
Xpp3Dom dom = readDom( new File( targetRepository,
"org/apache/maven/its/mng3341/test-artifact/1.0-SNAPSHOT/maven-metadata.xml" ) );
@@ -52,7 +52,7 @@
assertEquals( "other-plugin", plugins[0].getChild( "prefix" ).getValue() );
assertEquals( "test-artifact", plugins[1].getChild( "prefix" ).getValue() );
- verifier.resetStreams();
+ itr.resetStreams();
}
private Xpp3Dom readDom( File file )