svn commit: r512536 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0023Test.java

[jv...@apache.org]

Author: jvanzyl
Date: Tue Feb 27 17:07:26 2007
New Revision: 512536

URL: http://svn.apache.org/viewvc?view=rev&rev=512536
Log:
o use the --settings command line option instead of a system property to set alternate settings file, works in
  all flavors of maven.

Modified:
    maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0023Test.java

Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0023Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0023Test.java?view=diff&rev=512536&r1=512535&r2=512536
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0023Test.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0023Test.java Tue Feb 27 17:07:26 2007
@@ -2,14 +2,16 @@
 
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 
 import java.io.File;
 import java.util.Properties;
+import java.util.List;
+import java.util.ArrayList;
 
 public class MavenIT0023Test
     extends AbstractMavenIntegrationTestCase
 {
-
     /**
      * Test profile inclusion from settings.xml (this one is activated by an id
      * in the activeProfiles section).
@@ -19,9 +21,9 @@
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0023" );
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        Properties systemProperties = new Properties();
-        systemProperties.put( "org.apache.maven.user-settings", "settings.xml" );
-        verifier.setSystemProperties( systemProperties );
+        List cliOptions = new ArrayList();
+        cliOptions.add( "--settings settings.xml" );
+        verifier.setCliOptions( cliOptions );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
         verifier.assertFilePresent( "target/test.txt" );
         verifier.verifyErrorFreeLog();