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 [5/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/MavenITmng3355TranslatedPathInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3355TranslatedPathInterpolationTest.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/MavenITmng3355TranslatedPathInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3355TranslatedPathInterpolationTest.java Sun Jul 27 18:34:23 2008
@@ -38,11 +38,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/mng-3355" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner 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();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3372DirectInvocationOfPlugins.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3372DirectInvocationOfPlugins.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/MavenITmng3372DirectInvocationOfPlugins.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3372DirectInvocationOfPlugins.java Sun Jul 27 18:34:23 2008
@@ -12,7 +12,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
@@ -35,18 +35,18 @@
File project = new File( testBaseDir, "project" );
File settingsFile = new File( testBaseDir, "settings.xml" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( plugin.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng3372", "mng3372-maven-plugin", "1", "jar" );
- verifier.executeGoal( "clean, install" );
- verifier = new IntegrationTestRunner( project.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( plugin.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.mng3372", "mng3372-maven-plugin", "1", "jar" );
+ itr.executeGoal( "clean, install" );
+ itr = new IntegrationTestRunner( project.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
cliOptions.add( "\"" + settingsFile.getAbsolutePath() + "\"" );
- verifier.executeGoal( "mng3372:test", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "mng3372:test", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
public void testDependencyTreeInvocation()
@@ -55,11 +55,11 @@
// The testdir is computed from the location of this
// file.
File testBaseDir = extractTestResources( getClass(), "/mng-3372-directInvocationOfPlugins/dependency-tree" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testBaseDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testBaseDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-U" );
- verifier.executeGoal( "dependency:tree", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "dependency:tree", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.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/MavenITmng3380ManagedRelocatedTransdepsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java Sun Jul 27 18:34:23 2008
@@ -32,21 +32,21 @@
// compute test directory
File testDir = extractTestResources( getClass(), "/mng-3380-managedRelocatedTransdeps" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- deleteArtifacts( verifier );
+ deleteArtifacts( itr );
installDependencies( testDir );
String path = testDir.getAbsolutePath() //
+ "/consumer";
- verifier = new IntegrationTestRunner( path );
- verifier.executeGoal( "package" );
+ itr = new IntegrationTestRunner( path );
+ itr.executeGoal( "package" );
// verify no errors so far
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
private void installDependencies( File testDir )
@@ -55,207 +55,207 @@
// install projects
String path = testDir.getAbsolutePath() //
+ "/other-c";
- IntegrationTestRunner verifier = new IntegrationTestRunner( path );
- verifier.executeGoal( "install" );
+ IntegrationTestRunner itr = new IntegrationTestRunner( path );
+ itr.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/other-b";
- verifier = new IntegrationTestRunner( path );
- verifier.executeGoal( "install" );
+ itr = new IntegrationTestRunner( path );
+ itr.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/other-a";
- verifier = new IntegrationTestRunner( path );
- verifier.executeGoal( "install" );
+ itr = new IntegrationTestRunner( path );
+ itr.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/transdep-old";
- verifier = new IntegrationTestRunner( path );
- verifier.executeGoal( "install" );
+ itr = new IntegrationTestRunner( path );
+ itr.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/transdep-new-1";
- verifier = new IntegrationTestRunner( path );
- verifier.executeGoal( "install" );
+ itr = new IntegrationTestRunner( path );
+ itr.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/transdep-new-2";
- verifier = new IntegrationTestRunner( path );
- verifier.executeGoal( "install" );
+ itr = new IntegrationTestRunner( path );
+ itr.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/direct-dep";
- verifier = new IntegrationTestRunner( path );
- verifier.executeGoal( "install" );
+ itr = new IntegrationTestRunner( path );
+ itr.executeGoal( "install" );
}
- private void deleteArtifacts( IntegrationTestRunner verifier )
+ private void deleteArtifacts( IntegrationTestRunner itr )
throws Exception
{
// delete projects
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"other-groupId", //
"other-artifactId-c", //
"1", //
"jar" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"other-groupId", //
"other-artifactId-c", //
"1", //
"pom" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"other-groupId", //
"other-artifactId-c", //
"1", //
"jar" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"other-groupId", //
"other-artifactId-c", //
"1", //
"pom" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"other-groupId", //
"other-artifactId-b", //
"1", //
"jar" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"other-groupId", //
"other-artifactId-b", //
"1", //
"pom" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"other-groupId", //
"other-artifactId-b", //
"1", //
"jar" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"other-groupId", //
"other-artifactId-b", //
"1", //
"pom" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"other-groupId", //
"other-artifactId-a", //
"1", //
"jar" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"other-groupId", //
"other-artifactId-a", //
"1", //
"pom" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"other-groupId", //
"other-artifactId-a", //
"1", //
"jar" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"other-groupId", //
"other-artifactId-a", //
"1", //
"pom" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"transitive-dependency-old-groupId", //
"transitive-dependency-artifactId", //
"1", //
"jar" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"transitive-dependency-old-groupId", //
"transitive-dependency-artifactId", //
"1", //
"pom" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"transitive-dependency-old-groupId", //
"transitive-dependency-artifactId", //
"1", //
"jar" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"transitive-dependency-old-groupId", //
"transitive-dependency-artifactId", //
"1", //
"pom" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"transitive-dependency-new-groupId", //
"transitive-dependency-artifactId", //
"1", //
"jar" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"transitive-dependency-new-groupId", //
"transitive-dependency-artifactId", //
"1", //
"pom" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"transitive-dependency-new-groupId", //
"transitive-dependency-artifactId", //
"1", //
"jar" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"transitive-dependency-new-groupId", //
"transitive-dependency-artifactId", //
"1", //
"pom" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"transitive-dependency-new-groupId", //
"transitive-dependency-artifactId", //
"2", //
"jar" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"transitive-dependency-new-groupId", //
"transitive-dependency-artifactId", //
"2", //
"pom" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"transitive-dependency-new-groupId", //
"transitive-dependency-artifactId", //
"2", //
"jar" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"transitive-dependency-new-groupId", //
"transitive-dependency-artifactId", //
"2", //
"pom" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"direct-dependency-groupId", //
"direct-dependency-artifactId", //
"1", //
"jar" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"direct-dependency-groupId", //
"direct-dependency-artifactId", //
"1", //
"pom" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"direct-dependency-groupId", //
"direct-dependency-artifactId", //
"1", //
"jar" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"direct-dependency-groupId", //
"direct-dependency-artifactId", //
"1", //
"pom" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"root-groupId", //
"root-artifactId", //
"1", //
"jar" );
- verifier.deleteArtifact( //
+ itr.deleteArtifact( //
"root-groupId", //
"root-artifactId", //
"1", //
"pom" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"root-groupId", //
"root-artifactId", //
"1", //
"jar" );
- verifier.assertArtifactNotPresent( //
+ itr.assertArtifactNotPresent( //
"root-groupId", //
"root-artifactId", //
"1", //
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3391ImportScopeErrorScenariosTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3391ImportScopeErrorScenariosTest.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/MavenITmng3391ImportScopeErrorScenariosTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3391ImportScopeErrorScenariosTest.java Sun Jul 27 18:34:23 2008
@@ -20,15 +20,15 @@
File testDir = extractTestResources( getClass(),
"/mng-3391-importScopeErrorScenarios/depMgmt-importPom-noParentCycle" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng3391.2", "dm-pom", "1", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng3391.2", "dm-pom", "1", "pom" );
- verifier.executeGoal( "install" );
+ itr.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.resetStreams();
}
public void testitMNG3391b()
@@ -37,18 +37,18 @@
File testDir = extractTestResources( getClass(),
"/mng-3391-importScopeErrorScenarios/depMgmt-importPom-noParentCycle" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng3391.2", "dm-pom", "1", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng3391.2", "dm-pom", "1", "pom" );
IntegrationTestRunner v2 = new IntegrationTestRunner( new File( testDir, "dm-pom" ).getAbsolutePath() );
v2.executeGoal( "install" );
v2.verifyErrorFreeLog();
v2.resetStreams();
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
public void testitMNG3391c()
@@ -57,15 +57,15 @@
File testDir = extractTestResources( getClass(),
"/mng-3391-importScopeErrorScenarios/depMgmt-importPom-parentCycle" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng3391.1", "dm-pom", "1", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng3391.1", "dm-pom", "1", "pom" );
- verifier.executeGoal( "install" );
+ itr.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.resetStreams();
}
public void testitMNG3391d()
@@ -74,10 +74,10 @@
File testDir = extractTestResources( getClass(),
"/mng-3391-importScopeErrorScenarios/depMgmt-importPom-parentCycle" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( new File( testDir, "dm-pom" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( new File( testDir, "dm-pom" ).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/MavenITmng3394POMPluginVersionDominanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.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/MavenITmng3394POMPluginVersionDominanceTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.java Sun Jul 27 18:34:23 2008
@@ -34,11 +34,11 @@
//testShouldUsePluginVersionFromPluginMgmtForLifecycleMojoWhenNotInBuildPlugins
File testDir = extractTestResources( getClass(), BASEDIR_PREFIX + "lifecycleMojoVersionInPluginMgmt" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "install", Collections.singletonList( "-X" ) );
+ itr.executeGoal( "install", Collections.singletonList( "-X" ) );
/*
* This is the simplest way to check a build
@@ -46,12 +46,12 @@
* 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();
- List logFile = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ List logFile = itr.loadFile( new File( testDir, "log.txt" ), false );
boolean foundSiteBeta5 = false;
for ( Iterator it = logFile.iterator(); it.hasNext(); )
@@ -65,10 +65,10 @@
}
/*
- * Reset the streams before executing the verifier
+ * Reset the streams before executing the itr
* again.
*/
- verifier.resetStreams();
+ itr.resetStreams();
assertTrue( "No reference to maven-site-plugin, version 2.0-beta-5 found in build log.", foundSiteBeta5 );
}
@@ -79,15 +79,15 @@
//testShouldPreferPluginVersionFromBuildPluginsOverThatInPluginMgmt
File testDir = extractTestResources( getClass(), BASEDIR_PREFIX + "preferBuildPluginOverPluginMgmt" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
InvocationRequest r = new DefaultInvocationRequest()
.setGoals( "clean" )
.setAutoclean( false );
- verifier.invoke( r );
+ itr.invoke( r );
/*
* This is the simplest way to check a build
@@ -95,15 +95,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/MavenITmng3396DependencyManagementForOverConstrainedRanges.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3396DependencyManagementForOverConstrainedRanges.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/MavenITmng3396DependencyManagementForOverConstrainedRanges.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3396DependencyManagementForOverConstrainedRanges.java Sun Jul 27 18:34:23 2008
@@ -41,35 +41,35 @@
String baseDir = "/mng-3396-dependencyManagementForOverConstrainedRanges";
File testDir = extractTestResources( getClass(), baseDir + "/dependencies" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( GROUP_ID, "A", "1.0", "pom" );
- verifier.deleteArtifact( GROUP_ID, "A", "1.0", "jar" );
- verifier.deleteArtifact( GROUP_ID, "B", "1.0", "pom" );
- verifier.deleteArtifact( GROUP_ID, "B", "1.0", "jar" );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( GROUP_ID, "A", "1.0", "pom" );
+ itr.deleteArtifact( GROUP_ID, "A", "1.0", "jar" );
+ itr.deleteArtifact( GROUP_ID, "B", "1.0", "pom" );
+ itr.deleteArtifact( GROUP_ID, "B", "1.0", "jar" );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
testDir = extractTestResources( getClass(), baseDir + "/plugin" );
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( GROUP_ID, "A", "1.0", "pom" );
- verifier.deleteArtifact( GROUP_ID, "A", "1.0", "jar" );
- verifier.deleteArtifact( GROUP_ID, "A", "3.0", "pom" );
- verifier.deleteArtifact( GROUP_ID, "A", "3.0", "jar" );
- verifier.deleteArtifact( GROUP_ID, "plugin", "1.0", "pom" );
- verifier.deleteArtifact( GROUP_ID, "plugin", "1.0", "jar" );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( GROUP_ID, "A", "1.0", "pom" );
+ itr.deleteArtifact( GROUP_ID, "A", "1.0", "jar" );
+ itr.deleteArtifact( GROUP_ID, "A", "3.0", "pom" );
+ itr.deleteArtifact( GROUP_ID, "A", "3.0", "jar" );
+ itr.deleteArtifact( GROUP_ID, "plugin", "1.0", "pom" );
+ itr.deleteArtifact( GROUP_ID, "plugin", "1.0", "jar" );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
testDir = extractTestResources( getClass(), baseDir + "/pluginuser" );
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "pom" );
- verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "jar" );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "pom" );
+ itr.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "jar" );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.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/MavenITmng3415JunkRepositoryMetadataTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.java Sun Jul 27 18:34:23 2008
@@ -21,7 +21,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
@@ -84,19 +84,19 @@
setupDummyDependency( testDir, localRepo, true );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
cliOptions.add( "-s" );
cliOptions.add( settings.getPath() );
- verifier.executeGoal( "package", cliOptions );
+ itr.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
File firstLogFile = new File( testDir, "log-" + methodName + "-firstBuild.txt" );
logFile.renameTo( firstLogFile );
@@ -105,10 +105,10 @@
setupDummyDependency( testDir, localRepo, true );
- verifier.executeGoal( "package" );
+ itr.executeGoal( "package" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
File secondLogFile = new File( testDir, "log-" + methodName + "-secondBuild.txt" );
logFile.renameTo( secondLogFile );
@@ -163,39 +163,39 @@
setupDummyDependency( testDir, localRepo, true );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
cliOptions.add( "-s" );
cliOptions.add( settings.getPath() );
- verifier.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
File firstLogFile = new File( testDir, "log-" + methodName + "-firstBuild.txt" );
logFile.renameTo( firstLogFile );
// FIXME: There really should be a better way than this!
- assertOutputLinePresent( verifier, firstLogFile, "snapshot tests:missing:1.0-SNAPSHOT: checking for updates from testing-repo" );
+ assertOutputLinePresent( itr, firstLogFile, "snapshot tests:missing:1.0-SNAPSHOT: checking for updates from testing-repo" );
File updateCheckFile = getUpdateCheckFile( localRepo );
long firstLastMod = updateCheckFile.lastModified();
setupDummyDependency( testDir, localRepo, false );
- verifier.executeGoal( "package" );
+ itr.executeGoal( "package" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
File secondLogFile = new File( testDir, "log-" + methodName + "-secondBuild.txt" );
logFile.renameTo( secondLogFile );
// FIXME: There really should be a better way than this!
- assertOutputLineMissing( verifier, secondLogFile, "snapshot tests:missing:1.0-SNAPSHOT: checking for updates from testing-repo" );
+ assertOutputLineMissing( itr, secondLogFile, "snapshot tests:missing:1.0-SNAPSHOT: checking for updates from testing-repo" );
assertEquals( "Last-modified time should be unchanged from first build through second build for the file we use for updateInterval checks.", firstLastMod, updateCheckFile.lastModified() );
}
@@ -284,21 +284,21 @@
RESOURCE_BASE
+ "/maven-find-local-repo-plugin" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.plugins", "maven-find-local-repo-plugin", "1.0-SNAPSHOT", "jar" );
+ itr.deleteArtifact( "org.apache.maven.plugins", "maven-find-local-repo-plugin", "1.0-SNAPSHOT", "jar" );
- verifier.executeGoal( "install" );
+ itr.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
- verifier.executeGoal( "find-local-repo:find" );
+ itr.executeGoal( "find-local-repo:find" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
- List lines = verifier.loadFile( new File( testDir, "target/local-repository-location.txt" ),
+ List lines = itr.loadFile( new File( testDir, "target/local-repository-location.txt" ),
false );
File localRepo = new File( (String) lines.get( 0 ) );
@@ -354,12 +354,12 @@
return settingsOut;
}
- private void assertOutputLinePresent( IntegrationTestRunner verifier,
+ private void assertOutputLinePresent( IntegrationTestRunner itr,
File logFile,
String lineContents )
throws IntegrationTestException
{
- List lines = verifier.loadFile( logFile, false );
+ List lines = itr.loadFile( logFile, false );
boolean found = false;
for ( Iterator it = lines.iterator(); it.hasNext(); )
@@ -375,12 +375,12 @@
assertTrue( "Build output in:\n\n" + logFile + "\n\nshould contain line with contents:\n\n" + lineContents + "\n", found );
}
- private void assertOutputLineMissing( IntegrationTestRunner verifier,
+ private void assertOutputLineMissing( IntegrationTestRunner itr,
File logFile,
String lineContents )
throws IntegrationTestException
{
- List lines = verifier.loadFile( logFile, false );
+ List lines = itr.loadFile( logFile, 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/MavenITmng3426PluginsClasspathOverrideTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.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/MavenITmng3426PluginsClasspathOverrideTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java Sun Jul 27 18:34:23 2008
@@ -50,11 +50,11 @@
// file.
File testDir = extractTestResources( getClass(), "/mng3426-overridingPluginDependency" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
- verifier.executeGoal( "org.codehaus.mojo:castor-maven-plugin:generate", cliOptions );
- verifier.verifyErrorFreeLog();
+ itr.executeGoal( "org.codehaus.mojo:castor-maven-plugin:generate", cliOptions );
+ itr.verifyErrorFreeLog();
// The generated file header contains the castor version used for code generation
// "This class was automatically generated with <a href="http://www.castor.org">Castor 1.1.1</a> ..."
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.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/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java Sun Jul 27 18:34:23 2008
@@ -22,10 +22,10 @@
{
File testDir = extractTestResources( getClass(), "/mng-3428-pluginDescriptorArtifactsIncomplete" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
// First, build the plugin we'll use to test the PluginDescriptor artifact collection.
- verifier.executeGoal( "install" );
+ itr.executeGoal( "install" );
/*
* This is the simplest way to check a build
@@ -33,22 +33,22 @@
* 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();
// This should only succeed if commons-cli is part of ${plugin.artifacts}. The
// commons-cli library is part of Maven's core classpath, so if this mojo succeeds
// it means the PluginDescriptor.getArtifacts() call returns an unfiltered collection.
- verifier.executeGoal( "tests:test-cli-maven-plugin:1:test" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "tests:test-cli-maven-plugin:1:test" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.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/MavenITmng3473PluginReportCrash.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java Sun Jul 27 18:34:23 2008
@@ -25,7 +25,7 @@
{
File testDir = extractTestResources( getClass(), "/mng-3473PluginReportCrash" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
File logFile = new File( testDir, "log.txt" );
@@ -33,18 +33,18 @@
// force the use of the 2.4.1 plugin version via a profile here...
List cliOptions = new ArrayList();
cliOptions.add( "-Pplugin-2.4.1" );
- verifier.executeGoal( "install", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "install", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
logFile.renameTo( new File( testDir, "log-2.4.1-preinstall.txt" ) );
//should succeed with 2.4.1
- verifier.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom, site" );
+ itr.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom, site" );
// NOTE: Velocity prints an [ERROR] line pertaining to an incorrect macro usage when run in 2.1, so this doesn't work.
-// verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+// itr.verifyErrorFreeLog();
+ itr.resetStreams();
logFile.renameTo( new File( testDir, "log-2.4.1.txt" ) );
@@ -53,14 +53,14 @@
cliOptions.add( "-Pplugin-2.4" );
try
{
- verifier.executeGoal( "site", cliOptions );
+ itr.executeGoal( "site", cliOptions );
}
catch (IntegrationTestException e)
{
//expected this but don't require it cause some os's don't return the correct error code
}
- verifier.verifyTextInLog( "org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException" );
- verifier.resetStreams();
+ itr.verifyTextInLog( "org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException" );
+ itr.resetStreams();
logFile.renameTo( new File( testDir, "log-2.4.txt" ) );
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3475BaseAlignedDir.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3475BaseAlignedDir.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/MavenITmng3475BaseAlignedDir.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3475BaseAlignedDir.java Sun Jul 27 18:34:23 2008
@@ -22,19 +22,19 @@
"/mng-3475-baseAlignedDir" );
File pluginDir = new File( testDir, "plugin" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.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( "validate" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "validate" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3482DependencyPomInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3482DependencyPomInterpolationTest.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/MavenITmng3482DependencyPomInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3482DependencyPomInterpolationTest.java Sun Jul 27 18:34:23 2008
@@ -53,26 +53,26 @@
File settings = writeSettings( testDir );
- 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() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng3482", "mng-3482", "1", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng3482", "mng-3482", "1", "jar" );
- verifier.deleteArtifact( "test", "dep", "1", "pom" );
- verifier.deleteArtifact( "test", "dep2", "1", "pom" );
- verifier.deleteArtifact( "test", "dep2", "1", "jar" );
+ itr.deleteArtifact( "org.apache.maven.its.mng3482", "mng-3482", "1", "pom" );
+ itr.deleteArtifact( "org.apache.maven.its.mng3482", "mng-3482", "1", "jar" );
+ itr.deleteArtifact( "test", "dep", "1", "pom" );
+ itr.deleteArtifact( "test", "dep2", "1", "pom" );
+ itr.deleteArtifact( "test", "dep2", "1", "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
@@ -82,7 +82,7 @@
cliOptions.add( "-s" );
cliOptions.add( "\"" + settings.getAbsolutePath() + "\"" );
- verifier.executeGoal( "compile", cliOptions );
+ itr.executeGoal( "compile", cliOptions );
/*
* This is the simplest way to check a build
@@ -90,16 +90,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();
}
private File writeSettings( File testDir )
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.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/MavenITmng3485OverrideWagonExtensionTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java Sun Jul 27 18:34:23 2008
@@ -20,12 +20,12 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/mng-3485-overrideWagonExtension" );
- IntegrationTestRunner verifier;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr;
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
- verifier.executeGoal( "deploy", cliOptions );
- verifier.assertFilePresent( "target/wagon-data" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "deploy", cliOptions );
+ itr.assertFilePresent( "target/wagon-data" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3498ForkToOtherMojoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3498ForkToOtherMojoTest.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/MavenITmng3498ForkToOtherMojoTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3498ForkToOtherMojoTest.java Sun Jul 27 18:34:23 2008
@@ -51,19 +51,19 @@
File pluginDir = new File( testDir, "maven-mng3498-plugin" );
File projectDir = new File( testDir, "mng-3498-project" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng3498", "maven-mng3498-plugin", "1", "pom" );
+ IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.mng3498", "maven-mng3498-plugin", "1", "pom" );
- verifier.executeGoal( "install" );
+ itr.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
- verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ itr.executeGoal( "validate" );
- 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/MavenITmng3503Xpp3ShadingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3503Xpp3ShadingTest.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/MavenITmng3503Xpp3ShadingTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3503Xpp3ShadingTest.java Sun Jul 27 18:34:23 2008
@@ -49,18 +49,18 @@
// file.
File testDir = extractTestResources( getClass(), "/mng-3503-xpp3Shading" );
- 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() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ itr.executeGoal( "install" );
/*
* This is the simplest way to check a build
@@ -68,15 +68,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/MavenITmng3530DynamicPOMInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3530DynamicPOMInterpolationTest.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/MavenITmng3530DynamicPOMInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3530DynamicPOMInterpolationTest.java Sun Jul 27 18:34:23 2008
@@ -55,19 +55,19 @@
// validates that the modification propagated into the validation-mojo
// configuration. Once this is installed, we can run a project build that
// uses it to see how Maven will respond to a modification in the project build directory.
- IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
+ itr.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
// Now, build the project. If the plugin configuration doesn't recognize
// the update to the project.build.directory, it will fail the build.
- 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 testitMNG3530_POMProperty()
@@ -82,19 +82,19 @@
// validates that the modification propagated into the validation-mojo
// configuration. Once this is installed, we can run a project build that
// uses it to see how Maven will respond to a modification in the POM property.
- IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
+ itr.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
// Now, build the project. If the plugin configuration doesn't recognize
// the update to the myDirectory, it will fail the build.
- 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 testitMNG3530_ResourceDirectoryInterpolation()
@@ -107,18 +107,18 @@
// First, install the plugin which validates that all resource directory
// specifications have been interpolated.
- IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
+ itr.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
// Now, build the project. If the plugin finds an uninterpolated resource
// directory, it will fail the build.
- verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "package" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.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/MavenITmng3535SelfReferentialProperties.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java Sun Jul 27 18:34:23 2008
@@ -23,7 +23,7 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/mng-3535-selfReferentialProperties" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List opts = new ArrayList();
opts.add( "-X" );
@@ -32,8 +32,8 @@
.setCliOptions( opts )
.setAutoclean( false );
- verifier.invoke( r );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.invoke( r );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3536AppendedAbsolutePaths.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3536AppendedAbsolutePaths.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/MavenITmng3536AppendedAbsolutePaths.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3536AppendedAbsolutePaths.java Sun Jul 27 18:34:23 2008
@@ -17,18 +17,18 @@
File testDir = extractTestResources( getClass(),
"/mng-3536-appendedAbsolutePaths" );
File pluginDir = new File( testDir, "plugin" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.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( "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/MavenITmng3545ProfileDeactivation.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3545ProfileDeactivation.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/MavenITmng3545ProfileDeactivation.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3545ProfileDeactivation.java Sun Jul 27 18:34:23 2008
@@ -30,20 +30,20 @@
{
File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
- verifier.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
+ itr.executeGoal( "package", cliOptions );
+ itr.verifyErrorFreeLog();
// profile 1 and 2 are active by default
- verifier.assertFilePresent( "target/profile1/touch.txt" );
- verifier.assertFilePresent( "target/profile2/touch.txt" );
- verifier.assertFileNotPresent( "target/profile3/touch.txt" );
- verifier.assertFileNotPresent( "target/profile4/touch.txt" );
- verifier.assertFileNotPresent( "target/profile5/touch.txt" );
- verifier.resetStreams();
+ itr.assertFilePresent( "target/profile1/touch.txt" );
+ itr.assertFilePresent( "target/profile2/touch.txt" );
+ itr.assertFileNotPresent( "target/profile3/touch.txt" );
+ itr.assertFileNotPresent( "target/profile4/touch.txt" );
+ itr.assertFileNotPresent( "target/profile5/touch.txt" );
+ itr.resetStreams();
}
@@ -56,20 +56,20 @@
{
File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
// Deactivate active by default profiles
cliOptions.add( "-P-profile1" );
cliOptions.add( "-P -profile2" );
- verifier.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.assertFileNotPresent( "target/profile1/touch.txt" );
- verifier.assertFileNotPresent( "target/profile2/touch.txt" );
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.assertFileNotPresent( "target/profile1/touch.txt" );
+ itr.assertFileNotPresent( "target/profile2/touch.txt" );
+ itr.resetStreams();
}
@@ -78,20 +78,20 @@
{
File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
// Deactivate active by default profiles
cliOptions.add( "-P!profile1" );
cliOptions.add( "-P !profile2" );
- verifier.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.assertFileNotPresent( "target/profile1/touch.txt" );
- verifier.assertFileNotPresent( "target/profile2/touch.txt" );
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.assertFileNotPresent( "target/profile1/touch.txt" );
+ itr.assertFileNotPresent( "target/profile2/touch.txt" );
+ itr.resetStreams();
}
@@ -106,23 +106,23 @@
File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
// Activate with a prop, then deactivate
cliOptions.add( "-Dprofile3-active-by-property=true" );
cliOptions.add( "-P-profile3" );
- verifier.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/profile1/touch.txt" );
- verifier.assertFilePresent( "target/profile2/touch.txt" );
- verifier.assertFileNotPresent( "target/profile3/touch.txt" );
- verifier.assertFileNotPresent( "target/profile4/touch.txt" );
- verifier.assertFileNotPresent( "target/profile5/touch.txt" );
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.assertFilePresent( "target/profile1/touch.txt" );
+ itr.assertFilePresent( "target/profile2/touch.txt" );
+ itr.assertFileNotPresent( "target/profile3/touch.txt" );
+ itr.assertFileNotPresent( "target/profile4/touch.txt" );
+ itr.assertFileNotPresent( "target/profile5/touch.txt" );
+ itr.resetStreams();
}
/**
@@ -136,23 +136,23 @@
File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
// Activate then deactivate
cliOptions.add( "-Pprofile4" );
cliOptions.add( "-P-profile4" );
- verifier.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/profile1/touch.txt" );
- verifier.assertFilePresent( "target/profile2/touch.txt" );
- verifier.assertFileNotPresent( "target/profile3/touch.txt" );
- verifier.assertFileNotPresent( "target/profile4/touch.txt" );
- verifier.assertFileNotPresent( "target/profile5/touch.txt" );
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.assertFilePresent( "target/profile1/touch.txt" );
+ itr.assertFilePresent( "target/profile2/touch.txt" );
+ itr.assertFileNotPresent( "target/profile3/touch.txt" );
+ itr.assertFileNotPresent( "target/profile4/touch.txt" );
+ itr.assertFileNotPresent( "target/profile5/touch.txt" );
+ itr.resetStreams();
}
/**
@@ -166,22 +166,22 @@
File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- IntegrationTestRunner verifier;
+ IntegrationTestRunner itr;
- verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
// Activate
cliOptions.add( "-Pprofile4" );
- verifier.executeGoal( "package", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.assertFileNotPresent( "target/profile1/touch.txt" );
- verifier.assertFileNotPresent( "target/profile2/touch.txt" );
- verifier.assertFileNotPresent( "target/profile3/touch.txt" );
- verifier.assertFilePresent( "target/profile4/touch.txt" );
- verifier.assertFileNotPresent( "target/profile5/touch.txt" );
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.assertFileNotPresent( "target/profile1/touch.txt" );
+ itr.assertFileNotPresent( "target/profile2/touch.txt" );
+ itr.assertFileNotPresent( "target/profile3/touch.txt" );
+ itr.assertFilePresent( "target/profile4/touch.txt" );
+ itr.assertFileNotPresent( "target/profile5/touch.txt" );
+ itr.resetStreams();
}
/**
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3581PluginUsesWagonDependency.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3581PluginUsesWagonDependency.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/MavenITmng3581PluginUsesWagonDependency.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3581PluginUsesWagonDependency.java Sun Jul 27 18:34:23 2008
@@ -25,15 +25,15 @@
File pluginDir = new File( testDir, "plugin" );
File projectDir = new File( testDir, "project" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
- verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
+ itr.executeGoal( "validate" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3642DynamicResourcesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3642DynamicResourcesTest.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/MavenITmng3642DynamicResourcesTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3642DynamicResourcesTest.java Sun Jul 27 18:34:23 2008
@@ -49,26 +49,26 @@
// file.
File testDir = extractTestResources( getClass(), "/mng-3642-dynamicResources" );
- 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() );
+ itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
/*
* 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.
*/
- verifier.executeGoal( "process-test-resources" );
+ itr.executeGoal( "process-test-resources" );
/*
* This is the simplest way to check a build
@@ -76,16 +76,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();
File first = new File( testDir, "target/test-classes/one.txt" );
assertTrue( "First resource file was not present: " + first, first.exists() );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3645POMSyntaxErrorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3645POMSyntaxErrorTest.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/MavenITmng3645POMSyntaxErrorTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3645POMSyntaxErrorTest.java Sun Jul 27 18:34:23 2008
@@ -50,11 +50,11 @@
// file.
File testDir = extractTestResources( getClass(), "/mng-3645-pomSyntaxError" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
try
{
- verifier.executeGoal( "validate" );
+ itr.executeGoal( "validate" );
fail( "Should fail to validate the POM syntax due to missing dependency element inside dependencyManagement section." );
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.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/MavenITmng3652UserAgentHeader.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java Sun Jul 27 18:34:23 2008
@@ -38,10 +38,10 @@
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
int port = ( Math.abs( new Random().nextInt() ) % 2048 ) + 1024;
@@ -50,14 +50,14 @@
t.setDaemon( true );
t.start();
- verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
+ itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-DtestPort=" + port );
- verifier.executeGoal( "validate", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "validate", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
String userAgent = s.userAgent;
assertNotNull( userAgent );
@@ -65,7 +65,7 @@
File touchFile = new File( projectDir, "target/touch.txt" );
assertTrue( touchFile.exists() );
- List lines = verifier.loadFile( touchFile, false );
+ List lines = itr.loadFile( touchFile, false );
// NOTE: system property for maven.version may not exist if you use -Dtest
// surefire parameter to run this single test. Therefore, the plugin writes
@@ -82,9 +82,9 @@
cliOptions.add( "-DtestPort=" + port );
cliOptions.add( "-DtestProtocol=dav:http" );
- verifier.executeGoal( "validate", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "validate", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
userAgent = s.userAgent;
assertNotNull( userAgent );
@@ -97,9 +97,9 @@
cliOptions.add( "--settings" );
cliOptions.add( "settings-no-config.xml" );
- verifier.executeGoal( "validate", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "validate", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
userAgent = s.userAgent;
assertNotNull( userAgent );
@@ -112,9 +112,9 @@
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
- verifier.executeGoal( "validate", cliOptions );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "validate", cliOptions );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
userAgent = s.userAgent;
assertNotNull( userAgent );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3667ResolveDepsWithBadPomVersionTest.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/MavenITmng3667ResolveDepsWithBadPomVersionTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3667ResolveDepsWithBadPomVersionTest.java Sun Jul 27 18:34:23 2008
@@ -52,21 +52,21 @@
File repoDir = new File( testDir, "repo" );
File projectDir = new File( testDir, "project" );
- 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() );
- File localRepoDir = new File( verifier.localRepo );
+ File localRepoDir = new File( itr.localRepo );
FileUtils.copyDirectoryStructure( repoDir, localRepoDir );
- verifier.executeGoal( "compile" );
+ itr.executeGoal( "compile" );
/*
* 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();
}
}