maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r742112 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/
Date Sun, 08 Feb 2009 14:51:17 GMT
Author: bentmann
Date: Sun Feb  8 14:51:16 2009
New Revision: 742112

URL: http://svn.apache.org/viewvc?rev=742112&view=rev
Log:
o Compensated for the unfortunate fact that the Verifier treats CLI options as CLI lines rather
than individual args (which would be subject to proper quoting)

Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java?rev=742112&r1=742111&r2=742112&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
Sun Feb  8 14:51:16 2009
@@ -42,7 +42,7 @@
         verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties()
);
         verifier.deleteArtifacts( "org.apache.maven.its.it0007" );
         verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath()
);
+        verifier.getCliOptions().add( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/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=742112&r1=742111&r2=742112&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 Feb  8 14:51:16 2009
@@ -51,11 +51,11 @@
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( new File( testDir, "user-settings.xml" ).getAbsolutePath()
);
+        verifier.getCliOptions().add( "user-settings.xml" );
         if ( matchesVersionRange( "[3.0-alpha-1,)" ) )
         {
             verifier.getCliOptions().add( "--global-settings" );
-            verifier.getCliOptions().add( new File( testDir, "global-settings.xml" ).getAbsolutePath()
);
+            verifier.getCliOptions().add( "global-settings.xml" );
         }
         else
         {

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=742112&r1=742111&r2=742112&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
Sun Feb  8 14:51:16 2009
@@ -68,7 +68,7 @@
 
         // used to inject the remote repository
         cliOptions.add( "-s" );
-        cliOptions.add( settings.getAbsolutePath() );
+        cliOptions.add( settings.getName() );
 
         verifier.setCliOptions( cliOptions );
 
@@ -167,7 +167,7 @@
 
         // used to inject the remote repository
         cliOptions.add( "-s" );
-        cliOptions.add( settings.getAbsolutePath() );
+        cliOptions.add( settings.getName() );
 
         verifier.setCliOptions( cliOptions );
 
@@ -269,7 +269,7 @@
 
         // used to inject the remote repository
         cliOptions.add( "-s" );
-        cliOptions.add( settings.getAbsolutePath() );
+        cliOptions.add( settings.getName() );
 
         verifier.setCliOptions( cliOptions );
 

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=742112&r1=742111&r2=742112&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
Sun Feb  8 14:51:16 2009
@@ -103,7 +103,7 @@
         List cliOptions = new ArrayList();
         cliOptions.add( "-X" );
         cliOptions.add( "-s" );
-        cliOptions.add( settings.getPath() );
+        cliOptions.add( settings.getName() );
 
         verifier.setCliOptions( cliOptions );
         verifier.setLogFileName( "log-" + methodName + "-firstBuild.txt" );
@@ -176,7 +176,7 @@
         List cliOptions = new ArrayList();
         cliOptions.add( "-X" );
         cliOptions.add( "-s" );
-        cliOptions.add( settings.getPath() );
+        cliOptions.add( settings.getName() );
 
         verifier.setCliOptions( cliOptions );
 

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java?rev=742112&r1=742111&r2=742112&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
Sun Feb  8 14:51:16 2009
@@ -51,7 +51,7 @@
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.getCliOptions().add( "-f" );
-        verifier.getCliOptions().add( new File( testDir, "pom-with-unusual-name.xml" ).getAbsolutePath()
);
+        verifier.getCliOptions().add( "pom-with-unusual-name.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java?rev=742112&r1=742111&r2=742112&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
Sun Feb  8 14:51:16 2009
@@ -152,7 +152,7 @@
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath()
);
+        verifier.getCliOptions().add( "settings.xml" );
         verifier.getCliOptions().add( "-DdeploymentPort=" + port );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java?rev=742112&r1=742111&r2=742112&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
Sun Feb  8 14:51:16 2009
@@ -52,7 +52,7 @@
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath()
);
+        verifier.getCliOptions().add( "settings.xml" );
         verifier.getCliOptions().add( "--offline" );
         verifier.getCliOptions().add( "--batch-mode" );
         verifier.executeGoal( "validate" );



Mime
View raw message