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 2008/12/18 05:23:35 UTC
svn commit: r727635 - in /maven/components/trunk/maven-project/src:
main/java/org/apache/maven/project/builder/impl/
test/java/org/apache/maven/project/builder/
test/resources-project-builder/micromailer/
Author: jvanzyl
Date: Wed Dec 17 20:23:35 2008
New Revision: 727635
URL: http://svn.apache.org/viewvc?rev=727635&view=rev
Log:
o testing ThatExecutionsWithoutIdsAreMergedAndTheChildWins
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
maven/components/trunk/maven-project/src/test/resources-project-builder/micromailer/micromailer-1.0.3.pom
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=727635&r1=727634&r2=727635&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Wed Dec 17 20:23:35 2008
@@ -303,13 +303,15 @@
logger.debug( "Parent pom ids do not match: Parent File = " + parentFile.getAbsolutePath() + ", Parent ID = "
+ parentDomainModel.getId() + ", Child ID = " + domainModel.getId() + ", Expected Parent ID = "
+ domainModel.getModel().getParent().getId() );
+
List<DomainModel> parentDomainModels = getDomainModelParentsFromRepository( domainModel, artifactResolver );
+
if(parentDomainModels.size() == 0)
{
throw new IOException("Unable to find parent pom on local path or repo: "
+ domainModel.getModel().getParent().getId());
}
- //logger.info("Attempting to lookup from the repository: Found parents: " + parentDomainModels.size());
+
domainModels.addAll( parentDomainModels );
return domainModels;
}
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=727635&r1=727634&r2=727635&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Wed Dec 17 20:23:35 2008
@@ -31,37 +31,47 @@
protected void setUp()
throws Exception
{
- testDirectory = new File( getBasedir(), BASE_POM_DIR );
-
+ testDirectory = new File( getBasedir(), BASE_POM_DIR );
projectBuilder = lookup( ProjectBuilder.class );
-
mavenTools = lookup( MavenTools.class );
}
- public void testNexusPoms()
+ public void testThatAllPluginExecutionsWithIdsAreJoined()
throws Exception
{
- Map<String,File> artifacts = new HashMap<String,File>();
-
- File nexusLauncher = new File( testDirectory, "nexus/nexus-test-harness-launcher/pom.xml" );
-
- PomArtifactResolver resolver = new FileBasedPomArtifactResolver( new File( BASE_POM_DIR, "nexus" ) );
-
- // make a version that doesn't require a null mixin set. for most pom construction tests we're
- // not going to use mixins.
- PomClassicDomainModel model = projectBuilder.buildModel( nexusLauncher, null, resolver );
-
- // Make sure we actually processed our 3 POMs.
- assertEquals( 3, model.getLineageCount() );
-
- PomTestWrapper pom = new PomTestWrapper( model );
-
- assertEquals( "maven-dependency-plugin", pom.getValue( "build/plugins[4]/artifactId" ) );
-
- List executions = (List) pom.getValue( "build/plugins[4]/executions" );
-
+ File nexusLauncher = new File( testDirectory, "nexus/nexus-test-harness-launcher/pom.xml" );
+ PomArtifactResolver resolver = artifactResolver( "nexus" );
+ PomClassicDomainModel model = projectBuilder.buildModel( nexusLauncher, null, resolver );
+ assertEquals( 3, model.getLineageCount() );
+ PomTestWrapper pom = new PomTestWrapper( model );
+ assertModelEquals( pom, "maven-dependency-plugin", "build/plugins[4]/artifactId" );
+ List executions = (List) pom.getValue( "build/plugins[4]/executions" );
assertEquals( 7, executions.size() );
}
+
+ public void testThatExecutionsWithoutIdsAreMergedAndTheChildWins()
+ throws Exception
+ {
+ File pom = new File( testDirectory, "micromailer/micromailer-1.0.3.pom" );
+ System.out.println( pom.exists());
+ PomArtifactResolver resolver = artifactResolver( "micromailer" );
+ PomClassicDomainModel model = projectBuilder.buildModel( pom, null, resolver );
+ // This should be 2
+ //assertEquals( 2, model.getLineageCount() );
+ PomTestWrapper tester = new PomTestWrapper( model );
+ assertModelEquals( tester, "child-descriptor", "build/plugins[1]/executions[1]/goals[1]" );
+ }
+
+ private PomArtifactResolver artifactResolver( String basedir )
+ {
+ PomArtifactResolver resolver = new FileBasedPomArtifactResolver( new File( BASE_POM_DIR, basedir ) );
+ return resolver;
+ }
+
+ protected void assertModelEquals( PomTestWrapper pom, Object expected, String expression )
+ {
+ assertEquals( expected, pom.getValue( expression ) );
+ }
// Need to get this to walk around a directory and automatically build up the artifact set. If we
// follow some standard conventions this can be simple.
@@ -82,7 +92,8 @@
if ( file.getName().endsWith( ".pom" ) )
{
int i = fileName.indexOf( ".pom" );
- String id = fileName.substring( 0, i - 1 );
+ String id = fileName.substring( 0, i );
+ System.out.println( id );
artifacts.put( id, file );
}
}
@@ -96,7 +107,9 @@
public void resolve( Artifact artifact )
throws IOException
{
- artifact.setFile( artifacts.get( artifact.getArtifactId() ) );
+ String id = artifact.getArtifactId() + "-" + artifact.getVersion();
+ System.out.println( id );
+ artifact.setFile( artifacts.get( id ) );
}
}
}
Modified: maven/components/trunk/maven-project/src/test/resources-project-builder/micromailer/micromailer-1.0.3.pom
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/micromailer/micromailer-1.0.3.pom?rev=727635&r1=727634&r2=727635&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/micromailer/micromailer-1.0.3.pom (original)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/micromailer/micromailer-1.0.3.pom Wed Dec 17 20:23:35 2008
@@ -112,7 +112,7 @@
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>child-descriptor</goal>
</goals>
</execution>
</executions>
@@ -120,4 +120,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>