You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/02/28 19:21:59 UTC
svn commit: r512891 - in /maven/components/trunk/maven-embedder/src/test:
java/org/apache/maven/embedder/ resources/settings/
Author: jvanzyl
Date: Wed Feb 28 10:21:58 2007
New Revision: 512891
URL: http://svn.apache.org/viewvc?view=rev&rev=512891
Log:
o Tests for MNG-2835
Added:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java (contents, props changed)
- copied, changed from r512844, maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractMavenEmbedderTestCase.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java (with props)
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.java (contents, props changed)
- copied, changed from r512844, maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderUsingEclipsePluginTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java (with props)
Removed:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractMavenEmbedderTestCase.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderUsingEclipsePluginTest.java
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java
maven/components/trunk/maven-embedder/src/test/resources/settings/valid-settings.xml
Copied: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java (from r512844, maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractMavenEmbedderTestCase.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java?view=diff&rev=512891&p1=maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractMavenEmbedderTestCase.java&r1=512844&p2=maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java&r2=512891
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractMavenEmbedderTestCase.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java Wed Feb 28 10:21:58 2007
@@ -1,41 +1,18 @@
package org.apache.maven.embedder;
-import org.apache.maven.execution.MavenExecutionResult;
-import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionResult;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.PlexusTestCase;
-import java.util.List;
-import java.util.Iterator;
-import java.util.Arrays;
import java.io.File;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
-public abstract class AbstractMavenEmbedderTestCase
- extends PlexusTestCase
+public abstract class AbstractEmbedderExecutionTestCase
+ extends AbstractEmbedderTestCase
{
- protected MavenEmbedder maven;
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
-
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-
- Configuration configuration = new DefaultConfiguration()
- .setClassLoader( classLoader )
- .setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() );
-
- maven = new MavenEmbedder( configuration );
- }
-
- protected void tearDown()
- throws Exception
- {
- maven.stop();
- }
-
protected MavenExecutionRequest request( File basedir,
List goals )
{
Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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?view=auto&rev=512891
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java (added)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java Wed Feb 28 10:21:58 2007
@@ -0,0 +1,38 @@
+package org.apache.maven.embedder;
+
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionResult;
+
+import java.io.File;
+import java.util.List;
+import java.util.Arrays;
+import java.util.Iterator;
+
+public abstract class AbstractEmbedderTestCase
+ extends PlexusTestCase
+{
+ protected MavenEmbedder maven;
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+
+ Configuration configuration = new DefaultConfiguration()
+ .setClassLoader( classLoader )
+ .setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() );
+
+ maven = new MavenEmbedder( configuration );
+ }
+
+ protected void tearDown()
+ throws Exception
+ {
+ maven.stop();
+ }
+}
Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.java (from r512844, maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderUsingEclipsePluginTest.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.java?view=diff&rev=512891&p1=maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderUsingEclipsePluginTest.java&r1=512844&p2=maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.java&r2=512891
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderUsingEclipsePluginTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.java Wed Feb 28 10:21:58 2007
@@ -3,8 +3,8 @@
import java.io.File;
/** @author Jason van Zyl */
-public class MavenEmbedderUsingEclipsePluginTest
- extends AbstractMavenEmbedderTestCase
+public class EmbedderUsingEclipsePluginTest
+ extends AbstractEmbedderExecutionTestCase
{
protected String getId()
{
Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java?view=auto&rev=512891
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java (added)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java Wed Feb 28 10:21:58 2007
@@ -0,0 +1,32 @@
+package org.apache.maven.embedder;
+
+import org.codehaus.plexus.PlexusTestCase;
+
+import java.io.File;
+
+/** @author Jason van Zyl */
+public class MavenEmbedderBehaviorTest
+ extends PlexusTestCase
+{
+ public void testThatTheLocalRepositoryIsTakenFromGlobalSettingsWhenUserSettingsAreNull()
+ throws Exception
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+
+ Configuration configuration = new DefaultConfiguration()
+ .setClassLoader( classLoader )
+ .setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() )
+ .setUserSettingsFile( null )
+ .setGlobalSettingsFile( new File( getBasedir(), "src/test/resources/settings/valid-settings.xml" ) );
+
+ ConfigurationValidationResult result = MavenEmbedder.validateConfiguration( configuration );
+
+ assertTrue( result.isValid() );
+
+ MavenEmbedder maven = new MavenEmbedder( configuration );
+
+ assertEquals( "/global/maven/local-repository", maven.getLocalRepository().getBasedir() );
+
+ maven.stop();
+ }
+}
Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java?view=diff&rev=512891&r1=512890&r2=512891
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java Wed Feb 28 10:21:58 2007
@@ -78,4 +78,23 @@
// END SNIPPET: simple-embedder-example
}
+
+ public void testEmbedderExampleThatShowsHowToMimicTheMavenCLI()
+ throws Exception
+ {
+
+ // START SNIPPET: mimic-cli
+ Configuration configuration = new DefaultConfiguration()
+ .setUserSettingsFile( MavenEmbedder.DEFAULT_USER_SETTINGS_FILE )
+ .setGlobalSettingsFile( MavenEmbedder.DEFAULT_GLOBAL_SETTINGS_FILE )
+ .setClassLoader( Thread.currentThread().getContextClassLoader() );
+
+ ConfigurationValidationResult validationResult = MavenEmbedder.validateConfiguration( configuration );
+
+ if ( validationResult.isValid() )
+ {
+ // If the configuration is valid then do your thang ...
+ }
+ // END SNIPPET: mimic-cli
+ }
}
Modified: maven/components/trunk/maven-embedder/src/test/resources/settings/valid-settings.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/resources/settings/valid-settings.xml?view=diff&rev=512891&r1=512890&r2=512891
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/resources/settings/valid-settings.xml (original)
+++ maven/components/trunk/maven-embedder/src/test/resources/settings/valid-settings.xml Wed Feb 28 10:21:58 2007
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<settings>
- <localRepository>/Users/jvanzyl/maven-repo-local</localRepository>
+ <localRepository>/global/maven/local-repository</localRepository>
<pluginGroups>
<pluginGroup>org.codehaus.tycho</pluginGroup>
<pluginGroup>org.sonatype.pwt</pluginGroup>