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 [4/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/MavenITmng2576MakeLikeReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java Tue Aug 3 00:36:19 2010
@@ -56,7 +56,7 @@ public class MavenITmng2576MakeLikeReact
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2576" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
verifier.getCliOptions().add( "-pl" );
@@ -81,7 +81,7 @@ public class MavenITmng2576MakeLikeReact
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2576" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
verifier.getCliOptions().add( "-pl" );
@@ -107,7 +107,7 @@ public class MavenITmng2576MakeLikeReact
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2576" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
verifier.getCliOptions().add( "-pl" );
@@ -133,7 +133,7 @@ public class MavenITmng2576MakeLikeReact
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2576" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
verifier.getCliOptions().add( "-pl" );
@@ -160,7 +160,7 @@ public class MavenITmng2576MakeLikeReact
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2576" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
verifier.assertFileNotPresent( "sub-d/pom.xml" );
@@ -186,7 +186,7 @@ public class MavenITmng2576MakeLikeReact
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2576" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
verifier.getCliOptions().add( "-pl" );
@@ -214,7 +214,7 @@ public class MavenITmng2576MakeLikeReact
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2576" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
verifier.getCliOptions().add( "-pl" );
@@ -239,7 +239,7 @@ public class MavenITmng2576MakeLikeReact
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2576" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
verifier.getCliOptions().add( "-rf" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng2577SettingsXmlIn
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2577" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "--settings" );
@@ -72,7 +72,7 @@ public class MavenITmng2577SettingsXmlIn
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2577" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "--settings" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java Tue Aug 3 00:36:19 2010
@@ -64,7 +64,7 @@ public class MavenITmng2591MergeInherite
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2591/" + project );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "subproject/target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng2605BogusProfileA
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2605" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "--settings" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java Tue Aug 3 00:36:19 2010
@@ -38,7 +38,7 @@ public class MavenITmng2668UsePluginDepe
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2668" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng2668" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java Tue Aug 3 00:36:19 2010
@@ -52,7 +52,7 @@ public class MavenITmng2690MojoLoadingEr
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2690/noclassdef-mojo" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
try
@@ -84,7 +84,7 @@ public class MavenITmng2690MojoLoadingEr
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2690/noclassdef-param" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
try
@@ -116,7 +116,7 @@ public class MavenITmng2690MojoLoadingEr
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2690/mojo-complookup" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
try
@@ -148,7 +148,7 @@ public class MavenITmng2690MojoLoadingEr
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2690/requirement-complookup" );
- 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/MavenITmng2693SitePluginRealmTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenITmng2693SitePluginRea
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2693" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "pre-site" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng2695OfflinePlugin
{
// phase 1: run build in online mode to fill local repo
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2695" );
verifier.setAutoclean( false );
@@ -68,7 +68,7 @@ public class MavenITmng2695OfflinePlugin
{
// phase 2: run build in offline mode to check it still passes
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.setLogFileName( "log2.txt" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java Tue Aug 3 00:36:19 2010
@@ -52,7 +52,7 @@ public class MavenITmng2720SiblingClassp
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2720" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "child2/target" );
verifier.deleteDirectory( "child3/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng2739RequiredRepos
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
try
@@ -92,7 +92,7 @@ public class MavenITmng2739RequiredRepos
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
try
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java Tue Aug 3 00:36:19 2010
@@ -62,7 +62,7 @@ public class MavenITmng2741PluginMetadat
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2741" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setLogFileName( "log-" + test + ".txt" );
verifier.getCliOptions().add( "--settings" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng2744checksumVerif
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2744" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng2744" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng2749ExtensionAvai
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2749" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2749" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java Tue Aug 3 00:36:19 2010
@@ -45,19 +45,19 @@ public class MavenITmng2771PomExtensionC
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/extension" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/plugin" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/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/MavenITmng2790LastUpdatedMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java Tue Aug 3 00:36:19 2010
@@ -56,7 +56,7 @@ public class MavenITmng2790LastUpdatedMe
/*
* Phase 1: Install initial snapshot into local repo.
*/
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
File metadataArtifactVersionFile =
new File( verifier.getArtifactMetadataPath( "org.apache.maven.its.mng2790", "project", "1.0-SNAPSHOT" ) );
File metadataArtifactFile =
@@ -82,7 +82,7 @@ public class MavenITmng2790LastUpdatedMe
/*
* Phase 2: Re-install snapshot and check for proper timestamp update in local metadata.
*/
- verifier = new Verifier( testDir.getAbsolutePath() );
+ 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/MavenITmng2820PomCommentsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng2820PomCommentsTe
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2820" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2820" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java Tue Aug 3 00:36:19 2010
@@ -41,7 +41,7 @@ public class MavenITmng2831CustomArtifac
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2831" );
- 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/MavenITmng2843PluginConfigPropertiesInjectionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng2843PluginConfigP
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2843" );
- 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/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng2848ProfileActiva
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2848" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setEnvironmentVariable( "MNG2848", "GO" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java Tue Aug 3 00:36:19 2010
@@ -39,7 +39,7 @@ public class MavenITmng2861RelocationsAn
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2861" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "A/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2861" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java Tue Aug 3 00:36:19 2010
@@ -81,7 +81,7 @@ public class MavenITmng2865MirrorWildcar
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2865" );
- Verifier verifier = new Verifier( new File( testDir, project ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, project ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng2865" );
Properties filterProps = verifier.newDefaultFilterProperties();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng2871PrePackageSub
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2871" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "consumer/target" );
verifier.executeGoal( "compile" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng2878DefaultReport
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2878" );
- 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/MavenITmng2883LegacyRepoOfflineTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java Tue Aug 3 00:36:19 2010
@@ -58,20 +58,17 @@ public class MavenITmng2883LegacyRepoOff
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
- List cliOptions = new ArrayList();
// used to inject the remote repository
- cliOptions.add( "-s" );
- cliOptions.add( settings.getName() );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( settings.getName() );
// execute once just to make sure this test works at all!
try
@@ -86,9 +83,7 @@ public class MavenITmng2883LegacyRepoOff
}
// the centerpiece of these tests!
- cliOptions.add( "-o" );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-o" );
// re-run in offline mode, should still succeed by using local repo
verifier.setLogFileName( "log-parent-b.txt" );
@@ -157,21 +152,17 @@ public class MavenITmng2883LegacyRepoOff
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
- List cliOptions = new ArrayList();
-
File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
// used to inject the remote repository
- cliOptions.add( "-s" );
- cliOptions.add( settings.getName() );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( settings.getName() );
// execute once just to make sure this test works at all!
try
@@ -186,9 +177,7 @@ public class MavenITmng2883LegacyRepoOff
}
// the centerpiece of these tests!
- cliOptions.add( "-o" );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-o" );
// re-run in offline mode, should still succeed by using local repo
verifier.setLogFileName( "log-dep-b.txt" );
@@ -259,7 +248,7 @@ public class MavenITmng2883LegacyRepoOff
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
@@ -270,18 +259,14 @@ public class MavenITmng2883LegacyRepoOff
verifier.newDefaultFilterProperties() );
// used to inject the remote repository
- cliOptions.add( "-s" );
- cliOptions.add( settings.getName() );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( settings.getName() );
verifier.setLogFileName( "log-plugin-a.txt" );
verifier.executeGoal( "org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run" );
// the centerpiece of these tests!
- cliOptions.add( "-o" );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-o" );
// re-run in offline mode, should still succeed by using local repo
verifier.setLogFileName( "log-plugin-b.txt" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng2892HideCorePlexu
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2892" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng2892", "jar" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java Tue Aug 3 00:36:19 2010
@@ -54,7 +54,7 @@ public class MavenITmng2921ActiveAttache
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2921" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "consumer/target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng2926PluginPrefixO
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteArtifacts( "org.apache.maven.its.mng2926" );
verifier.deleteArtifacts( "org.apache.maven.plugins", "mng-2926", "0.1" );
verifier.deleteArtifacts( "org.apache.maven.plugins", "mng-2926", "0.1" );
@@ -63,7 +63,7 @@ public class MavenITmng2926PluginPrefixO
new File( verifier.localRepo, "org/codehaus/mojo/resolver-status.properties" ).delete();
verifier.resetStreams();
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setLogFileName( "log-default.txt" );
verifier.filterFile( "settings-default-template.xml", "settings-default.xml", "UTF-8",
@@ -74,7 +74,7 @@ public class MavenITmng2926PluginPrefixO
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setLogFileName( "log-custom.txt" );
verifier.filterFile( "settings-custom-template.xml", "settings-custom.xml", "UTF-8",
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng2972OverridePlugi
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2972/test1" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifact( "org.apache.maven.its.plugins.class-loader", "dep-b", "0.2-mng-2972", "jar" );
@@ -76,7 +76,7 @@ public class MavenITmng2972OverridePlugi
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2972/test2" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifact( "org.apache.maven.its.plugins.class-loader", "dep-b", "9.9-MNG-2972", "jar" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenITmng2994SnapshotRange
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2994" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteArtifacts( "org.apache.maven.its.mng2994" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.getCliOptions().add( "--settings" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3004ReactorFailur
{
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" );
@@ -56,9 +56,7 @@ public class MavenITmng3004ReactorFailur
verifier.deleteDirectory( "subproject3/target" );
verifier.getCliOptions().add( "--fail-fast" );
verifier.setLogFileName( "log-ff-mt1.txt" );
- Properties systemProperties = new Properties();
- systemProperties.setProperty( "maven.threads.experimental", "1" );
- verifier.setSystemProperties( systemProperties );
+ verifier.setSystemProperty( "maven.threads.experimental", "1" );
try
{
@@ -86,7 +84,7 @@ public class MavenITmng3004ReactorFailur
{
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" );
@@ -94,9 +92,7 @@ public class MavenITmng3004ReactorFailur
verifier.deleteDirectory( "subproject3/target" );
verifier.getCliOptions().add( "--fail-never" );
verifier.setLogFileName( "log-fn-mt1.txt" );
- Properties systemProperties = new Properties();
- systemProperties.setProperty( "maven.threads.experimental", "1" );
- verifier.setSystemProperties( systemProperties );
+ verifier.setSystemProperty( "maven.threads.experimental", "1" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.resetStreams();
@@ -116,7 +112,7 @@ public class MavenITmng3004ReactorFailur
{
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" );
@@ -124,9 +120,7 @@ public class MavenITmng3004ReactorFailur
verifier.deleteDirectory( "subproject3/target" );
verifier.getCliOptions().add( "--fail-at-end" );
verifier.setLogFileName( "log-fae-mt1.txt" );
- Properties systemProperties = new Properties();
- systemProperties.setProperty( "maven.threads.experimental", "1" );
- verifier.setSystemProperties( systemProperties );
+ verifier.setSystemProperty( "maven.threads.experimental", "1" );
try
{
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
@@ -153,7 +147,7 @@ public class MavenITmng3004ReactorFailur
{
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" );
@@ -161,9 +155,7 @@ public class MavenITmng3004ReactorFailur
verifier.deleteDirectory( "subproject3/target" );
verifier.getCliOptions().add( "--fail-never" );
verifier.setLogFileName( "log-fn-mt2.txt" );
- Properties systemProperties = new Properties();
- systemProperties.setProperty( "maven.threads.experimental", "2" );
- verifier.setSystemProperties( systemProperties );
+ verifier.setSystemProperty( "maven.threads.experimental", "2" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.resetStreams();
@@ -183,7 +175,7 @@ public class MavenITmng3004ReactorFailur
{
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" );
@@ -191,9 +183,7 @@ public class MavenITmng3004ReactorFailur
verifier.deleteDirectory( "subproject3/target" );
verifier.getCliOptions().add( "--fail-at-end" );
verifier.setLogFileName( "log-fae-mt2.txt" );
- Properties systemProperties = new Properties();
- systemProperties.setProperty( "maven.threads.experimental", "2" );
- verifier.setSystemProperties( systemProperties );
+ verifier.setSystemProperty( "maven.threads.experimental", "2" );
try
{
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/MavenITmng3012CoreClassImportTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng3012CoreClassImpo
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3012" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "jar" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java Tue Aug 3 00:36:19 2010
@@ -53,7 +53,7 @@ public class MavenITmng3023ReactorDepend
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3023" );
// First pass. Make sure the dependency cannot be resolved.
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setLogFileName( "log-a.txt" );
@@ -88,7 +88,7 @@ public class MavenITmng3023ReactorDepend
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3023" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setLogFileName( "log-b.txt" );
// The IT doesn't actually run the compiler but merely mimics its effect, i.e. the creation of the output dir
@@ -122,7 +122,7 @@ public class MavenITmng3023ReactorDepend
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3023" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3023" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng3038TransitiveDep
File testProjectDir = new File( testDirBase, "test-project" );
- Verifier verifier = new Verifier( testProjectDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testProjectDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.it0121", "A", "1.0", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.it0121", "A", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0121", "B", "1.0", "pom" );
@@ -66,7 +66,7 @@ public class MavenITmng3038TransitiveDep
throws VerificationException, IOException
{
File testOtherDepDir = new File( testDirBase, "test-other-deps/" + projectDDepDir );
- Verifier verifierOtherDep = new Verifier( testOtherDepDir.getAbsolutePath() );
+ Verifier verifierOtherDep = newVerifier( testOtherDepDir.getAbsolutePath() );
verifierOtherDep.deleteArtifact( "org.apache.maven.its.it0121", "D", version, "jar" );
verifierOtherDep.deleteArtifact( "org.apache.maven.its.it0121", "D", version, "pom" );
verifierOtherDep.executeGoal( "install" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3043BestEffortRea
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3043" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "consumer-a/target" );
verifier.deleteDirectory( "consumer-b/target" );
@@ -103,7 +103,7 @@ public class MavenITmng3043BestEffortRea
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3043" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "consumer-a/target" );
verifier.deleteDirectory( "consumer-b/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java Tue Aug 3 00:36:19 2010
@@ -56,7 +56,7 @@ public class MavenITmng3052DepRepoAggreg
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3052" ).getCanonicalFile();
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3052" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,6 @@ public class MavenITmng3057VersionExprTr
public MavenITmng3057VersionExprTransformationsTest()
{
- // TODO: port to 3.x
super( "[2.1.0,2.1.1)" ); // only test in 2.1.0
}
@@ -59,7 +58,7 @@ public class MavenITmng3057VersionExprTr
File remoteRepo = new File( testDir, "target/deployment" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "level2/target" );
@@ -71,17 +70,10 @@ public class MavenITmng3057VersionExprTr
verifier.filterFile( "pom.xml", "pom-filtered.xml", "UTF-8", properties );
- List cliOptions = new ArrayList();
- cliOptions.add( "-V" );
- cliOptions.add( "-DtestVersion=1" );
- cliOptions.add( "-f pom-filtered.xml" );
+ verifier.getCliOptions().add( "-V" );
+ verifier.getCliOptions().add( "-DtestVersion=1" );
+ verifier.getCliOptions().add( "-f pom-filtered.xml" );
- verifier.setCliOptions( cliOptions );
-
-// Map envars = new HashMap();
-// envars.put( "MAVEN_OPTS", "-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=5005 -Djava.compiler=NONE" );
-// verifier.executeGoal( "deploy", envars );
-
verifier.executeGoal( "generate-sources" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3092SnapshotsExcl
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3092" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3092" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3099SettingsProfi
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3099" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3099" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.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;
@@ -52,21 +50,16 @@ public class MavenITmng3106ProfileMultip
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
-
- List cliOptions = new ArrayList();
- cliOptions.add( "-Dprofile1.on=true" );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-Dprofile1.on=true" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.assertFilePresent( "target/profile1/touch.txt" );
verifier.assertFilePresent( "target/profile2/touch.txt" );
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3118TestClassPath
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3118" );
- 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/MavenITmng3122ActiveProfilesNoDuplicatesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java Tue Aug 3 00:36:19 2010
@@ -53,7 +53,7 @@ public class MavenITmng3122ActiveProfile
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3122" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "--settings" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3133UrlNormalizat
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3133" );
- Verifier verifier = new Verifier( new File( testDir, "child" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "child" ).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/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng3139UseCachedMeta
// phase 1: get the metadata into the local repo
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3139" );
@@ -64,7 +64,7 @@ public class MavenITmng3139UseCachedMeta
// phase 2: trigger blacklisting of repo (by invalid URL) and check previously downloaded metadata is stil used
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8",
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng3183LoggingToFile
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3183" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.getCliOptions().add( "-l" );
verifier.getCliOptions().add( "maven.log" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java Tue Aug 3 00:36:19 2010
@@ -52,7 +52,7 @@ public class MavenITmng3203DefaultLifecy
// file.
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3203" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "compile" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3208ProfileAwareR
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3208" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "-Pmng3208" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3217InterPluginDe
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3217" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "sub-1/target" );
verifier.deleteDirectory( "sub-2/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java Tue Aug 3 00:36:19 2010
@@ -42,7 +42,7 @@ public class MavenITmng3220ImportScopeTe
testDir = new File( testDir, "imported-pom-depMgmt" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3220" );
@@ -61,7 +61,7 @@ public class MavenITmng3220ImportScopeTe
testDir = new File( testDir, "depMgmt-pom-module-notImported" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3220" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.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 MavenITmng3221InfiniteForkingTest
extends AbstractMavenIntegrationTestCase
@@ -46,7 +44,7 @@ public class MavenITmng3221InfiniteForki
try
{
- verifier = new Verifier( reportDir.getAbsolutePath() );
+ verifier = newVerifier( reportDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng3221", "maven-forking-report-plugin", "1", "jar" );
@@ -55,11 +53,9 @@ public class MavenITmng3221InfiniteForki
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "-Psite" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-Psite" );
verifier.setLogFileName( "mng-3221-a-log.txt" );
verifier.executeGoal( "site" );
@@ -86,7 +82,7 @@ public class MavenITmng3221InfiniteForki
try
{
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng3221", "maven-forking-test-plugin", "1", "jar" );
@@ -95,11 +91,9 @@ public class MavenITmng3221InfiniteForki
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "-Pplugin" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-Pplugin" );
verifier.setLogFileName( "mng-3221-b-log.txt" );
verifier.executeGoal( "package" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.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-3259">MNG-3259</a>.
@@ -51,11 +49,7 @@ public class MavenITmng3259DepsDroppedIn
Verifier verifier;
- verifier = new Verifier( new File( testDir, "parent" ).getAbsolutePath() );
-
- List cliOptions = new ArrayList();
-
- verifier.setCliOptions( cliOptions );
+ verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
verifier.executeGoal( "install" );
@@ -63,7 +57,7 @@ public class MavenITmng3259DepsDroppedIn
verifier.resetStreams();
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java Tue Aug 3 00:36:19 2010
@@ -23,31 +23,28 @@ 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 MavenITmng3268MultipleDashPCommandLineTest
extends AbstractMavenIntegrationTestCase
{
+
public MavenITmng3268MultipleDashPCommandLineTest()
{
super( "(2.0.9,)" );
}
- public void testMultipleProfileParams ()
+ public void testMultipleProfileParams()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3268" );
Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "-Pprofile1,profile2" );
- cliOptions.add( "-Pprofile3" );
- cliOptions.add( "-P profile4" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-Pprofile1,profile2" );
+ verifier.getCliOptions().add( "-Pprofile3" );
+ verifier.getCliOptions().add( "-P profile4" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
@@ -57,4 +54,5 @@ public class MavenITmng3268MultipleDashP
verifier.assertFilePresent( "target/profile4/touch.txt" );
verifier.resetStreams();
}
+
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3271DefaultReport
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3271" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng3284UsingCachedPl
* reloading of the plugin container by the DefaultPluginManager in Maven 2.x, thereby hiding the bug we want
* to expose here.
*/
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3284" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
@@ -64,7 +64,7 @@ public class MavenITmng3284UsingCachedPl
/*
* Phase 2: Now that the plugin versions have been downloaded to the local repo, run the actual test.
*/
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "mod-a/target" );
verifier.deleteDirectory( "mod-b/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java Tue Aug 3 00:36:19 2010
@@ -44,7 +44,7 @@ public class MavenITmng3288SystemScopeDi
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3288" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
try
{