Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512555 13f79535-47bb-0310-9956-ffa450edef68

This commit is contained in:
Jason van Zyl 2007-02-28 01:33:00 +00:00
parent a96f5bdd95
commit afc8c1ac11
6 changed files with 92 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-embedder/pom.xml
View File

@ -27,7 +27,7 @@
<artifactId>maven-embedder</artifactId>
<name>Maven Embedder</name>
<properties>
<bundleVersion>2.1.0.v20070221-2149</bundleVersion>
<bundleVersion>2.1.0.v20070224-1541</bundleVersion>
</properties>
<build>
<resources>

3
maven-embedder/src/main/resources/META-INF/plexus/components.xml
View File

@ -8,9 +8,6 @@
<role>org.apache.maven.wagon.manager.WagonManager</role>
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.MavenTools</role>
</requirement>
<requirement>
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
</requirement>

27
maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
View File

@ -1,6 +1,8 @@
package org.apache.maven.embedder;
import org.apache.maven.SettingsConfigurationException;
import org.apache.maven.embedder.configuration.Configuration;
import org.apache.maven.embedder.configuration.DefaultConfiguration;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
@ -48,7 +50,11 @@ protected void setUp()
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
maven = new MavenEmbedder( classLoader, new MavenEmbedderConsoleLogger() );
Configuration configuration = new DefaultConfiguration()
.setClassLoader( classLoader )
.setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() );
maven = new MavenEmbedder( configuration );
}
protected void tearDown()
@ -115,9 +121,8 @@ public void testExecutionUsingAPomFile()
FileUtils.copyDirectoryStructure( testDirectory, targetDirectory );
MavenExecutionRequest request = new DefaultMavenExecutionRequest().setPomFile(
new File( targetDirectory,
"pom.xml" )
MavenExecutionRequest request =
new DefaultMavenExecutionRequest().setPomFile( new File( targetDirectory, "pom.xml" )
.getAbsolutePath() )
.setShowErrors( true ).setGoals( Arrays.asList( new String[]{"package"} ) );
@ -163,9 +168,8 @@ public void testExecutionUsingAProfileWhichSetsAProperty()
// Check with profile activated
MavenExecutionRequest request = new DefaultMavenExecutionRequest().setPomFile(
new File( targetDirectory,
"pom.xml" )
MavenExecutionRequest request =
new DefaultMavenExecutionRequest().setPomFile( new File( targetDirectory, "pom.xml" )
.getAbsolutePath() )
.setShowErrors( true ).setGoals( Arrays.asList( new String[]{"validate"} ) )
.addActiveProfile( "embedderProfile" );
@ -249,6 +253,7 @@ public void testProjectWithExtensionsReading()
.setPomFile( new File( basedir, "src/test/resources/pom2.xml" ).getAbsolutePath() );
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
MavenExecutionResult result = new ExtendableMavenEmbedder( classLoader ).readProjectWithDependencies( request );
assertNoExceptions( result );
@ -261,7 +266,6 @@ public void testProjectWithExtensionsReading()
// sources, test sources, and the junit jar..
assertEquals( 3, result.getMavenProject().getTestClasspathElements().size() );
}
// ----------------------------------------------------------------------------
@ -437,7 +441,9 @@ private class ExtendableMavenEmbedder
public ExtendableMavenEmbedder( ClassLoader classLoader )
throws MavenEmbedderException
{
super( classLoader, new MavenEmbedderConsoleLogger() );
super( new DefaultConfiguration()
.setClassLoader( classLoader )
.setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() ) );
}
protected Map getPluginExtensionComponents( Plugin plugin )
@ -449,7 +455,8 @@ protected Map getPluginExtensionComponents( Plugin plugin )
return toReturn;
}
protected void verifyPlugin( Plugin plugin, MavenProject project )
protected void verifyPlugin( Plugin plugin,
MavenProject project )
{
//ignore don't want to actually verify in test
}

4
maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java
View File

@ -1,6 +1,8 @@
package org.apache.maven.embedder;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.embedder.configuration.DefaultConfiguration;
import org.apache.maven.embedder.configuration.Configuration;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@ -25,7 +27,7 @@ protected void setUp()
ClassLoader loader = Thread.currentThread().getContextClassLoader();
MavenEmbedderConfiguration request = new DefaultMavenEmbedderConfiguration();
Configuration request = new DefaultConfiguration();
request.setClassLoader( loader );

39
maven-embedder/src/test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java Normal file
View File

@ -0,0 +1,39 @@
package org.apache.maven.embedder.configuration;
import org.codehaus.plexus.PlexusTestCase;
import org.apache.maven.embedder.MavenEmbedder;
import java.io.File;
/** @author Jason van Zyl */
public class ValidateConfigurationTest
extends PlexusTestCase
{
public void testConfigurationOnlyUserSettingsAreActive()
{
File user = new File( getBasedir(), "src/test/resources/settings/valid-settings.xml" );
Configuration configuration = new DefaultConfiguration()
.setUserSettingsFile( user );
ConfigurationValidationResult result = MavenEmbedder.validateConfiguration( configuration );
assertTrue( result.isUserSettingsFileParses() );
assertTrue( result.isUserSettingsFileParses() );
}
public void testConfigurationOnlyGlobalSettingsAreActive()
{
File user = new File( getBasedir(), "src/test/resources/settings/valid-settings.xml" );
Configuration configuration = new DefaultConfiguration()
.setUserSettingsFile( user );
ConfigurationValidationResult result = MavenEmbedder.validateConfiguration( configuration );
assertTrue( result.isUserSettingsFileParses() );
assertTrue( result.isUserSettingsFileParses() );
}
}

8
maven-embedder/src/test/resources/settings/valid-settings.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0"?>
<settings>
<localRepository>/Users/jvanzyl/maven-repo-local</localRepository>
<pluginGroups>
<pluginGroup>org.codehaus.tycho</pluginGroup>
<pluginGroup>org.sonatype.pwt</pluginGroup>
</pluginGroups>
</settings>