Author: bentmann
Date: Tue May 12 12:48:41 2009
New Revision: 773870
URL: http://svn.apache.org/viewvc?rev=773870&view=rev
Log:
o Extended UT to capture MNG-3719 as well
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
maven/components/branches/MNG-2766/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java?rev=773870&r1=773869&r2=773870&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
Tue May 12 12:48:41 2009
@@ -101,7 +101,9 @@
File f1 = getTestFile(
"src/test/resources/projects/duplicate-plugins-merged-pom.xml" );
MavenProject project = getProject( f1 );
- assertEquals( 2, ( (Plugin) project.getBuildPlugins().get( 0 )
).getDependencies().size() );
+ assertEquals( 2, project.getBuildPlugins().get( 0
).getDependencies().size() );
+ assertEquals( 2, project.getBuildPlugins().get( 0
).getExecutions().size() );
+ assertEquals( "first", project.getBuildPlugins().get( 0
).getExecutions().get( 0 ).getId() );
}
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml?rev=773870&r1=773869&r2=773870&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml
Tue May 12 12:48:41 2009
@@ -15,6 +15,14 @@
<version>1</version>
</dependency>
</dependencies>
+ <executions>
+ <execution>
+ <id>first</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -25,6 +33,14 @@
<version>1</version>
</dependency>
</dependencies>
+ <executions>
+ <execution>
+ <id>second</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
