Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java?rev=694544&r1=694543&r2=694544&view=diff ============================================================================== --- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java (original) +++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java Thu Sep 11 16:40:11 2008 @@ -26,7 +26,7 @@ File dmDir = new File( testDir, "dm-pom" ); IntegrationTestRunner itr = new IntegrationTestRunner( dmDir.getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -34,7 +34,7 @@ File projectDir = new File( testDir, "project" ); itr = new IntegrationTestRunner( projectDir.getAbsolutePath() ); - itr.executeGoal( "package" ); + itr.invoke( "package" ); itr.verifyErrorFreeLog(); itr.resetStreams(); } @@ -49,7 +49,7 @@ try { - itr.executeGoal( "install" ); + itr.invoke( "install" ); fail( "Should fail to build with missing junit version." ); } catch ( IntegrationTestException e )
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java?rev=694544&r1=694543&r2=694544&view=diff ============================================================================== --- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java (original) +++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java Thu Sep 11 16:40:11 2008 @@ -33,7 +33,7 @@ itr.deleteArtifact( "tests", "maven-forking-report-plugin", "1", "jar" ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -75,7 +75,7 @@ itr.deleteArtifact( "tests", "maven-forking-test-plugin", "1", "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/MavenITmng3259DepsDroppedInMultiModuleBuild.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java?rev=694544&r1=694543&r2=694544&view=diff ============================================================================== --- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java (original) +++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java Thu Sep 11 16:40:11 2008 @@ -20,7 +20,7 @@ itr.verifyErrorFreeLog(); itr.resetStreams(); 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/MavenITmng3284UsingCachedPluginsTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java?rev=694544&r1=694543&r2=694544&view=diff ============================================================================== --- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java (original) +++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java Thu Sep 11 16:40:11 2008 @@ -35,7 +35,7 @@ * Build Mojo v1 */ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo" ).getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -43,7 +43,7 @@ * Build Mojo v2 */ itr = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo2" ).getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -51,7 +51,7 @@ * Run the simple build */ itr = new IntegrationTestRunner( testDir.getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); List lines = itr.loadFile( testDir.getAbsolutePath(), "log.txt", false ); Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3314OfflineSnapshotsTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3314OfflineSnapshotsTest.java?rev=694544&r1=694543&r2=694544&view=diff ============================================================================== --- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3314OfflineSnapshotsTest.java (original) +++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3314OfflineSnapshotsTest.java Thu Sep 11 16:40:11 2008 @@ -81,7 +81,7 @@ IntegrationTestRunner itr = new IntegrationTestRunner( testDep.getAbsolutePath() ); // Deploy the dependency to the test repository. - itr.executeGoal( "deploy" ); + itr.invoke( "deploy" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -134,7 +134,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/MavenITmng3331ModulePathNormalization.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3331ModulePathNormalization.java?rev=694544&r1=694543&r2=694544&view=diff ============================================================================== --- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3331ModulePathNormalization.java (original) +++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3331ModulePathNormalization.java Thu Sep 11 16:40:11 2008 @@ -30,7 +30,7 @@ itr = new IntegrationTestRunner( testDir.getAbsolutePath() ); - itr.executeGoal( "initialize" ); + itr.invoke( "initialize" ); /* * This is the simplest way to check a build @@ -60,7 +60,7 @@ itr = new IntegrationTestRunner( new File( testDir, "parent" ).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/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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.TestCase; - import org.apache.maven.it.IntegrationTestRunner; /** @@ -37,7 +35,7 @@ IntegrationTestRunner itr = new IntegrationTestRunner( plugin.getAbsolutePath() ); itr.deleteArtifact( "org.apache.maven.its.mng3372", "mng3372-maven-plugin", "1", "jar" ); - itr.executeGoal( "clean, install" ); + itr.invoke( "clean, install" ); itr = new IntegrationTestRunner( project.getAbsolutePath() ); List cliOptions = new ArrayList(); 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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -42,7 +42,7 @@ + "/consumer"; itr = new IntegrationTestRunner( path ); - itr.executeGoal( "package" ); + itr.invoke( "package" ); // verify no errors so far itr.verifyErrorFreeLog(); @@ -56,37 +56,37 @@ String path = testDir.getAbsolutePath() // + "/other-c"; IntegrationTestRunner itr = new IntegrationTestRunner( path ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); path = testDir.getAbsolutePath() // + "/other-b"; itr = new IntegrationTestRunner( path ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); path = testDir.getAbsolutePath() // + "/other-a"; itr = new IntegrationTestRunner( path ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); path = testDir.getAbsolutePath() // + "/transdep-old"; itr = new IntegrationTestRunner( path ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); path = testDir.getAbsolutePath() // + "/transdep-new-1"; itr = new IntegrationTestRunner( path ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); path = testDir.getAbsolutePath() // + "/transdep-new-2"; itr = new IntegrationTestRunner( path ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); path = testDir.getAbsolutePath() // + "/direct-dep"; itr = new IntegrationTestRunner( path ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); } private void deleteArtifacts( IntegrationTestRunner itr ) 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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -24,7 +24,7 @@ itr.deleteArtifact( "org.apache.maven.its.mng3391.2", "dm-pom", "1", "pom" ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); @@ -42,11 +42,11 @@ 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.invoke( "install" ); v2.verifyErrorFreeLog(); v2.resetStreams(); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); } @@ -61,7 +61,7 @@ itr.deleteArtifact( "org.apache.maven.its.mng3391.1", "dm-pom", "1", "pom" ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); @@ -75,7 +75,7 @@ "/mng-3391-importScopeErrorScenarios/depMgmt-importPom-parentCycle" ); IntegrationTestRunner itr = new IntegrationTestRunner( new File( testDir, "dm-pom" ).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/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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -46,7 +46,7 @@ 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.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -59,7 +59,7 @@ 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.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -68,7 +68,7 @@ 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.invoke( "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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -105,7 +105,7 @@ setupDummyDependency( testDir, localRepo, true ); - itr.executeGoal( "package" ); + itr.invoke( "package" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -186,7 +186,7 @@ setupDummyDependency( testDir, localRepo, false ); - itr.executeGoal( "package" ); + itr.invoke( "package" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -288,12 +288,12 @@ itr.deleteArtifact( "org.apache.maven.plugins", "maven-find-local-repo-plugin", "1.0-SNAPSHOT", "jar" ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); - itr.executeGoal( "find-local-repo:find" ); + itr.invoke( "find-local-repo:find" ); itr.verifyErrorFreeLog(); itr.resetStreams(); 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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -25,7 +25,7 @@ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() ); // First, build the plugin we'll use to test the PluginDescriptor artifact collection. - itr.executeGoal( "install" ); + itr.invoke( "install" ); /* * This is the simplest way to check a build @@ -47,7 +47,7 @@ // 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. - itr.executeGoal( "tests:test-cli-maven-plugin:1:test" ); + itr.invoke( "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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -40,7 +40,7 @@ logFile.renameTo( new File( testDir, "log-2.4.1-preinstall.txt" ) ); //should succeed with 2.4.1 - itr.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom, site" ); + itr.invoke( "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. // itr.verifyErrorFreeLog(); 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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -24,7 +24,7 @@ File pluginDir = new File( testDir, "plugin" ); IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -32,7 +32,7 @@ File projectDir = new File( testDir, "project" ); itr = new IntegrationTestRunner( projectDir.getAbsolutePath() ); - 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/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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -54,14 +54,14 @@ IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() ); itr.deleteArtifact( "org.apache.maven.its.mng3498", "maven-mng3498-plugin", "1", "pom" ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); itr = new IntegrationTestRunner( projectDir.getAbsolutePath() ); - 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/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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -60,7 +60,7 @@ */ itr = new IntegrationTestRunner( testDir.getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); /* * 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/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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -56,7 +56,7 @@ // 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 itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -65,7 +65,7 @@ // the update to the project.build.directory, it will fail the build. itr = new IntegrationTestRunner( projectDir.getAbsolutePath() ); - itr.executeGoal( "package" ); + itr.invoke( "package" ); itr.verifyErrorFreeLog(); itr.resetStreams(); } @@ -83,7 +83,7 @@ // 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 itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -92,7 +92,7 @@ // the update to the myDirectory, it will fail the build. itr = new IntegrationTestRunner( projectDir.getAbsolutePath() ); - itr.executeGoal( "package" ); + itr.invoke( "package" ); itr.verifyErrorFreeLog(); itr.resetStreams(); } @@ -108,7 +108,7 @@ // First, install the plugin which validates that all resource directory // specifications have been interpolated. IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -117,7 +117,7 @@ // directory, it will fail the build. itr = new IntegrationTestRunner( projectDir.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/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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -19,7 +19,7 @@ File pluginDir = new File( testDir, "plugin" ); IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -27,7 +27,7 @@ File projectDir = new File( testDir, "project" ); itr = new IntegrationTestRunner( projectDir.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/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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -26,12 +26,12 @@ File projectDir = new File( testDir, "project" ); IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); itr = new IntegrationTestRunner( projectDir.getAbsolutePath() ); - 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/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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -68,7 +68,7 @@ * recurse. We are only installing the parent pom to * the local repo here. */ - itr.executeGoal( "process-test-resources" ); + itr.invoke( "process-test-resources" ); /* * 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/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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -54,7 +54,7 @@ try { - itr.executeGoal( "validate" ); + itr.invoke( "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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -39,7 +39,7 @@ File projectDir = new File( testDir, "test-project" ); IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.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/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=694544&r1=694543&r2=694544&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 Thu Sep 11 16:40:11 2008 @@ -66,7 +66,7 @@ File localRepoDir = new File( itr.localRepo ); FileUtils.copyDirectoryStructure( repoDir, localRepoDir ); - itr.executeGoal( "compile" ); + itr.invoke( "compile" ); /* * 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/MavenITmng3671PluginLevelDepInterpolationTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.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/MavenITmng3671PluginLevelDepInterpolationTest.java (original) +++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java Thu Sep 11 16:40:11 2008 @@ -51,7 +51,7 @@ // file. File testDir = extractTestResources( getClass(), "/mng-3671-pluginLevelDepInterpolation" ); IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() ); - itr.executeGoal( "compile" ); + itr.invoke( "compile" ); /* * 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/MavenITmng3679PluginExecIdInterpolationTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.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/MavenITmng3679PluginExecIdInterpolationTest.java (original) +++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java Thu Sep 11 16:40:11 2008 @@ -18,7 +18,7 @@ { File testDir = extractTestResources( getClass(), "/mng-3679-pluginExecIdInterpolation" ); IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() ); - itr.executeGoal( "validate" ); + itr.invoke( "validate" ); itr.verifyErrorFreeLog(); itr.resetStreams(); assertTrue( new File( testDir, "target/check.txt" ).exists() ); Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.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/MavenITmng3680InvalidDependencyPOMTest.java (original) +++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java Thu Sep 11 16:40:11 2008 @@ -25,7 +25,7 @@ { File testDir = extractTestResources( getClass(), "/mng-3680-invalidDependencyPOM" ); 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/MavenITmng3684BuildPluginParameterTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3684BuildPluginParameterTest.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/MavenITmng3684BuildPluginParameterTest.java (original) +++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3684BuildPluginParameterTest.java Thu Sep 11 16:40:11 2008 @@ -28,13 +28,13 @@ File projectDir = new File( testDir, "project" ); IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() ); - itr.executeGoal( "install" ); + itr.invoke( "install" ); itr.verifyErrorFreeLog(); itr.resetStreams(); itr = new IntegrationTestRunner( projectDir.getAbsolutePath() ); - itr.executeGoal( "validate" ); + itr.invoke( "validate" ); itr.verifyErrorFreeLog(); itr.resetStreams(); @@ -42,7 +42,7 @@ File logFile = new File( projectDir, "log.txt" ); logFile.renameTo( new File( projectDir, "log-validate.txt" ) ); - itr.executeGoal( "site" ); + itr.invoke( "site" ); itr.verifyErrorFreeLog(); itr.resetStreams();
