You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/08/03 02:36:36 UTC
svn commit: r981712 [2/10] - in
/maven/core-integration-testing/trunk/core-it-suite: ./
src/test/java/org/apache/maven/it/ src/test/resources-filtered/
src/test/resources/bootstrap/ src/test/resources/it0041/
src/test/resources/mng-0294/ src/test/resou...
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0036ReleasePomTest
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0036" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0037AlternatePomFile
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0037" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "-f" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0038AlternatePomFile
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0038" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "project/target" );
verifier.getCliOptions().add( "-f" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenIT0039ReleasePomInReac
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0039" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "project/target" );
verifier.deleteDirectory( "project2/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenIT0040PackagingFromPlu
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0040" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "package" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java Tue Aug 3 00:36:19 2010
@@ -46,9 +46,11 @@ public class MavenIT0041ArtifactTypeFrom
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0041" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );
+ verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", "1.2" );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java Tue Aug 3 00:36:19 2010
@@ -41,7 +41,7 @@ public class MavenIT0051ReleaseProfileTe
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0051" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "-DperformRelease=true" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java Tue Aug 3 00:36:19 2010
@@ -41,7 +41,7 @@ public class MavenIT0052ReleaseProfileTe
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0052" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "package" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java Tue Aug 3 00:36:19 2010
@@ -41,7 +41,7 @@ public class MavenIT0056MultipleGoalExec
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0056" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java Tue Aug 3 00:36:19 2010
@@ -41,7 +41,7 @@ public class MavenIT0063SystemScopeDepen
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0063" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getSystemProperties().setProperty( "jre.home", new File( testDir, "jdk/jre" ).getPath() );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java Tue Aug 3 00:36:19 2010
@@ -41,7 +41,7 @@ public class MavenIT0064MojoConfigViaSet
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0064" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-setter:setter-touch" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenIT0071PluginConfigWith
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0071" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenIT0072InterpolationWit
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0072" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java Tue Aug 3 00:36:19 2010
@@ -44,7 +44,7 @@ public class MavenIT0085TransitiveSystem
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0085" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0085" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenIT0086PluginRealmTest
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0086" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenIT0087PluginRealmWithP
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0087" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0087" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -44,7 +44,7 @@ public class MavenIT0090EnvVarInterpolat
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0090" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath(), true );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
Map envVars = new HashMap();
envVars.put( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" );
verifier.setAutoclean( false );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java Tue Aug 3 00:36:19 2010
@@ -58,7 +58,7 @@ public class MavenIT0108SnapshotUpdateTe
super.setUp();
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0108" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
localRepoFile = getLocalRepoFile( verifier );
deleteLocalArtifact( verifier, localRepoFile );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java Tue Aug 3 00:36:19 2010
@@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Properties;
public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest
@@ -44,13 +42,11 @@ public class MavenIT0113ServerAuthzAvail
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0113" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings" );
- cliOptions.add( "settings.xml" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0130CleanLifecycleTe
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0130" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "clean" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0131SiteLifecycleTes
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0131" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "site-deploy" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0132PomLifecycleTest
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0132" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0133JarLifecycleTest
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0133" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0134WarLifecycleTest
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0134" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0135EjbLifecycleTest
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0135" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0136RarLifecycleTest
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0136" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0137EarLifecycleTest
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0137" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenIT0138PluginLifecycleT
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0138" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenIT0139InterpolationWit
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0139" );
File child = new File( testDir, "child" );
- Verifier verifier = new Verifier( child.getAbsolutePath() );
+ Verifier verifier = newVerifier( child.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenIT0140InterpolationWit
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0140" );
File child = new File( testDir, "child" );
- Verifier verifier = new Verifier( child.getAbsolutePath() );
+ Verifier verifier = newVerifier( child.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java Tue Aug 3 00:36:19 2010
@@ -52,7 +52,7 @@ public class MavenIT0142DirectDependency
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0142" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0142" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java Tue Aug 3 00:36:19 2010
@@ -232,7 +232,7 @@ public class MavenIT0143TransitiveDepend
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0143" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target-" + scope );
verifier.deleteArtifacts( "org.apache.maven.its.it0143" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenIT0144LifecycleExecuti
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0144" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoals( Arrays.asList( new String[] { "post-clean", "deploy", "site-deploy" } ) );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenIT0145ReactorWithInclu
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0145" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "mod-a/target" );
@@ -73,7 +73,7 @@ public class MavenIT0145ReactorWithInclu
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0145" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "mod-a/target" );
@@ -98,7 +98,7 @@ public class MavenIT0145ReactorWithInclu
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0145" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "mod-a/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java Tue Aug 3 00:36:19 2010
@@ -45,7 +45,7 @@ public class MavenITBootstrapTest
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/bootstrap" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng0095ReactorFailur
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0095" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "subproject1/target" );
@@ -81,7 +81,7 @@ public class MavenITmng0095ReactorFailur
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0095" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "subproject1/target" );
@@ -108,7 +108,7 @@ public class MavenITmng0095ReactorFailur
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0095" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "subproject1/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java Tue Aug 3 00:36:19 2010
@@ -53,7 +53,7 @@ public class MavenITmng0187CollectedProj
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0187" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "sub-1/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng0249ResolveDepsFr
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0249" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenITmng0282NonReactorExe
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0282" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "subproject/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java Tue Aug 3 00:36:19 2010
@@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.Properties;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-294">MNG-294</a>.
@@ -61,9 +60,7 @@ public class MavenITmng0294MergeGlobalAn
}
else
{
- Properties systemProperties = new Properties();
- systemProperties.put( "org.apache.maven.global-settings", "global-settings.xml" );
- verifier.setSystemProperties( systemProperties );
+ verifier.setSystemProperty( "org.apache.maven.global-settings", "global-settings.xml" );
}
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java Tue Aug 3 00:36:19 2010
@@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.Properties;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-377">MNG-377</a>.
@@ -48,16 +47,14 @@ public class MavenITmng0377PluginLookupF
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0377" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0377" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
- Properties systemProperties = new Properties();
- systemProperties.put( "touch.outputFile", "target/file.txt" );
- verifier.setSystemProperties( systemProperties );
+ verifier.setSystemProperty( "touch.outputFile", "target/file.txt" );
verifier.executeGoal( "itprefix:touch" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng0449PluginVersion
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0449" );
testDir = new File( testDir, "lifecycle" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
try
@@ -91,7 +91,7 @@ public class MavenITmng0449PluginVersion
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0449" );
testDir = new File( testDir, "direct" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
try
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng0461TolerateMissi
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0461" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0461" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng0469ReportConfigT
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0469/test0" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
@@ -69,7 +69,7 @@ public class MavenITmng0469ReportConfigT
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0469/test1" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
@@ -87,7 +87,7 @@ public class MavenITmng0469ReportConfigT
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0469/test2" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
if ( matchesVersionRange( "(,3.0-alpha-1)" ) )
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng0471CustomLifecyc
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0471" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List goals = Arrays.asList( new String[]{"org.apache.maven.its.plugins:maven-it-plugin-fork:fork",
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng0479OverrideCentr
// Phase 1: Ensure the test plugin is downloaded before the test cuts off access to central
File child1 = new File( testDir, "setup" );
- Verifier verifier = new Verifier( child1.getAbsolutePath() );
+ Verifier verifier = newVerifier( child1.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
@@ -59,7 +59,7 @@ public class MavenITmng0479OverrideCentr
// Phase 2: Now run the test
File child2 = new File( testDir, "test" );
- verifier = new Verifier( child2.getAbsolutePath() );
+ verifier = newVerifier( child2.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng0496IgnoreUnknown
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0496" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng0505VersionRangeT
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0505" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0505" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java Tue Aug 3 00:36:19 2010
@@ -47,13 +47,13 @@ public class MavenITmng0507ArtifactReloc
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0507" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.1", "jar" );
- verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.1", "pom" );
- verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support-old-location", "1.1", "jar" );
- verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support-old-location", "1.1", "pom" );
+ verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", "1.1" );
+ verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support-old-location", "1.1" );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenITmng0522InheritedPlug
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0522" );
- Verifier verifier = new Verifier( new File( testDir, "child-project" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "child-project" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java Tue Aug 3 00:36:19 2010
@@ -119,7 +119,7 @@ public class MavenITmng0553SettingsAuthz
Properties filterProps = new Properties();
filterProps.setProperty( "@port@", Integer.toString( port ) );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng0553" );
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
@@ -149,7 +149,7 @@ public class MavenITmng0553SettingsAuthz
String secUrl = "FILE://" + new File( testDir, "relocated-settings-security.xml" ).toURI().getRawPath();
filterProps.setProperty( "@relocation@", secUrl );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng0553" );
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
@@ -180,7 +180,7 @@ public class MavenITmng0553SettingsAuthz
testDir = new File( testDir, "test-3" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
setUserHome( verifier, new File( testDir, "userhome" ) );
verifier.getCliOptions().add( "--encrypt-master-password" );
@@ -193,7 +193,7 @@ public class MavenITmng0553SettingsAuthz
List log = verifier.loadLines( verifier.getLogFileName(), null );
assertNotNull( findPassword( log ) );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
setUserHome( verifier, new File( testDir, "userhome" ) );
verifier.getCliOptions().add( "--encrypt-password" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java Tue Aug 3 00:36:19 2010
@@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-557">MNG-557</a>.
@@ -48,12 +46,11 @@ public class MavenITmng0557UserSettingsC
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0557" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings settings.xml" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java Tue Aug 3 00:36:19 2010
@@ -45,19 +45,19 @@ public class MavenITmng0612NewestConflic
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/dependency" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/plugin" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/project" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng0666IgnoreLegacyP
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0666" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0059" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng0674PluginParamet
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0674" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-lifecycle.txt" );
@@ -69,7 +69,7 @@ public class MavenITmng0674PluginParamet
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0674" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-cli.txt" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng0680ParentBasedir
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0680" );
File subDir = new File( testDir, "subproject" );
- Verifier verifier = new Verifier( subDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( subDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng0731LegacyRepoLay
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0731" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng0761MissingSnapsh
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0761" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0761" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java Tue Aug 3 00:36:19 2010
@@ -108,7 +108,7 @@ public class MavenITmng0768OfflineModeTe
{
{
// phase 1: run build in online mode to fill local repo
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0768" );
@@ -128,7 +128,7 @@ public class MavenITmng0768OfflineModeTe
{
// phase 2: run build in offline mode to check it still passes, without network accesses
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "-o" );
@@ -146,7 +146,7 @@ public class MavenITmng0768OfflineModeTe
{
// phase 3: delete test artifact and run build in offline mode to check it fails now
// NOTE: Adding the settings again to offer Maven the bad choice of using the remote repo
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0768" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java Tue Aug 3 00:36:19 2010
@@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-773">MNG-773</a>.
@@ -48,12 +46,10 @@ public class MavenITmng0773SettingsProfi
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0773" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings" );
- cliOptions.add( "settings.xml" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng0781PluginConfigV
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0781" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java Tue Aug 3 00:36:19 2010
@@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.Properties;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-786">MNG-786</a>.
@@ -48,14 +47,12 @@ public class MavenITmng0786ProfileAwareR
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0786" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "sub1/target" );
verifier.deleteDirectory( "sub2/target" );
- Properties systemProperties = new Properties();
- systemProperties.put( "expression.outputFile", "target/expression.properties" );
- systemProperties.put( "activate", "anything" );
- verifier.setSystemProperties( systemProperties );
+ verifier.setSystemProperty( "expression.outputFile", "target/expression.properties" );
+ verifier.setSystemProperty( "activate", "anything" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.assertFilePresent( "sub1/target/expression.properties" );
verifier.assertFilePresent( "sub2/target/expression.properties" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng0814ExplicitProfi
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0814" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "-P" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng0818WarDepsNotTra
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0818" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0080" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng0820ConflictResol
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0820" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0820" );