You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/07/26 00:40:24 UTC
svn commit: r679915 [2/2] - in
/maven/core-integration-testing/branches/embedder/core-integration-tests:
./ src/test/java/org/apache/maven/artifact/
src/test/java/org/apache/maven/artifact/versioning/
src/test/java/org/apache/maven/integrationtests/
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java Fri Jul 25 15:40:22 2008
@@ -21,14 +21,10 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0059" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- Properties verifierProperties = new Properties();
- verifierProperties.put( "failOnErrorOutput", "false" );
- verifier.setVerifierProperties( verifierProperties );
verifier.executeGoal( "package" );
verifier.assertFilePresent( "target/maven-it-it0059-1.0.jar" );
// don't verify error free log
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0066Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0066Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0066Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0066Test.java Fri Jul 25 15:40:22 2008
@@ -21,12 +21,10 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-f other-pom.xml" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "install" );
+ verifier.executeGoal( "install", cliOptions);
verifier.assertFilePresent( "" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0067Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0067Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0067Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0067Test.java Fri Jul 25 15:40:22 2008
@@ -22,8 +22,7 @@
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.0", "jar" );
List cliOptions = new ArrayList();
cliOptions.add( "-P test-profile" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "compile", cliOptions );
verifier.assertFilePresent( "target/classes/org/apache/maven/it0067/Person.class" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -19,14 +19,9 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0068" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.codehaus.modello", "modello-core", "1.0-alpha-3", "jar" );
- Properties verifierProperties = new Properties();
- verifierProperties.put( "failOnErrorOutput", "false" );
- verifier.setVerifierProperties( verifierProperties );
verifier.executeGoal( "generate-sources" );
verifier.assertFilePresent( "target/generated-sources/modello/org/apache/maven/settings/Settings.java" );
-// don't verify error free log
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0069Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0069Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0069Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0069Test.java Fri Jul 25 15:40:22 2008
@@ -21,8 +21,7 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-o" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "compile", cliOptions );
verifier.assertFilePresent( "target/classes/org/apache/maven/it0069/ClassworldBasedThing.class" );
verifier.verifyErrorFreeLog();
verifier.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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -19,15 +19,10 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0073" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-context-passing", "1.0",
- "maven-plugin" );
- List goals = Arrays.asList( new String[]{"org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw",
- "org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch"} );
- verifier.executeGoals( goals );
+ verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-context-passing", "1.0", "maven-plugin" );
+ verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw, org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch" );
verifier.assertFilePresent( "target/thrown-value" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
-
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0075Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0075Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0075Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0075Test.java Fri Jul 25 15:40:22 2008
@@ -23,14 +23,11 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dactivate=anything" );
- verifier.setCliOptions( cliOptions );
- List goals = Arrays.asList( new String[]{"help:active-profiles", "package", "eclipse:eclipse", "clean:clean"} );
- verifier.executeGoals( goals );
+ verifier.executeGoal( "help:active-profiles, package, eclipse:eclipse, clean:clean", cliOptions );
verifier.assertFileNotPresent( "sub1/target/maven-it-it0075-sub1-1.0.jar" );
verifier.assertFileNotPresent( "sub2/target/maven-it-it0075-sub2-1.0.jar" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0095Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0095Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0095Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0095Test.java Fri Jul 25 15:40:22 2008
@@ -20,22 +20,12 @@
// TODO: This is WRONG! Need to run only sub1 to effective-pom, then run all to verify.
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0095" );
File sub1 = new File( testDir, "sub1" );
-
Verifier verifier = new Verifier( sub1.getAbsolutePath() );
-
List options = new ArrayList();
options.add( "-Doutput=\"" + new File( sub1, "target/effective-pom.xml" ).getAbsolutePath() + "\"" );
-
- verifier.setCliOptions( options );
-
- List goals = new ArrayList();
- goals.add( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom" );
- goals.add( "verify" );
-
- verifier.executeGoals( goals );
+ verifier.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom, verify", options );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0098Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0098Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0098Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0098Test.java Fri Jul 25 15:40:22 2008
@@ -24,8 +24,7 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dtest.property=\"Test Property\"" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "test" );
+ verifier.executeGoal( "test", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0100Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0100Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0100Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0100Test.java Fri Jul 25 15:40:22 2008
@@ -19,23 +19,12 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0100" );
File child = new File( testDir, "parent/child" );
-
Verifier verifier = new Verifier( child.getAbsolutePath() );
-
List options = new ArrayList();
options.add( "-Doutput=\"" + new File( child, "target/effective-pom.txt" ).getAbsolutePath() + "\"" );
-
- verifier.setCliOptions( options );
-
- List goals = new ArrayList();
- goals.add( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom" );
- goals.add( "verify" );
-
- verifier.executeGoals( goals );
-
+ verifier.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom, verify", options );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0101Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0101Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0101Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0101Test.java Fri Jul 25 15:40:22 2008
@@ -23,11 +23,9 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings settings.xml" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "compile", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0102Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0102Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0102Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0102Test.java Fri Jul 25 15:40:22 2008
@@ -19,21 +19,12 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0102" );
-
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-
List options = new ArrayList();
options.add( "-Doutput=" + new File( testDir, "target/effective-pom.txt" ).getAbsolutePath() );
-
- verifier.setCliOptions( options );
-
- List goals = new ArrayList();
- goals.add( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom" );
- goals.add( "verify" );
-
+ verifier.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom, verify", options );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0105Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0105Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0105Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0105Test.java Fri Jul 25 15:40:22 2008
@@ -21,12 +21,10 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dparam=PARAM" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "test" );
+ verifier.executeGoal( "test", cliOptions );
verifier.assertFilePresent( "target/classes/test.properties" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0107Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0107Test.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0107Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0107Test.java Fri Jul 25 15:40:22 2008
@@ -23,11 +23,9 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0107" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "validate" );
+ verifier.executeGoal( "validate", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -72,12 +72,7 @@
verifier.assertArtifactNotPresent( GROUPID, ARTIFACTID, OLD_VERSION, TYPE );
verifier.assertArtifactNotPresent( GROUPID, ARTIFACTID, NEW_VERSION, TYPE );
- Map m = new HashMap();
-/*
- m.put( "MAVEN_OPTS",
- "-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" );
-*/
- verifier.executeGoal( "package", m );
+ verifier.executeGoal( "package" );
verifier.assertArtifactNotPresent( GROUPID, ARTIFACTID, OLD_VERSION, TYPE );
verifier.assertArtifactPresent( GROUPID, ARTIFACTID, NEW_VERSION, TYPE );
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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -52,8 +52,7 @@
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "install" );
+ verifier.executeGoal( "install", cliOptions );
verifier.verifyErrorFreeLog();
verifier.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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -38,8 +38,7 @@
//use my custom settings upon invocation.
ArrayList cli = new ArrayList();
cli.add("-s '" +testDir.getAbsolutePath()+"/settings.xml'");
- verifier.setCliOptions( cli );
- verifier.executeGoal( "it0119:custom" );
+ verifier.executeGoal( "it0119:custom", cli );
verifier.verifyErrorFreeLog();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1412DependenciesOrderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1412DependenciesOrderTest.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1412DependenciesOrderTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1412DependenciesOrderTest.java Fri Jul 25 15:40:22 2008
@@ -33,13 +33,8 @@
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
-
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "test" );
-
+ verifier.executeGoal( "test", cliOptions );
verifier.verifyErrorFreeLog();
-
verifier.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java Fri Jul 25 15:40:22 2008
@@ -21,17 +21,12 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2234-activeProfilesFromSettings" );
-
Verifier verifier;
-
verifier = new Verifier( testDir.getAbsolutePath() );
-
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
cliOptions.add( "settings.xml" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "install" );
-
+ verifier.executeGoal( "install", cliOptions );
verifier.verifyErrorFreeLog();
verifier.assertFilePresent( "target/touch.txt" );
verifier.resetStreams();
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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -38,18 +38,12 @@
public void testitMNG2339a()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
- "/mng-2339-badProjectInterpolation/a" );
-
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2339-badProjectInterpolation/a" );
Verifier verifier;
-
verifier = new Verifier( testDir.getAbsolutePath() );
-
List cliOptions = new ArrayList();
cliOptions.add( "-Dversion=foo" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "validate" );
-
+ verifier.executeGoal( "validate", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
@@ -58,8 +52,7 @@
public void testitMNG2339b()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
- "/mng-2339-badProjectInterpolation/b" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2339-badProjectInterpolation/b" );
Verifier verifier;
@@ -77,12 +70,9 @@
logFile.renameTo( new File( testDir, "log-pom-specified.txt" ) );
verifier = new Verifier( testDir.getAbsolutePath() );
-
List cliOptions = new ArrayList();
cliOptions.add( "-Dversion=2" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "initialize" );
-
+ verifier.executeGoal( "initialize", cliOptions );
verifier.verifyErrorFreeLog();
verifier.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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -108,10 +108,7 @@
{
List cliOptions = new ArrayList();
cliOptions.add( "-o" );
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "compile" );
-
+ verifier.executeGoal( "compile", cliOptions );
fail( "Plugin should be missing from local repo, and in offline this should make the project build fail." );
}
catch( VerificationException e )
@@ -137,8 +134,6 @@
// Expected outcome: build success
try
{
- verifier.getCliOptions().clear();
-
verifier.executeGoal( "compile" );
}
finally
@@ -162,9 +157,7 @@
{
List cliOptions = new ArrayList();
cliOptions.add( "-o" );
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "compile", cliOptions );
}
finally
{
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java Fri Jul 25 15:40:22 2008
@@ -57,14 +57,11 @@
// used to inject the remote repository
cliOptions.add( "-s" );
cliOptions.add( settings.getAbsolutePath() );
-
- verifier.setCliOptions( cliOptions );
-
// execute once just to make sure this test works at all!
try
{
// this will ensure that all relevant plugins are present.
- verifier.executeGoal( "initialize" );
+ verifier.executeGoal( "initialize", cliOptions );
}
catch ( VerificationException e )
{
@@ -73,8 +70,6 @@
// the centerpiece of these tests!
cliOptions.add( "-o" );
-
- verifier.setCliOptions( cliOptions );
verifier.setAutoclean( false );
// clear out the parent POM if it's in the local repository.
@@ -82,7 +77,7 @@
try
{
- verifier.executeGoal( "initialize" );
+ verifier.executeGoal( "initialize", cliOptions );
fail( "Build should fail with unresolvable parent POM." );
}
@@ -149,14 +144,11 @@
// used to inject the remote repository
cliOptions.add( "-s" );
cliOptions.add( settings.getAbsolutePath() );
-
- verifier.setCliOptions( cliOptions );
-
// execute once just to make sure this test works at all!
try
{
// this will ensure that all relevant plugins are present.
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "compile", cliOptions );
}
catch ( VerificationException e )
{
@@ -166,15 +158,13 @@
// the centerpiece of these tests!
cliOptions.add( "-o" );
- verifier.setCliOptions( cliOptions );
-
// clear out the dependency if it's in the local repository.
verifier.deleteArtifact( "org.apache.maven.its.mng2883", "dep", "1.0-SNAPSHOT", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.mng2883", "dep", "1.0-SNAPSHOT", "jar" );
try
{
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "compile", cliOptions );
fail( "Build should fail with unresolvable dependency artifact." );
}
@@ -247,15 +237,13 @@
cliOptions.add( "-s" );
cliOptions.add( settings.getAbsolutePath() );
- verifier.setCliOptions( cliOptions );
-
// clear out the dependency if it's in the local repository.
verifier.deleteArtifact( "org.apache.maven.its.mng2883", "plugin", "1.0-SNAPSHOT", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.mng2883", "plugin", "1.0-SNAPSHOT", "jar" );
try
{
- verifier.executeGoal( "org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run" );
+ verifier.executeGoal( "org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run", cliOptions );
fail( "Build should fail with unresolvable plugin artifact." );
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java Fri Jul 25 15:40:22 2008
@@ -59,8 +59,7 @@
public void testitMNG3052 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
- "/mng-3052depRepoAggregation" )
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3052depRepoAggregation" )
.getCanonicalFile();
File foo = new File( testDir, "foo" );
@@ -90,8 +89,7 @@
// This one is a transitive dependency, and will be deployed to a
// repository that is NOT listed in the main project's POM (wombat).
verifier = new Verifier( foo.getAbsolutePath() );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "deploy" );
+ verifier.executeGoal( "deploy", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -100,8 +98,7 @@
// repository entry that should enable resolution of the transitive
// dependency it lists (foo, above).
verifier = new Verifier( bar.getAbsolutePath() );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "deploy" );
+ verifier.executeGoal( "deploy", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -116,8 +113,7 @@
// repositories declared in the bar POM to find the transitive dependency
// (foo, top).
verifier = new Verifier( wombat.getAbsolutePath() );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "package" );
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -61,10 +61,8 @@
cliOptions.add( "-s" );
cliOptions.add( "\"" + new File( testDir, "settings.xml" ).getAbsolutePath() + "\"" );
- verifier.setCliOptions( cliOptions );
-
verifier.setAutoclean( false );
- verifier.executeGoal( "org.apache.maven.its.mng3099:maven-mng3099-plugin:1:profile-props" );
+ verifier.executeGoal( "org.apache.maven.its.mng3099:maven-mng3099-plugin:1:profile-props", cliOptions );
List lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3106ProfileMultipleActivators.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3106ProfileMultipleActivators.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3106ProfileMultipleActivators.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3106ProfileMultipleActivators.java Fri Jul 25 15:40:22 2008
@@ -40,9 +40,7 @@
List cliOptions = new ArrayList();
cliOptions.add( "-Dprofile1.on=true" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "package" );
-
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
verifier.assertFilePresent( "target/profile1/touch.txt" );
verifier.assertFilePresent( "target/profile2/touch.txt" );
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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -42,9 +42,7 @@
List cliOptions = new ArrayList();
cliOptions.add( "-Psite" );
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "site" );
+ verifier.executeGoal( "site", cliOptions );
verifier.verifyErrorFreeLog();
}
finally
@@ -86,9 +84,7 @@
List cliOptions = new ArrayList();
cliOptions.add( "-Pplugin" );
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "package" );
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
}
finally
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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -14,25 +14,14 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3259-depsDroppedInMultiModuleBuild" );
-
Verifier verifier;
-
verifier = new Verifier( new File( testDir, "parent" ).getAbsolutePath() );
-
List cliOptions = new ArrayList();
-
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "install" );
-
+ verifier.executeGoal( "install", cliOptions );
verifier.verifyErrorFreeLog();
-
verifier.resetStreams();
-
verifier = new Verifier( testDir.getAbsolutePath() );
-
verifier.executeGoal( "install" );
-
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3268MultipleDashPCommandLine.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3268MultipleDashPCommandLine.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3268MultipleDashPCommandLine.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3268MultipleDashPCommandLine.java Fri Jul 25 15:40:22 2008
@@ -30,9 +30,7 @@
cliOptions.add( "-Pprofile1,profile2" );
cliOptions.add( "-Pprofile3" );
cliOptions.add( "-P profile4" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "package" );
-
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
verifier.assertFilePresent( "target/profile1/touch.txt" );
verifier.assertFilePresent( "target/profile2/touch.txt" );
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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -108,9 +108,7 @@
{
List cliOptions = new ArrayList();
cliOptions.add( "-o" );
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "compile", cliOptions );
fail( "Dependency should be missing from local repo, and in offline this should make the project build fail." );
}
@@ -137,8 +135,6 @@
// Expected outcome: build success
try
{
- verifier.getCliOptions().clear();
-
verifier.executeGoal( "compile" );
}
finally
@@ -162,9 +158,7 @@
{
List cliOptions = new ArrayList();
cliOptions.add( "-o" );
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "compile", cliOptions );
}
finally
{
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.java Fri Jul 25 15:40:22 2008
@@ -40,8 +40,7 @@
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
cliOptions.add( "settings.xml" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "deploy" );
+ verifier.executeGoal( "deploy", cliOptions );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3355TranslatedPathInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3355TranslatedPathInterpolationTest.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3355TranslatedPathInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3355TranslatedPathInterpolationTest.java Fri Jul 25 15:40:22 2008
@@ -38,20 +38,12 @@
public void testitMNG3355()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
- "/mng-3355" );
-
- Verifier verifier;
-
- verifier = new Verifier( testDir.getAbsolutePath() );
-
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3355" );
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dversion=foo" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "validate" );
-
+ verifier.executeGoal( "validate", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
-
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3372DirectInvocationOfPlugins.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3372DirectInvocationOfPlugins.java?rev=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -38,22 +38,16 @@
File settingsFile = new File( testBaseDir, "settings.xml" );
Verifier verifier = new Verifier( plugin.getAbsolutePath() );
-
verifier.deleteArtifact( "org.apache.maven.its.mng3372", "mng3372-maven-plugin", "1", "jar" );
-
- verifier.executeGoals( Arrays.asList( new String[]{ "clean", "install" } ) );
-
+ verifier.executeGoal( "clean, install" );
verifier = new Verifier( project.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
cliOptions.add( "\"" + settingsFile.getAbsolutePath() + "\"" );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "mng3372:test" );
-
+ verifier.executeGoal( "mng3372:test", cliOptions );
verifier.verifyErrorFreeLog();
-
verifier.resetStreams();
}
@@ -63,17 +57,11 @@
// The testdir is computed from the location of this
// file.
File testBaseDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3372-directInvocationOfPlugins/dependency-tree" );
-
Verifier verifier = new Verifier( testBaseDir.getAbsolutePath() );
-
List cliOptions = new ArrayList();
cliOptions.add( "-U" );
-
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "dependency:tree" );
-
+ verifier.executeGoal( "dependency:tree", cliOptions );
verifier.verifyErrorFreeLog();
-
verifier.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.java Fri Jul 25 15:40:22 2008
@@ -38,9 +38,7 @@
verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.setCliOptions( Collections.singletonList( "-X" ) );
-
- verifier.executeGoal( "install" );
+ verifier.executeGoal( "install", Collections.singletonList( "-X" ) );
/*
* 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/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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -94,8 +94,7 @@
cliOptions.add( "-s" );
cliOptions.add( settings.getPath() );
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "package" );
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -173,11 +172,7 @@
cliOptions.add( "-X" );
cliOptions.add( "-s" );
cliOptions.add( settings.getPath() );
-
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "package" );
-
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java Fri Jul 25 15:40:22 2008
@@ -54,10 +54,7 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
-
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "org.codehaus.mojo:castor-maven-plugin:generate" );
+ verifier.executeGoal( "org.codehaus.mojo:castor-maven-plugin:generate", cliOptions );
verifier.verifyErrorFreeLog();
// The generated file header contains the castor version used for code generation
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=679915&r1=679914&r2=679915&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 Fri Jul 25 15:40:22 2008
@@ -35,16 +35,14 @@
// force the use of the 2.4.1 plugin version via a profile here...
List cliOptions = new ArrayList();
cliOptions.add( "-Pplugin-2.4.1" );
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "install" );
+ verifier.executeGoal( "install", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
logFile.renameTo( new File( testDir, "log-2.4.1-preinstall.txt" ) );
//should succeed with 2.4.1
- verifier.executeGoals( Arrays.asList( new String[]{ "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom", "site" } ) );
+ verifier.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom, site" );
// NOTE: Velocity prints an [ERROR] line pertaining to an incorrect macro usage when run in 2.1, so this doesn't work.
// verifier.verifyErrorFreeLog();
@@ -55,11 +53,9 @@
//should fail with 2.4
cliOptions.clear();
cliOptions.add( "-Pplugin-2.4" );
- verifier.setCliOptions( cliOptions );
-
try
{
- verifier.executeGoal( "site" );
+ verifier.executeGoal( "site", cliOptions );
}
catch (VerificationException e)
{
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3482DependencyPomInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3482DependencyPomInterpolationTest.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3482DependencyPomInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3482DependencyPomInterpolationTest.java Fri Jul 25 15:40:22 2008
@@ -83,10 +83,7 @@
cliOptions.add( "-s" );
cliOptions.add( "\"" + settings.getAbsolutePath() + "\"" );
-
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "compile", cliOptions );
/*
* 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/MavenITmng3485OverrideWagonExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java Fri Jul 25 15:40:22 2008
@@ -21,18 +21,12 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3485-overrideWagonExtension" );
-
Verifier verifier;
-
verifier = new Verifier( testDir.getAbsolutePath() );
-
List cliOptions = new ArrayList();
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "deploy" );
-
+ verifier.executeGoal( "deploy", cliOptions );
verifier.assertFilePresent( "target/wagon-data" );
verifier.verifyErrorFreeLog();
-
verifier.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java Fri Jul 25 15:40:22 2008
@@ -17,17 +17,12 @@
}
public void testitMNG3535() throws Exception {
- File testDir = ResourceExtractor.simpleExtractResources(getClass(),
- "/mng-3535-selfReferentialProperties");
+ File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3535-selfReferentialProperties");
Verifier verifier = new Verifier(testDir.getAbsolutePath());
-
List opts = new ArrayList();
opts.add( "-X" );
- verifier.setCliOptions( opts );
-
verifier.setAutoclean( false );
- verifier.executeGoal("verify");
-
+ verifier.executeGoal("verify", opts );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3545ProfileDeactivation.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3545ProfileDeactivation.java?rev=679915&r1=679914&r2=679915&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3545ProfileDeactivation.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3545ProfileDeactivation.java Fri Jul 25 15:40:22 2008
@@ -36,10 +36,7 @@
verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
-
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "package" );
-
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
// profile 1 and 2 are active by default
verifier.assertFilePresent( "target/profile1/touch.txt" );
@@ -69,10 +66,7 @@
// Deactivate active by default profiles
cliOptions.add( "-P-profile1" );
cliOptions.add( "-P -profile2" );
-
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "package" );
-
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
verifier.assertFileNotPresent( "target/profile1/touch.txt" );
verifier.assertFileNotPresent( "target/profile2/touch.txt" );
@@ -93,11 +87,8 @@
// Deactivate active by default profiles
cliOptions.add( "-P!profile1" );
- cliOptions.add( "-P !profile2" );
-
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "package" );
-
+ cliOptions.add( "-P !profile2" );
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
verifier.assertFileNotPresent( "target/profile1/touch.txt" );
verifier.assertFileNotPresent( "target/profile2/touch.txt" );
@@ -125,10 +116,7 @@
// Activate with a prop, then deactivate
cliOptions.add( "-Dprofile3-active-by-property=true" );
cliOptions.add( "-P-profile3" );
-
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "package" );
-
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
verifier.assertFilePresent( "target/profile1/touch.txt" );
verifier.assertFilePresent( "target/profile2/touch.txt" );
@@ -158,10 +146,7 @@
// Activate then deactivate
cliOptions.add( "-Pprofile4" );
cliOptions.add( "-P-profile4" );
-
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "package" );
-
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
verifier.assertFilePresent( "target/profile1/touch.txt" );
verifier.assertFilePresent( "target/profile2/touch.txt" );
@@ -190,10 +175,7 @@
// Activate
cliOptions.add( "-Pprofile4" );
-
- verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "package" );
-
+ verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
verifier.assertFileNotPresent( "target/profile1/touch.txt" );
verifier.assertFileNotPresent( "target/profile2/touch.txt" );