fix MPECLIPSE-51: check if src and test resources/dir doesn't cause duplicated src entries
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116158 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -111,10 +111,11 @@
|
||||
<u:file var="classpathFile" name="${dotClasspath}"/>
|
||||
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
|
||||
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@kind,'src')])"/>
|
||||
<!--
|
||||
<assert:assertEquals expected="6" value="${count.intValue().toString()}" msg="Wrong number of generated src directories found"/>
|
||||
|
||||
-->
|
||||
</goal>
|
||||
|
||||
|
||||
<goal name="test-classpath-has-overridden-jar">
|
||||
<attainGoal name="test-init"/>
|
||||
<attainGoal name="eclipse"/>
|
||||
@@ -138,8 +139,10 @@
|
||||
|
||||
<u:file var="classpathFile" name="${dotClasspath}"/>
|
||||
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
|
||||
<x:set var="countUniqueSrc" select="count($classpathDoc/classpath/classpathentry[contains(@path,'src/main')])"/>
|
||||
<x:set var="countUniqueSrc" select="count($classpathDoc/classpath/classpathentry[ends-with(@path,'src/main')])"/>
|
||||
<assert:assertEquals expected="1" value="${countUniqueSrc.intValue().toString()}" msg="Src directory should be added only once"/>
|
||||
<x:set var="countUniqueSrcTest" select="count($classpathDoc/classpath/classpathentry[ends-with(@path,'src/test')])"/>
|
||||
<assert:assertEquals expected="1" value="${countUniqueSrcTest.intValue().toString()}" msg="Test directory should be added only once"/>
|
||||
</goal>
|
||||
|
||||
<goal name="test-classpath-con-entry">
|
||||
|
||||
@@ -93,6 +93,9 @@
|
||||
<directory>src/test-resources</directory>
|
||||
<filtering>false</filtering>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>src/main</directory>
|
||||
</resource>
|
||||
</resources>
|
||||
</unitTest>
|
||||
<resources>
|
||||
@@ -107,6 +110,9 @@
|
||||
</includes>
|
||||
<filtering>false</filtering>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>src/test</directory>
|
||||
</resource>
|
||||
</resources>
|
||||
</build>
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user