svn commit: r726570 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java

[bentmann]

Author: bentmann
Date: Sun Dec 14 14:48:20 2008
New Revision: 726570

URL: http://svn.apache.org/viewvc?rev=726570&view=rev
Log:
[MNG-3625] revisit it0026

o Re-enabled IT for Maven 3.x by utilizing the new CLI option added in MNG-3914

Modified:
    
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java?rev=726570&r1=726569&r2=726570&view=diff
==============================================================================
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
 Sun Dec 14 14:48:20 2008
@@ -36,7 +36,6 @@
 {
     public MavenITmng0294MergeGlobalAndUserSettingsTest()
     {
-        super( "[,2.99.99)" );
     }
 
     /**
@@ -51,6 +50,13 @@
         systemProperties.put( "org.apache.maven.user-settings", 
"user-settings.xml" );
         systemProperties.put( "org.apache.maven.global-settings", 
"global-settings.xml" );
         verifier.setSystemProperties( systemProperties );
+        if ( matchesVersionRange( "(2.99,)" ) )
+        {
+            verifier.getCliOptions().add( "--settings" );
+            verifier.getCliOptions().add( new File( testDir, 
"user-settings.xml" ).getAbsolutePath() );
+            verifier.getCliOptions().add( "--global-settings" );
+            verifier.getCliOptions().add( new File( testDir, 
"global-settings.xml" ).getAbsolutePath() );
+        }
         verifier.executeGoal( 
"org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
         verifier.assertFilePresent( "target/test.txt" );
         verifier.verifyErrorFreeLog();