From d046f6039f3e1e61f6f8dd5cff3e1ae430112cc8 Mon Sep 17 00:00:00 2001 From: Brett Leslie Porter Date: Wed, 16 Jul 2008 11:18:50 +0000 Subject: [PATCH] embedder tests that download artifacts and plugins should use the settings file for now to honour mirrors git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@677239 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/embedder/AbstractEmbedderTestCase.java | 1 + .../apache/maven/embedder/MavenEmbedderTest.java | 1 + ...avenEmbedderCrappySettingsConfigurationTest.java | 13 +++++++++++-- .../maven/error/ErrorReporterPointcutTest.java | 3 ++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java b/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java index f99a2dfba2..eb5753a782 100644 --- a/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java +++ b/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java @@ -43,6 +43,7 @@ protected void setUp() 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 ); diff --git a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java b/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java index 2ae23ba09b..43c1c3f496 100644 --- a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java @@ -74,6 +74,7 @@ protected void setUp() Configuration configuration = new DefaultConfiguration() .setClassLoader( classLoader ) .setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() ); + configuration.setUserSettingsFile( MavenEmbedder.DEFAULT_USER_SETTINGS_FILE ); maven = new MavenEmbedder( configuration ); } diff --git a/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java b/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java index 5a135068aa..959ab4a08e 100644 --- a/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java @@ -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 @@ public void testEmbedderWillStillStartupWhenTheSettingsConfigurationIsCrap() { // 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 @@ public void testEmbedderWillStillStartupWhenTheSettingsConfigurationIsCrap() 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() ); diff --git a/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java b/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java index eb7f750491..09b709afac 100644 --- a/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java @@ -78,7 +78,8 @@ public void setUp() Configuration configuration = new DefaultConfiguration().setClassLoader( classLoader ) .setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() ); - + configuration.setUserSettingsFile( MavenEmbedder.DEFAULT_USER_SETTINGS_FILE ); + maven = new MavenEmbedder( configuration ); }