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 [5/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/MavenITmng3297DependenciesNotLeakedToMojoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3297DependenciesN
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3297" );
- 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/MavenITmng3314OfflineSnapshotsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java Tue Aug 3 00:36:19 2010
@@ -52,7 +52,7 @@ public class MavenITmng3314OfflineSnapsh
{
// phase 1: run build in online mode to fill local repo
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteArtifacts( "org.apache.maven.its.mng3314" );
verifier.setLogFileName( "log1.txt" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
@@ -66,7 +66,7 @@ public class MavenITmng3314OfflineSnapsh
{
// phase 2: run build in offline mode to check it still passes
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log2.txt" );
verifier.getCliOptions().add( "-o" );
verifier.getCliOptions().add( "--settings" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java Tue Aug 3 00:36:19 2010
@@ -53,7 +53,7 @@ public class MavenITmng3331ModulePathNor
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "initialize" );
@@ -83,7 +83,7 @@ public class MavenITmng3331ModulePathNor
Verifier verifier;
- verifier = new Verifier( new File( testDir, "parent" ).getAbsolutePath() );
+ verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
verifier.executeGoal( "initialize" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.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;
public class MavenITmng3355TranslatedPathInterpolationTest
extends AbstractMavenIntegrationTestCase
@@ -37,16 +35,13 @@ public class MavenITmng3355TranslatedPat
public void testitMNG3355()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
- "/mng-3355" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3355" );
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "-Dversion=foo" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-Dversion=foo" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java Tue Aug 3 00:36:19 2010
@@ -23,9 +23,7 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
/**
* This is a sample integration test. The IT tests typically
@@ -59,7 +57,7 @@ public class MavenITmng3372DirectInvocat
File project = new File( testBaseDir, "project" );
File settingsFile = new File( testBaseDir, "settings.xml" );
- Verifier verifier = new Verifier( plugin.getAbsolutePath() );
+ Verifier verifier = newVerifier( plugin.getAbsolutePath() );
verifier.deleteArtifacts( "org.apache.maven.its.mng3372" );
@@ -67,13 +65,11 @@ public class MavenITmng3372DirectInvocat
verifier.executeGoals( Arrays.asList( new String[]{ "clean", "install" } ) );
- verifier = new Verifier( project.getAbsolutePath() );
+ verifier = newVerifier( project.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "-s" );
- cliOptions.add( "\"" + settingsFile.getAbsolutePath() + "\"" );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "\"" + settingsFile.getAbsolutePath() + "\"" );
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "mng3372:test" );
verifier.verifyErrorFreeLog();
@@ -88,12 +84,10 @@ public class MavenITmng3372DirectInvocat
// file.
File testBaseDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3372/dependency-tree" );
- Verifier verifier = new Verifier( testBaseDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testBaseDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "-U" );
+ verifier.getCliOptions().add( "-U" );
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "dependency:tree" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3379ParallelArtif
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3379" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3379.a" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3379.b" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java Tue Aug 3 00:36:19 2010
@@ -54,7 +54,7 @@ public class MavenITmng3380ManagedReloca
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3380" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3380" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng3394POMPluginVers
//testShouldUsePluginVersionFromPluginMgmtForLifecycleMojoWhenNotInBuildPlugins
File testDir = ResourceExtractor.simpleExtractResources( getClass(), BASEDIR_PREFIX + "lifecycleMojoVersionInPluginMgmt" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
@@ -67,7 +67,7 @@ public class MavenITmng3394POMPluginVers
//testShouldPreferPluginVersionFromBuildPluginsOverThatInPluginMgmt
File testDir = ResourceExtractor.simpleExtractResources( getClass(), BASEDIR_PREFIX + "preferBuildPluginOverPluginMgmt" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java Tue Aug 3 00:36:19 2010
@@ -40,7 +40,7 @@ public class MavenITmng3396DependencyMan
String baseDir = "/mng-3396";
File testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/dependencies" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "jar" );
verifier.deleteArtifact( GROUP_ID, "B", "1.0", "pom" );
@@ -51,7 +51,7 @@ public class MavenITmng3396DependencyMan
testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/plugin" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "jar" );
verifier.deleteArtifact( GROUP_ID, "A", "3.0", "pom" );
@@ -64,7 +64,7 @@ public class MavenITmng3396DependencyMan
testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/pluginuser" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "jar" );
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java Tue Aug 3 00:36:19 2010
@@ -64,7 +64,7 @@ public class MavenITmng3401CLIDefaultExe
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3401/" + project );
- 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-configuration:2.1-SNAPSHOT:config" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java Tue Aug 3 00:36:19 2010
@@ -97,7 +97,7 @@ public class MavenITmng3415JunkRepositor
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3415" );
@@ -110,12 +110,10 @@ public class MavenITmng3415JunkRepositor
filterProps.put( "@port@", "0" );
File settings = verifier.filterFile( "settings-template.xml", "settings-a.xml", "UTF-8", filterProps );
- List cliOptions = new ArrayList();
- cliOptions.add( "-X" );
- cliOptions.add( "-s" );
- cliOptions.add( settings.getName() );
+ verifier.getCliOptions().add( "-X" );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( settings.getName() );
- verifier.setCliOptions( cliOptions );
verifier.setLogFileName( "log-" + methodName + "-firstBuild.txt" );
verifier.executeGoal( "validate" );
@@ -171,7 +169,7 @@ public class MavenITmng3415JunkRepositor
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3415" );
@@ -206,12 +204,9 @@ public class MavenITmng3415JunkRepositor
filterProps.put( "@port@", Integer.toString( port ) );
File settings = verifier.filterFile( "settings-template.xml", "settings-b.xml", "UTF-8", filterProps );
- List cliOptions = new ArrayList();
- cliOptions.add( "-X" );
- cliOptions.add( "-s" );
- cliOptions.add( settings.getName() );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-X" );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( settings.getName() );
setupDummyDependency( testDir, localRepo, true );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3422ActiveCompone
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3422" );
- 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/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java Tue Aug 3 00:36:19 2010
@@ -42,7 +42,7 @@ public class MavenITmng3428PluginDescrip
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3428" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
// First, build the plugin we'll use to test the PluginDescriptor artifact collection.
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java Tue Aug 3 00:36:19 2010
@@ -29,8 +29,6 @@ import org.codehaus.plexus.util.xml.pull
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
public class MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest
extends AbstractMavenIntegrationTestCase
@@ -52,12 +50,10 @@ public class MavenITmng3441MetadataUpdat
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "-s" );
- cliOptions.add( "settings.xml" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java Tue Aug 3 00:36:19 2010
@@ -59,7 +59,7 @@ public class MavenITmng3461MirrorMatchin
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3461/test-1" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
Properties filterProps = verifier.newDefaultFilterProperties();
@@ -82,7 +82,7 @@ public class MavenITmng3461MirrorMatchin
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3461/test-2" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
Handler repoHandler = new AbstractHandler()
{
@@ -153,7 +153,7 @@ public class MavenITmng3461MirrorMatchin
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3461/test-3" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
Properties filterProps = verifier.newDefaultFilterProperties();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenITmng3470StrictCheckum
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3470" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3470" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3475BaseAlignedDi
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3475" );
- 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/MavenITmng3477DependencyResolutionErrorMessageTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng3477DependencyRes
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3477" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3477" );
verifier.getCliOptions().add( "--settings" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -59,7 +59,7 @@ public class MavenITmng3482DependencyPom
* unstable test results. Fortunately, the verifier
* makes it easy to do this.
*/
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
File settings = verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
@@ -74,12 +74,8 @@ public class MavenITmng3482DependencyPom
* recurse. We are only installing the parent pom to
* the local repo here.
*/
- List cliOptions = new ArrayList();
-
- cliOptions.add( "-s" );
- cliOptions.add( "\"" + settings.getAbsolutePath() + "\"" );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "\"" + settings.getAbsolutePath() + "\"" );
verifier.executeGoal( "compile" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.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;
public class MavenITmng3485OverrideWagonExtensionTest
extends AbstractMavenIntegrationTestCase
@@ -41,10 +39,8 @@ public class MavenITmng3485OverrideWagon
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( "target/wagon-data" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng3498ForkToOtherMo
File pluginDir = new File( testDir, "maven-mng3498-plugin" );
File projectDir = new File( testDir, "mng-3498-project" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng3498", "maven-mng3498-plugin", "1", "pom" );
verifier.executeGoal( "install" );
@@ -59,7 +59,7 @@ public class MavenITmng3498ForkToOtherMo
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java Tue Aug 3 00:36:19 2010
@@ -45,7 +45,7 @@ public class MavenITmng3503Xpp3ShadingTe
Verifier verifier;
- verifier = new Verifier( dir.getAbsolutePath() );
+ verifier = newVerifier( dir.getAbsolutePath() );
verifier.executeGoal( "validate" );
@@ -61,7 +61,7 @@ public class MavenITmng3503Xpp3ShadingTe
{
File dir =
ResourceExtractor.simpleExtractResources( getClass(), "/mng-3503/mng-3503-xpp3Shading-pu-new" );
- Verifier verifier = new Verifier( dir.getAbsolutePath() );
+ Verifier verifier = newVerifier( dir.getAbsolutePath() );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng3506ArtifactHandl
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/" + AID );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteArtifacts( GID );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng3529QuotedCliArgT
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3529" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "-Dtest.a=\" \"" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -54,7 +54,7 @@ public class MavenITmng3530DynamicPOMInt
// validates that the modification propagated into the validation-mojo
// configuration. Once this is installed, we can run a project build that
// uses it to see how Maven will respond to a modification in the project build directory.
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
@@ -62,7 +62,7 @@ public class MavenITmng3530DynamicPOMInt
// Now, build the project. If the plugin configuration doesn't recognize
// the update to the project.build.directory, it will fail the build.
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
@@ -81,7 +81,7 @@ public class MavenITmng3530DynamicPOMInt
// validates that the modification propagated into the validation-mojo
// configuration. Once this is installed, we can run a project build that
// uses it to see how Maven will respond to a modification in the POM property.
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
@@ -89,7 +89,7 @@ public class MavenITmng3530DynamicPOMInt
// Now, build the project. If the plugin configuration doesn't recognize
// the update to the myDirectory, it will fail the build.
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
@@ -106,7 +106,7 @@ public class MavenITmng3530DynamicPOMInt
// First, install the plugin which validates that all resource directory
// specifications have been interpolated.
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
@@ -114,7 +114,7 @@ public class MavenITmng3530DynamicPOMInt
// Now, build the project. If the plugin finds an uninterpolated resource
// directory, it will fail the build.
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.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;
public class MavenITmng3535SelfReferentialPropertiesTest
extends AbstractMavenIntegrationTestCase
@@ -41,11 +39,9 @@ public class MavenITmng3535SelfReferenti
File testDir =
ResourceExtractor.simpleExtractResources( getClass(), "/mng-3535/success" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- List opts = new ArrayList();
- opts.add( "-X" );
- verifier.setCliOptions( opts );
+ verifier.getCliOptions().add( "-X" );
verifier.setAutoclean( false );
verifier.executeGoal( "verify" );
@@ -60,11 +56,9 @@ public class MavenITmng3535SelfReferenti
File testDir =
ResourceExtractor.simpleExtractResources( getClass(), "/mng-3535/failure" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- List opts = new ArrayList();
- opts.add( "-X" );
- verifier.setCliOptions( opts );
+ verifier.getCliOptions().add( "-X" );
verifier.setAutoclean( false );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java Tue Aug 3 00:36:19 2010
@@ -39,7 +39,7 @@ public class MavenITmng3536AppendedAbsol
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3536" );
File pluginDir = new File( testDir, "plugin" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
@@ -47,7 +47,7 @@ public class MavenITmng3536AppendedAbsol
verifier.resetStreams();
File projectDir = new File( testDir, "project" );
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java Tue Aug 3 00:36:19 2010
@@ -20,8 +20,6 @@ package org.apache.maven.it;
*/
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
@@ -48,14 +46,11 @@ public class MavenITmng3545ProfileDeacti
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log1.txt" );
- List cliOptions = new ArrayList();
-
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -77,18 +72,15 @@ public class MavenITmng3545ProfileDeacti
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log2.txt" );
- List cliOptions = new ArrayList();
-
// Deactivate active by default profiles
- cliOptions.add( "-P-profile1" );
- cliOptions.add( "-P -profile2" );
+ verifier.getCliOptions().add( "-P-profile1" );
+ verifier.getCliOptions().add( "-P -profile2" );
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -102,18 +94,15 @@ public class MavenITmng3545ProfileDeacti
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log3.txt" );
- List cliOptions = new ArrayList();
-
// Deactivate active by default profiles
- cliOptions.add( "-P!profile1" );
- cliOptions.add( "-P !profile2" );
+ verifier.getCliOptions().add( "-P!profile1" );
+ verifier.getCliOptions().add( "-P !profile2" );
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -132,18 +121,15 @@ public class MavenITmng3545ProfileDeacti
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log4.txt" );
- List cliOptions = new ArrayList();
-
// Activate with a prop, then deactivate
- cliOptions.add( "-Dprofile3-active-by-property=true" );
- cliOptions.add( "-P-profile3" );
+ verifier.getCliOptions().add( "-Dprofile3-active-by-property=true" );
+ verifier.getCliOptions().add( "-P-profile3" );
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -165,18 +151,15 @@ public class MavenITmng3545ProfileDeacti
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log5.txt" );
- List cliOptions = new ArrayList();
-
// Activate then deactivate
- cliOptions.add( "-Pprofile4" );
- cliOptions.add( "-P-profile4" );
+ verifier.getCliOptions().add( "-Pprofile4" );
+ verifier.getCliOptions().add( "-P-profile4" );
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -198,17 +181,14 @@ public class MavenITmng3545ProfileDeacti
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log6.txt" );
- List cliOptions = new ArrayList();
-
// Activate
- cliOptions.add( "-Pprofile4" );
+ verifier.getCliOptions().add( "-Pprofile4" );
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java Tue Aug 3 00:36:19 2010
@@ -42,7 +42,7 @@ public class MavenITmng3581PluginUsesWag
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3581" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3586SystemScopePl
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3586/test-1" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3586" );
@@ -74,7 +74,7 @@ public class MavenITmng3586SystemScopePl
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3586/test-2" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getSystemProperties().setProperty( "test.home", testDir.getAbsolutePath() );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java Tue Aug 3 00:36:19 2010
@@ -21,8 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -144,7 +142,7 @@ public class MavenITmng3599useHttpProxyF
* repo before the actual test installs Jetty as a mirror for everything. Otherwise, we will get garbage
* for the JAR/POM of the extension and its dependencies when run against a vanilla repo.
*/
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -155,14 +153,11 @@ public class MavenITmng3599useHttpProxyF
FileUtils.fileWrite( new File( testDir, "settings.xml" ).getAbsolutePath(), newSettings );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings" );
- cliOptions.add( "settings.xml" );
- cliOptions.add( "-X" );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.getCliOptions().add( "-X" );
verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "pom" );
@@ -193,7 +188,7 @@ public class MavenITmng3599useHttpProxyF
* repo before the actual test installs Jetty as a mirror for everything. Otherwise, we will get garbage
* for the JAR/POM of the extension and its dependencies when run against a vanilla repo.
*/
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -204,14 +199,11 @@ public class MavenITmng3599useHttpProxyF
FileUtils.fileWrite( new File( testDir, "settings.xml" ).getAbsolutePath(), newSettings );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings" );
- cliOptions.add( "settings.xml" );
- cliOptions.add( "-X" );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.getCliOptions().add( "-X" );
verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "pom" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.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 MavenITmng3600DeploymentModeDefaultsTest
@@ -43,10 +41,8 @@ public class MavenITmng3600DeploymentMod
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- verifier.setCliOptions( cliOptions );
verifier.setLogFileName( "log-no-settings.txt" );
verifier.executeGoal( "deploy" );
@@ -67,12 +63,10 @@ public class MavenITmng3600DeploymentMod
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings" );
- cliOptions.add( "settings-server-defaults.xml" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings-server-defaults.xml" );
verifier.setLogFileName( "log-server-defaults.txt" );
verifier.executeGoal( "deploy" );
@@ -93,12 +87,10 @@ public class MavenITmng3600DeploymentMod
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings" );
- cliOptions.add( "settings-modes-set.xml" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings-modes-set.xml" );
verifier.setLogFileName( "log-modes-set.txt" );
verifier.executeGoal( "deploy" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3607ClassLoadersU
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3607" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getSystemProperties().setProperty( "test.home", testDir.getAbsolutePath() );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3621UNCInheritedP
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3621" );
- Verifier verifier = new Verifier( new File( testDir, "child" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "child" ).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/MavenITmng3641ProfileActivationWarningTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java Tue Aug 3 00:36:19 2010
@@ -20,7 +20,6 @@ package org.apache.maven.it;
*/
import java.io.File;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
@@ -45,14 +44,14 @@ public class MavenITmng3641ProfileActiva
// (0) Initialize.
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3641" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
// Delete this artifact. Just in case.
verifier.deleteArtifact( "org.apache.maven.its.mng3641", "parent", "1.0", "pom" );
// (1) make sure the profile is found. Must not contain a warning.
- verifier.setCliOptions( Collections.singletonList( "-P mng-3641-it-provided-profile" ) );
+ verifier.getCliOptions().add( "-P mng-3641-it-provided-profile" );
verifier.setLogFileName( "log-1.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -62,8 +61,8 @@ public class MavenITmng3641ProfileActiva
assertNull( findWarning( logFile, "mng-3641-it-provided-profile" ) );
// (2) make sure the profile was not found and a warning was printed.
- verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.setCliOptions( Collections.singletonList( "-P mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" ) );
+ verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.getCliOptions().add( "-P mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
verifier.setLogFileName( "log-2.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -74,8 +73,8 @@ public class MavenITmng3641ProfileActiva
// (3) make sure the first profile is found while the other is not and a warning was printed
// accordingly.
- verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.setCliOptions( Collections.singletonList( "-P mng-3641-it-provided-profile,mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" ) );
+ verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.getCliOptions().add( "-P mng-3641-it-provided-profile,mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
verifier.setLogFileName( "log-3.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -86,8 +85,8 @@ public class MavenITmng3641ProfileActiva
assertNotNull( findWarning( logFile, "mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" ) );
// (4) make sure the warning is only printed when the profile is missing in all projects
- verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.setCliOptions( Collections.singletonList( "-P mng-3641-it-provided-profile-child" ) );
+ verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.getCliOptions().add( "-P mng-3641-it-provided-profile-child" );
verifier.setLogFileName( "log-4.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -97,8 +96,8 @@ public class MavenITmng3641ProfileActiva
assertNull( findWarning( logFile, "mng-3641-it-provided-profile-child" ) );
// (5) make sure the profile is found in subproject. Must not contain a warning.
- verifier = new Verifier( new File( testDir, "child1" ).getAbsolutePath() );
- verifier.setCliOptions( Collections.singletonList( "-P mng-3641-it-provided-profile-child" ) );
+ verifier = newVerifier( new File( testDir, "child1" ).getAbsolutePath() );
+ verifier.getCliOptions().add( "-P mng-3641-it-provided-profile-child" );
verifier.setLogFileName( "log-5.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -108,8 +107,8 @@ public class MavenITmng3641ProfileActiva
assertNull( findWarning( logFile, "mng-3641-it-provided-profile-child" ) );
// (6) make sure the profile is found from parent in subproject. Must not contain a warning.
- verifier = new Verifier( new File( testDir, "child1" ).getAbsolutePath() );
- verifier.setCliOptions( Collections.singletonList( "-P mng-3641-it-provided-profile" ) );
+ verifier = newVerifier( new File( testDir, "child1" ).getAbsolutePath() );
+ verifier.getCliOptions().add( "-P mng-3641-it-provided-profile" );
verifier.setLogFileName( "log-6.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java Tue Aug 3 00:36:19 2010
@@ -57,7 +57,7 @@ public class MavenITmng3642DynamicResour
* unstable test results. Fortunately, the verifier
* makes it easy to do this.
*/
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
/*
* The Command Line Options (CLI) are passed to the
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng3645POMSyntaxErro
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3645" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
try
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java Tue Aug 3 00:36:19 2010
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
import javax.servlet.ServletException;
@@ -102,17 +101,15 @@ public class MavenITmng3652UserAgentHead
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "-DtestPort=" + port );
- cliOptions.add( "-X" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-DtestPort=" + port );
+ verifier.getCliOptions().add( "-X" );
verifier.setLogFileName( "log-unConfiguredHttp.txt" );
verifier.executeGoal( "validate" );
@@ -148,19 +145,17 @@ public class MavenITmng3652UserAgentHead
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
// test webdav
- List cliOptions = new ArrayList();
- cliOptions.add( "-DtestPort=" + port );
- cliOptions.add( "-DtestProtocol=dav:http" );
- cliOptions.add( "-X" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-DtestPort=" + port );
+ verifier.getCliOptions().add( "-DtestProtocol=dav:http" );
+ verifier.getCliOptions().add( "-X" );
verifier.setLogFileName( "log-unConfiguredDAV.txt" );
verifier.executeGoal( "validate" );
@@ -196,21 +191,19 @@ public class MavenITmng3652UserAgentHead
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
// test settings with no config
- List cliOptions = new ArrayList();
- cliOptions.add( "-DtestPort=" + port );
- cliOptions.add( "--settings" );
- cliOptions.add( "settings-no-config.xml" );
- cliOptions.add( "-X" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-DtestPort=" + port );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings-no-config.xml" );
+ verifier.getCliOptions().add( "-X" );
verifier.setLogFileName( "log-configWithoutUserAgent.txt" );
verifier.executeGoal( "validate" );
@@ -246,21 +239,19 @@ public class MavenITmng3652UserAgentHead
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
// test settings with config
- List cliOptions = new ArrayList();
- cliOptions.add( "-DtestPort=" + port );
- cliOptions.add( "--settings" );
- cliOptions.add( "settings.xml" );
- cliOptions.add( "-X" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-DtestPort=" + port );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.getCliOptions().add( "-X" );
verifier.setLogFileName( "log-configWithUserAgent.txt" );
verifier.executeGoal( "validate" );
@@ -270,7 +261,7 @@ public class MavenITmng3652UserAgentHead
String userAgent = this.userAgent;
assertNotNull( userAgent );
-// System.out.println( "Comparing User-Agent: '" + userAgent + "' to 'Maven Fu'" );
assertEquals( "Maven Fu", userAgent );
}
+
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java Tue Aug 3 00:36:19 2010
@@ -60,7 +60,7 @@ public class MavenITmng3667ResolveDepsWi
* unstable test results. Fortunately, the verifier
* makes it easy to do this.
*/
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
File localRepoDir = new File( verifier.localRepo );
FileUtils.copyDirectoryStructure( repoDir, localRepoDir );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng3671PluginLevelDe
// file.
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3671" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "compile" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -44,7 +44,7 @@ public class MavenITmng3679PluginExecIdI
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3679" );
- 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/MavenITmng3680InvalidDependencyPOMTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng3680InvalidDepend
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3680" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3680" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java Tue Aug 3 00:36:19 2010
@@ -45,13 +45,13 @@ public class MavenITmng3684BuildPluginPa
File pluginDir = new File( testDir, "maven-mng3684-plugin" );
File projectDir = new File( testDir, "project" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "log-validate.txt" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3693PomFileBasedi
File pluginDir = new File( testDir, "maven-mng3693-plugin" );
File projectsDir = new File( testDir, "projects" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
@@ -64,7 +64,7 @@ public class MavenITmng3693PomFileBasedi
// remove the dependency from the local repository.
FileUtils.deleteDirectory( dep );
- verifier = new Verifier( projectsDir.getAbsolutePath() );
+ verifier = newVerifier( projectsDir.getAbsolutePath() );
verifier.executeGoal( "package" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java Tue Aug 3 00:36:19 2010
@@ -46,13 +46,13 @@ public class MavenITmng3694ReactorProjec
File pluginDir = new File( testDir, "maven-mng3694-plugin" );
File projectDir = new File( testDir, "projects" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3701ImplicitProfi
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3701" );
- 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/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java Tue Aug 3 00:36:19 2010
@@ -48,14 +48,14 @@ public class MavenITmng3703ExecutionProj
Verifier verifier;
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "log-mojo.txt" );
verifier.executeGoal( "package" );
@@ -73,14 +73,14 @@ public class MavenITmng3703ExecutionProj
Verifier verifier;
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "log-report.txt" );
verifier.executeGoal( "site" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java Tue Aug 3 00:36:19 2010
@@ -49,14 +49,14 @@ public class MavenITmng3704LifecycleExec
File projectDir = new File( testDir, "project" );
Verifier verifier;
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );