You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/07/16 13:18:51 UTC
svn commit: r677239 - in
/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven:
embedder/ embedder/validation/ error/
Author: brett
Date: Wed Jul 16 04:18:50 2008
New Revision: 677239
URL: http://svn.apache.org/viewvc?rev=677239&view=rev
Log:
embedder tests that download artifacts and plugins should use the settings file for now to honour mirrors
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java?rev=677239&r1=677238&r2=677239&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java Wed Jul 16 04:18:50 2008
@@ -43,6 +43,7 @@
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
Configuration configuration = new DefaultConfiguration().setClassLoader( classLoader ).setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() );
+ configuration.setUserSettingsFile( MavenEmbedder.DEFAULT_USER_SETTINGS_FILE );
maven = new MavenEmbedder( configuration );
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=677239&r1=677238&r2=677239&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java Wed Jul 16 04:18:50 2008
@@ -74,6 +74,7 @@
Configuration configuration = new DefaultConfiguration()
.setClassLoader( classLoader )
.setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() );
+ configuration.setUserSettingsFile( MavenEmbedder.DEFAULT_USER_SETTINGS_FILE );
maven = new MavenEmbedder( configuration );
}
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java?rev=677239&r1=677238&r2=677239&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java Wed Jul 16 04:18:50 2008
@@ -31,6 +31,7 @@
import java.io.File;
import java.util.Arrays;
+import java.util.Iterator;
public class MavenEmbedderCrappySettingsConfigurationTest
extends PlexusTestCase
@@ -40,7 +41,7 @@
{
// START SNIPPET: simple-embedder-example
- File projectDirectory = new File( getBasedir(), "src/examples/simple-project" );
+ File projectDirectory = getTestFile( "src/examples/simple-project" );
File user = new File( projectDirectory, "invalid-settings.xml" );
@@ -58,9 +59,17 @@
MavenExecutionRequest request = new DefaultMavenExecutionRequest()
.setBaseDirectory( projectDirectory )
- .setGoals( Arrays.asList( new String[]{"clean", "install"} ) );
+ .setGoals( Arrays.asList( new String[]{"validate"} ) );
MavenExecutionResult result = embedder.execute( request );
+
+ for ( Iterator i = result.getExceptions().iterator(); i.hasNext(); )
+ {
+ Exception e = (Exception) i.next();
+ e.printStackTrace();
+ }
+
+ assertFalse( result.hasExceptions() );
assertNotNull( result.getProject() );
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java?rev=677239&r1=677238&r2=677239&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java Wed Jul 16 04:18:50 2008
@@ -78,7 +78,8 @@
Configuration configuration = new DefaultConfiguration().setClassLoader( classLoader )
.setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() );
-
+ configuration.setUserSettingsFile( MavenEmbedder.DEFAULT_USER_SETTINGS_FILE );
+
maven = new MavenEmbedder( configuration );
}