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>

75
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()
@ -91,7 +97,7 @@ public void testExecutionUsingABaseDirectory()
FileUtils.copyDirectoryStructure( testDirectory, targetDirectory );
MavenExecutionRequest request = new DefaultMavenExecutionRequest().setBaseDirectory( targetDirectory )
.setShowErrors( true ).setGoals( Arrays.asList( new String[] { "package" } ) );
.setShowErrors( true ).setGoals( Arrays.asList( new String[]{"package"} ) );
MavenExecutionResult result = maven.execute( request );
@ -115,16 +121,15 @@ public void testExecutionUsingAPomFile()
FileUtils.copyDirectoryStructure( testDirectory, targetDirectory );
MavenExecutionRequest request = new DefaultMavenExecutionRequest().setPomFile(
new File( targetDirectory,
"pom.xml" )
.getAbsolutePath() )
.setShowErrors( true ).setGoals( Arrays.asList( new String[] { "package" } ) );
MavenExecutionRequest request =
new DefaultMavenExecutionRequest().setPomFile( new File( targetDirectory, "pom.xml" )
.getAbsolutePath() )
.setShowErrors( true ).setGoals( Arrays.asList( new String[]{"package"} ) );
MavenExecutionResult result = maven.execute( request );
assertNoExceptions( result );
MavenProject project = result.getMavenProject();
assertEquals( "embedder-test-project", project.getArtifactId() );
@ -147,10 +152,10 @@ public void testExecutionUsingAProfileWhichSetsAProperty()
MavenExecutionRequest requestWithoutProfile = new DefaultMavenExecutionRequest()
.setPomFile( new File( targetDirectory, "pom.xml" ).getAbsolutePath() ).setShowErrors( true )
.setGoals( Arrays.asList( new String[] { "validate" } ) );
.setGoals( Arrays.asList( new String[]{"validate"} ) );
MavenExecutionResult r0 = maven.execute( requestWithoutProfile );
assertNoExceptions( r0 );
MavenProject p0 = r0.getMavenProject();
@ -163,12 +168,11 @@ public void testExecutionUsingAProfileWhichSetsAProperty()
// Check with profile activated
MavenExecutionRequest request = new DefaultMavenExecutionRequest().setPomFile(
new File( targetDirectory,
"pom.xml" )
.getAbsolutePath() )
.setShowErrors( true ).setGoals( Arrays.asList( new String[] { "validate" } ) )
.addActiveProfile( "embedderProfile" );
MavenExecutionRequest request =
new DefaultMavenExecutionRequest().setPomFile( new File( targetDirectory, "pom.xml" )
.getAbsolutePath() )
.setShowErrors( true ).setGoals( Arrays.asList( new String[]{"validate"} ) )
.addActiveProfile( "embedderProfile" );
MavenExecutionResult r1 = maven.execute( request );
@ -230,7 +234,7 @@ public void testProjectReading()
.setPomFile( getPomFile().getAbsolutePath() );
MavenExecutionResult result = maven.readProjectWithDependencies( request );
assertNoExceptions( result );
assertEquals( "org.apache.maven", result.getMavenProject().getGroupId() );
@ -249,8 +253,9 @@ 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 );
// Iterator it = result.getMavenProject().getTestClasspathElements().iterator();
@ -261,7 +266,6 @@ public void testProjectWithExtensionsReading()
// sources, test sources, and the junit jar..
assertEquals( 3, result.getMavenProject().getTestClasspathElements().size() );
}
// ----------------------------------------------------------------------------
@ -287,24 +291,24 @@ public void testModelWriting()
assertEquals( "org.apache.maven.new", model.getGroupId() );
}
// ----------------------------------------------------------------------
// Settings-File Handling
// ----------------------------------------------------------------------
public void testReadSettings()
throws IOException, SettingsConfigurationException, MavenEmbedderException
{
Settings s = new Settings();
s.setOffline( true );
String localRepoPath = "/path/to/local/repo";
s.setLocalRepository( localRepoPath );
File settingsFile = File.createTempFile( "embedder-test.settings.", "" );
settingsFile.deleteOnExit();
FileWriter writer = null;
try
{
@ -315,9 +319,9 @@ public void testReadSettings()
{
IOUtil.close( writer );
}
Settings result = MavenEmbedder.readSettings( settingsFile );
assertEquals( localRepoPath, result.getLocalRepository() );
assertTrue( result.isOffline() );
}
@ -326,12 +330,12 @@ public void testReadSettings_shouldFailToValidate()
throws IOException, SettingsConfigurationException, MavenEmbedderException
{
Settings s = new Settings();
Profile p = new Profile();
Repository r = new Repository();
r.setUrl( "http://example.com" );
p.addRepository( r );
s.addProfile( p );
@ -355,7 +359,7 @@ public void testReadSettings_shouldFailToValidate()
fail( "Settings should not pass validation when being read." );
}
catch( IOException e )
catch ( IOException e )
{
String message = e.getMessage();
assertTrue( message.indexOf( "Failed to validate" ) > -1 );
@ -411,7 +415,7 @@ public void testWriteSettings_shouldFailToValidate()
try
{
MavenEmbedder.writeSettings( settingsFile, s );
fail( "Validation of settings should fail before settings are written." );
}
catch ( IOException e )
@ -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>