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/09/12 01:40:16 UTC
svn commit: r694544 [2/3] -
/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/MavenIT0065Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0065Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0065Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0065Test.java Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
File testDir = extractTestResources( getClass(), "/it0065" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.apache.maven.its.it0065", "plugin", "1.0", "maven-plugin" );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.assertFilePresent( "subproject/target/child-basedir" );
itr.assertFilePresent( "parent-basedir" );
itr.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0068Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0068Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0068Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0068Test.java Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
File testDir = extractTestResources( getClass(), "/it0068" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.codehaus.modello", "modello-core", "1.0-alpha-3", "jar" );
- itr.executeGoal( "generate-sources" );
+ itr.invoke( "generate-sources" );
itr.assertFilePresent( "target/generated-sources/modello/org/apache/maven/settings/Settings.java" );
itr.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0070Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0070Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0070Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0070Test.java Thu Sep 11 16:40:11 2008
@@ -16,7 +16,7 @@
{
File testDir = extractTestResources( getClass(), "/it0070" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.assertFilePresent( "target/maven-it-it0070-1.0.rar" );
itr.assertFilePresent( "target/maven-it-it0070-1.0.rar!/META-INF/ra.xml" );
itr.assertFilePresent( "target/maven-it-it0070-1.0.rar!/SomeResource.txt" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0071Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0071Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0071Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0071Test.java Thu Sep 11 16:40:11 2008
@@ -18,7 +18,7 @@
File testDir = extractTestResources( getClass(), "/it0071" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
- itr.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ itr.invoke( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
itr.assertFilePresent( "target/foo2" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0072Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0072Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0072Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0072Test.java Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
{
File testDir = extractTestResources( getClass(), "/it0072" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.assertFilePresent( "target/maven-it-it0072-1.0-SNAPSHOT.jar" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0073Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0073Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0073Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0073Test.java Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
File testDir = extractTestResources( getClass(), "/it0073" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-context-passing", "1.0", "maven-plugin" );
- itr.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw, org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch" );
+ itr.invoke( "org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw, org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch" );
itr.assertFilePresent( "target/thrown-value" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0074Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0074Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0074Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0074Test.java Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
{
File testDir = extractTestResources( getClass(), "/it0074" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "eclipse:eclipse" );
+ itr.invoke( "eclipse:eclipse" );
itr.assertFilePresent( ".classpath" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0076Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0076Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0076Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0076Test.java Thu Sep 11 16:40:11 2008
@@ -18,7 +18,7 @@
{
File testDir = extractTestResources( getClass(), "/it0076" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0077Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0077Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0077Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0077Test.java Thu Sep 11 16:40:11 2008
@@ -16,7 +16,7 @@
File testDir = extractTestResources( getClass(), "/it0077" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.apache.maven.its.it0077", "sub1", "1.0", "test-jar" );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.assertArtifactPresent( "org.apache.maven.its.it0077", "sub1", "1.0", "test-jar" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0078Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0078Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0078Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0078Test.java Thu Sep 11 16:40:11 2008
@@ -18,7 +18,7 @@
{
File testDir = extractTestResources( getClass(), "/it0078" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "compile" );
+ itr.invoke( "compile" );
itr.assertFileNotPresent( "target/classes/Test.class" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0079Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0079Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0079Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0079Test.java Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
{
File testDir = extractTestResources( getClass(), "/it0079" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "deploy" );
+ itr.invoke( "deploy" );
itr.assertFilePresent(
"target/test-repo/org/apache/maven/its/it0079/maven-it-it0079/SNAPSHOT/maven-it-it0079-*-1.jar" );
itr.assertFilePresent(
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0080Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0080Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0080Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0080Test.java Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
{
File testDir = extractTestResources( getClass(), "/it0080" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
itr.assertFilePresent( "test-component-b/target/test-component-b-0.1.war" );
itr.assertFilePresent(
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0081Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0081Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0081Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0081Test.java Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
File testDir = extractTestResources( getClass(), "/it0081" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.apache.maven.its.it0081", "test-plugin", "0.1", "maven-plugin" );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.assertFilePresent( "test-component-c/target/org.apache.maven.wagon.providers.ftp.FtpWagon" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0082Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0082Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0082Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0082Test.java Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
{
File testDir = extractTestResources( getClass(), "/it0082" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "process-sources" );
+ itr.invoke( "process-sources" );
itr.assertFilePresent( "test-component-c/target/my-test" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java Thu Sep 11 16:40:11 2008
@@ -16,7 +16,7 @@
{
File testDir = extractTestResources( getClass(), "/it0083" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
itr.assertFilePresent( "test-component-b/target/test-component-b-0.1.jar" );
itr.assertFilePresent( "test-component-c/target/test-component-c-0.1.war" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0084Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0084Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0084Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0084Test.java Thu Sep 11 16:40:11 2008
@@ -16,7 +16,7 @@
{
File testDir = extractTestResources( getClass(), "/it0084" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
itr.assertFilePresent( "test-component-b/target/test-component-b-0.1.jar" );
itr.assertFilePresent( "test-component-c/target/test-component-c-0.1.war" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0085Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0085Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0085Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0085Test.java Thu Sep 11 16:40:11 2008
@@ -19,7 +19,7 @@
{
File testDir = extractTestResources( getClass(), "/it0085" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.assertFileNotPresent( "war/target/war-1.0/WEB-INF/lib/pom.xml" );
itr.assertFileNotPresent( "war/target/war-1.0/WEB-INF/lib/it0085-dep-1.0.jar" );
itr.assertFilePresent( "war/target/war-1.0/WEB-INF/lib/junit-3.8.1.jar" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0086Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0086Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0086Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0086Test.java Thu Sep 11 16:40:11 2008
@@ -18,7 +18,7 @@
File testDir = extractTestResources( getClass(), "/it0086" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
- itr.executeGoal( "validate" );
+ itr.invoke( "validate" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0087Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0087Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0087Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0087Test.java Thu Sep 11 16:40:11 2008
@@ -18,7 +18,7 @@
File testDir = extractTestResources( getClass(), "/it0087" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
- itr.executeGoal( "validate" );
+ itr.invoke( "validate" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0088Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0088Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0088Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0088Test.java Thu Sep 11 16:40:11 2008
@@ -16,7 +16,7 @@
{
File testDir = extractTestResources( getClass(), "/it0088" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "test" );
+ itr.invoke( "test" );
itr.assertFilePresent( "target/classes/test.properties" );
itr.assertFilePresent( "target/mojo-generated.properties" );
itr.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0089Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0089Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0089Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0089Test.java Thu Sep 11 16:40:11 2008
@@ -18,7 +18,7 @@
File testDir = extractTestResources( getClass(), "/it0089" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.assertFilePresent( "project/target/output.txt" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0091Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0091Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0091Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0091Test.java Thu Sep 11 16:40:11 2008
@@ -21,7 +21,7 @@
{
File testDir = extractTestResources( getClass(), "/it0091" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "test" );
+ itr.invoke( "test" );
itr.assertFilePresent( "target/classes/test.properties" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java Thu Sep 11 16:40:11 2008
@@ -23,7 +23,7 @@
File testDir = extractTestResources( getClass(), "/it0092" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar" );
- itr.executeGoal( "compile" );
+ itr.invoke( "compile" );
itr.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0094Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0094Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0094Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0094Test.java Thu Sep 11 16:40:11 2008
@@ -16,7 +16,7 @@
{
File testDir = extractTestResources( getClass(), "/it0094" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0096Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0096Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0096Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0096Test.java Thu Sep 11 16:40:11 2008
@@ -16,7 +16,7 @@
{
File testDir = extractTestResources( getClass(), "/it0096" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0097Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0097Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0097Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0097Test.java Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
{
File testDir = extractTestResources( getClass(), "/it0097" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.assertFilePresent( "project/project-level2/project-level3/target/it0097.txt" );
itr.assertFilePresent( "project/project-sibling-level2/target/it0097.txt" );
itr.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0099Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0099Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0099Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0099Test.java Thu Sep 11 16:40:11 2008
@@ -18,7 +18,7 @@
File testDir = extractTestResources( getClass(), "/it0099" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.apache.maven.it0099", "maven-it-it0099-parent", "1", "pom" );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0103Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0103Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0103Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0103Test.java Thu Sep 11 16:40:11 2008
@@ -18,7 +18,7 @@
{
File testDir = extractTestResources( getClass(), "/it0103" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0104Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0104Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0104Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0104Test.java Thu Sep 11 16:40:11 2008
@@ -16,7 +16,7 @@
{
File testDir = extractTestResources( getClass(), "/it0104" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "test" );
+ itr.invoke( "test" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0106Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0106Test.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0106Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0106Test.java Thu Sep 11 16:40:11 2008
@@ -19,7 +19,7 @@
{
File testDir = extractTestResources( getClass(), "/it0106" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "clean" );
+ itr.invoke( "clean" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0108SnapshotUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0108SnapshotUpdateTest.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0108SnapshotUpdateTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0108SnapshotUpdateTest.java Thu Sep 11 16:40:11 2008
@@ -68,7 +68,7 @@
public void testSnapshotUpdated()
throws Exception
{
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.verifyErrorFreeLog();
itr.resetStreams();
@@ -80,7 +80,7 @@
FileUtils.fileWrite( artifact.getAbsolutePath(), "updatedArtifact" );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
assertArtifactContents( "updatedArtifact" );
@@ -96,7 +96,7 @@
FileUtils.fileWrite( metadata.getAbsolutePath(),
constructMetadata( "1", System.currentTimeMillis() - TIME_OFFSET, true ) );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.verifyErrorFreeLog();
itr.resetStreams();
@@ -107,7 +107,7 @@
metadata = new File( repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml" );
FileUtils.fileWrite( metadata.getAbsolutePath(), constructMetadata( "2", System.currentTimeMillis(), true ) );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
assertArtifactContents( "updatedArtifact" );
@@ -129,7 +129,7 @@
FileUtils.fileWrite( metadata.getAbsolutePath(),
constructMetadata( "1", System.currentTimeMillis() - TIME_OFFSET, true ) );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.verifyErrorFreeLog();
itr.resetStreams();
@@ -145,7 +145,7 @@
// update the remote file, but we shouldn't be looking
artifact.setLastModified( System.currentTimeMillis() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
assertArtifactContents( "localArtifact" );
@@ -161,7 +161,7 @@
constructMetadata( "2", System.currentTimeMillis() - 2000, true ) );
artifact.setLastModified( System.currentTimeMillis() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
assertArtifactContents( "originalArtifact" );
@@ -178,7 +178,7 @@
constructMetadata( "1", System.currentTimeMillis() - TIME_OFFSET, false ) );
metadata.setLastModified( System.currentTimeMillis() - TIME_OFFSET );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.verifyErrorFreeLog();
itr.resetStreams();
@@ -189,7 +189,7 @@
metadata = new File( repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml" );
FileUtils.fileWrite( metadata.getAbsolutePath(), constructMetadata( "2", System.currentTimeMillis(), false ) );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
assertArtifactContents( "updatedArtifact" );
@@ -206,7 +206,7 @@
localMetadata.delete();
assertFalse( localMetadata.exists() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
@@ -218,7 +218,7 @@
FileUtils.fileWrite( localMetadata.getAbsolutePath(), constructLocalMetadata(
"org.apache.maven.its.snapshotUpdate", "maven-it-snapshot-update", cal.getTimeInMillis(), true ) );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
assertLocalMetadataIsToday( localMetadata );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0109ReleaseUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0109ReleaseUpdateTest.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0109ReleaseUpdateTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0109ReleaseUpdateTest.java Thu Sep 11 16:40:11 2008
@@ -69,7 +69,7 @@
itr.assertArtifactNotPresent( GROUPID, ARTIFACTID, OLD_VERSION, TYPE );
itr.assertArtifactNotPresent( GROUPID, ARTIFACTID, NEW_VERSION, TYPE );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.assertArtifactNotPresent( GROUPID, ARTIFACTID, OLD_VERSION, TYPE );
itr.assertArtifactPresent( GROUPID, ARTIFACTID, NEW_VERSION, TYPE );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java Thu Sep 11 16:40:11 2008
@@ -14,7 +14,7 @@
extractTestResources( getClass(), "/it0110-pluginDependenciesComeFromPluginRepos" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
itr.deleteArtifact( "org.apache.maven.it", "mail", "1.3.2", "jar" );
- itr.executeGoal( "clean" );
+ itr.invoke( "clean" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java Thu Sep 11 16:40:11 2008
@@ -31,19 +31,19 @@
itr.deleteArtifact( "org.apache.maven.its.it0111", "checkstyle-assembly", "1.0", "jar" );
List cliOptions = new ArrayList();
cliOptions.add( "-N" );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
// Install the extension with the resources required for the test
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "checkstyle-assembly" ).getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
// Run the whole test
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "checkstyle-test" ).getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0112ExtensionsThatDragDependencies.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0112ExtensionsThatDragDependencies.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0112ExtensionsThatDragDependencies.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0112ExtensionsThatDragDependencies.java Thu Sep 11 16:40:11 2008
@@ -40,13 +40,13 @@
// Install the extension with the resources required for the test
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "test-extension" ).getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
// Run the whole test
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "test-project" ).getAbsolutePath() );
- itr.executeGoal( "org.apache.maven.plugins:maven-project-info-reports-plugin:2.0.1:scm" );
+ itr.invoke( "org.apache.maven.plugins:maven-project-info-reports-plugin:2.0.1:scm" );
// ommitted because we always get velocity errors that aren't covered by the itr
// itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.java Thu Sep 11 16:40:11 2008
@@ -42,7 +42,7 @@
// Install the plugin to test for Authz info in the WagonManager
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "maven-it0113-plugin" ).getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java Thu Sep 11 16:40:11 2008
@@ -32,7 +32,7 @@
itr.deleteArtifact( "org.apache.maven.its.it0114", "it0114-parent", "1.0", "pom" );
List cliOptions = new ArrayList();
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
@@ -41,7 +41,7 @@
extractTestResources( getClass(), "/it0114-extensionThatProvidesResources/test-project" );
itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
cliOptions = new ArrayList();
- itr.executeGoal( "verify" );
+ itr.invoke( "verify" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java Thu Sep 11 16:40:11 2008
@@ -40,14 +40,14 @@
// Install the plugin to test for Authz info in the WagonManager
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "test-extension" ).getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
// Build the test project that uses the plugin.
File testProject = new File( testDir.getAbsolutePath(), "test-project" );
itr = new IntegrationTestRunner( testProject.getAbsolutePath() );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java Thu Sep 11 16:40:11 2008
@@ -15,7 +15,7 @@
itr.deleteArtifact( "org.apache.maven.its.it0118", "parent", "1.0", "pom" );
itr.deleteArtifact( "org.apache.maven.its.it0118", "one", "1.0", "jar" );
itr.deleteArtifact( "org.apache.maven.its.it0118", "two", "1.0", "pom" );
- itr.executeGoal( "package" );
+ itr.invoke( "package" );
itr.verifyErrorFreeLog();
itr.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java Thu Sep 11 16:40:11 2008
@@ -18,7 +18,7 @@
// Install the parent POM, extension and the plugin
itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
@@ -26,7 +26,7 @@
// now run the test. Since we have apache and codehaus, i should get the apache one first
testDir = extractTestResources( getClass(), "/it0119-pluginprefixorder/test-project" );
itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "it0119:apache" );
+ itr.invoke( "it0119:apache" );
itr.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0120EjbClientDependency.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0120EjbClientDependency.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0120EjbClientDependency.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0120EjbClientDependency.java Thu Sep 11 16:40:11 2008
@@ -37,7 +37,7 @@
itr.deleteArtifact( "org.apache.maven.its.it0120", "model", "1.0-SNAPSHOT", "ejb" );
/* Not "install" or "higher" goal to repeat the bug */
- itr.executeGoal( "compile" );
+ itr.invoke( "compile" );
itr.verifyErrorFreeLog();
itr.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java Thu Sep 11 16:40:11 2008
@@ -45,7 +45,7 @@
itr.deleteArtifact( "org.apache.maven.its.it0121", "B", "1.0", "jar" );
itr.deleteArtifact( "org.apache.maven.its.it0121", "C", "1.0", "pom" );
itr.deleteArtifact( "org.apache.maven.its.it0121", "D", "1.0", "jar" );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
}
@@ -57,7 +57,7 @@
IntegrationTestRunner itrOtherDep = new IntegrationTestRunner( testOtherDepDir.getAbsolutePath() );
itrOtherDep.deleteArtifact( "org.apache.maven.its.it0121", "D", version, "jar" );
itrOtherDep.deleteArtifact( "org.apache.maven.its.it0121", "D", version, "pom" );
- itrOtherDep.executeGoal( "install" );
+ itrOtherDep.invoke( "install" );
itrOtherDep.verifyErrorFreeLog();
itrOtherDep.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0122ReactorDependencyResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0122ReactorDependencyResolutionTest.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0122ReactorDependencyResolutionTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0122ReactorDependencyResolutionTest.java Thu Sep 11 16:40:11 2008
@@ -16,13 +16,13 @@
{
File testDir = extractTestResources( getClass(), "/it0122-reactorDependencyResolution/plugin" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
testDir = extractTestResources( getClass(), "/it0122-reactorDependencyResolution/project" );
itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "org.apache.maven.its.it0122:maven-it-it0122-plugin:1.0:test" );
+ itr.invoke( "org.apache.maven.its.it0122:maven-it-it0122-plugin:1.0:test" );
itr.verifyErrorFreeLog();
itr.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0123SnapshotRangeRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0123SnapshotRangeRepositoryTest.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0123SnapshotRangeRepositoryTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0123SnapshotRangeRepositoryTest.java Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
{
File testDir = extractTestResources( getClass(), "/it0123-snapshotRangeRepository" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "compile" );
+ itr.invoke( "compile" );
itr.verifyErrorFreeLog();
itr.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0124PomExtensionComponentOverrideTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0124PomExtensionComponentOverrideTest.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0124PomExtensionComponentOverrideTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0124PomExtensionComponentOverrideTest.java Thu Sep 11 16:40:11 2008
@@ -17,19 +17,19 @@
{
File testDir = extractTestResources( getClass(), "/it0124-pomExtensionComponentOverride/extension" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
testDir = extractTestResources( getClass(), "/it0124-pomExtensionComponentOverride/plugin" );
itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
testDir = extractTestResources( getClass(), "/it0124-pomExtensionComponentOverride/project" );
itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "verify" );
+ itr.invoke( "verify" );
itr.verifyErrorFreeLog();
itr.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0125NewestConflictResolverTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0125NewestConflictResolverTest.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0125NewestConflictResolverTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0125NewestConflictResolverTest.java Thu Sep 11 16:40:11 2008
@@ -17,19 +17,19 @@
{
File testDir = extractTestResources( getClass(), "/it0125-newestConflictResolver/dependency" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
testDir = extractTestResources( getClass(), "/it0125-newestConflictResolver/plugin" );
itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
testDir = extractTestResources( getClass(), "/it0125-newestConflictResolver/project" );
itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "verify" );
+ itr.invoke( "verify" );
itr.verifyErrorFreeLog();
itr.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0126TestJarDependency.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0126TestJarDependency.java?rev=694544&r1=694543&r2=694544&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0126TestJarDependency.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0126TestJarDependency.java Thu Sep 11 16:40:11 2008
@@ -43,7 +43,7 @@
itr.deleteArtifact( "org.apache.maven.its.it0126", "model", "1.0-SNAPSHOT", "test-jar" );
/* Not "install" or "higher" goal to repeat the bug */
- itr.executeGoal( "compile" );
+ itr.invoke( "compile" );
itr.verifyErrorFreeLog();
itr.resetStreams();
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -39,7 +39,7 @@
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.invoke( "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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -16,7 +16,7 @@
{
File testDir = extractTestResources( getClass(), "/it0128-distMgmtSiteUrlParentCalc" );
IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "integration-test" );
+ itr.invoke( "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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -25,7 +25,7 @@
itr.deleteArtifact( "org.apache.maven.its.it0129", "it0129-parent", "1.0", "pom" );
List cliOptions = new ArrayList();
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
@@ -33,7 +33,7 @@
testDir = extractTestResources( getClass(), "/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-project" );
itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
cliOptions = new ArrayList();
- itr.executeGoal( "verify" );
+ itr.invoke( "verify" );
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -19,7 +19,7 @@
try
{
- itr.executeGoal( "initialize" );
+ itr.invoke( "initialize" );
itr.verifyErrorFreeLog();
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -23,7 +23,7 @@
itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "initialize" );
+ itr.invoke( "initialize" );
/*
* This is the simplest way to check a build
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -32,7 +32,7 @@
itr.deleteArtifact( "testing", "first-project", "1.0-SNAPSHOT", "jar" );
itr.deleteArtifact( "testing", "second-project", "1.0-SNAPSHOT", "jar" );
- itr.executeGoal( "install" );
+ itr.invoke( "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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -66,7 +66,7 @@
itr.deleteArtifact( "samplegroup", "frameworks", "0.0.1", "pom" );
itr.deleteArtifact( "samplegroup", "core", "1.0.0", "pom" );
- itr.executeGoal( "validate" );
+ itr.invoke( "validate" );
/*
* This is the simplest way to check a build
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -52,7 +52,7 @@
*/
List cliOptions = new ArrayList();
cliOptions.add( "-N" );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
/*
* This is the simplest way to check a build
@@ -75,7 +75,7 @@
* Build the artifact with a fix version of commons-collections
*/
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-fix" ).getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
@@ -83,7 +83,7 @@
* Build the artifact with a version range of commons-collections
*/
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-range" ).getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr.resetStreams();
@@ -94,7 +94,7 @@
* On any version >= 2.0.9 it should work
*/
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-combined" ).getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -33,7 +33,7 @@
List cliOptions = new ArrayList();
cliOptions.add( "-N" );
- itr.executeGoal( "compile" );
+ itr.invoke( "compile" );
itr.verifyErrorFreeLog();
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -51,7 +51,7 @@
* the local repo here.
*/
List cliOptions = new ArrayList();
- itr.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-all:aggregator-dependencies" );
+ itr.invoke( "org.apache.maven.its.plugins:maven-it-plugin-all:aggregator-dependencies" );
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -57,7 +57,7 @@
itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
- itr.executeGoal( "initialize" );
+ itr.invoke( "initialize" );
assertTrue( "Touchfile using ${project.version} for ${version} does not exist.",
new File( testDir, "target/touch-1.txt" ).exists() );
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -17,7 +17,7 @@
File testDir = extractTestResources(getClass(),
"/mng-2562-timestamp");
IntegrationTestRunner itr = new IntegrationTestRunner(testDir.getAbsolutePath());
- itr.executeGoal("verify");
+ itr.invoke("verify");
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -81,7 +81,7 @@
IntegrationTestRunner itr = new IntegrationTestRunner( testPlugin.getAbsolutePath() );
// Deploy the dependency to the test repository.
- itr.executeGoal( "deploy" );
+ itr.invoke( "deploy" );
itr.verifyErrorFreeLog();
itr.resetStreams();
@@ -133,7 +133,7 @@
// Expected outcome: build success
try
{
- itr.executeGoal( "compile" );
+ itr.invoke( "compile" );
}
finally
{
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -56,7 +56,7 @@
try
{
- itr.executeGoal( "validate" );
+ itr.invoke( "validate" );
fail( "POM should NOT validate: repository <id/> element is missing in: "
+ new File( testDir, "pom.xml" ) );
@@ -95,7 +95,7 @@
try
{
- itr.executeGoal( "validate" );
+ itr.invoke( "validate" );
fail( "POM should NOT validate: repository <url/> element is missing in: "
+ new File( testDir, "pom.xml" ) );
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -33,7 +33,7 @@
itr.deleteArtifact( "org.apache.maven.its.mng2744", "b", "1", "pom" );
itr.deleteArtifact( "org.apache.maven.its.mng2744", "b", "1", "jar" );
- itr.executeGoal( "compile" );
+ itr.invoke( "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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -39,7 +39,7 @@
itr.deleteArtifact( "org.apache.maven.its.mng2861", "B", "1.0-SNAPSHOT", "jar" );
itr.deleteArtifact( "org.apache.maven.its.mng2861", "C", "1.0-SNAPSHOT", "jar" );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -39,19 +39,19 @@
itr.deleteArtifact( "org.apache.maven.its.mng2972", "dep", "2.0", "jar" );
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "dep1" ).getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "dep2" ).getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo" ).getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
itr.verifyErrorFreeLog();
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath() );
- itr.executeGoal( "validate" );
+ itr.invoke( "validate" );
itr.verifyErrorFreeLog();
List lines =
@@ -78,7 +78,7 @@
*/
itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath() );
- itr.executeGoal( "org.apache.maven.its.mng2972:mojo:0.0.1-SNAPSHOT:test" );
+ itr.invoke( "org.apache.maven.its.mng2972:mojo:0.0.1-SNAPSHOT:test" );
itr.verifyErrorFreeLog();
lines = itr.loadFile( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath(), "log.txt", false );
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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008
@@ -42,7 +42,7 @@
itr = new IntegrationTestRunner( plugin.getAbsolutePath() );
- itr.executeGoal( "install" );
+ itr.invoke( "install" );
/*
* Reset the streams before executing the itr