You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2006/08/21 18:57:38 UTC
svn commit: r433283 -
/maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml
Author: snicoll
Date: Mon Aug 21 09:57:38 2006
New Revision: 433283
URL: http://svn.apache.org/viewvc?rev=433283&view=rev
Log:
[MPECLIPSE-119] Fixed test case so that it handles both m1.0 and m1.1
Modified:
maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml
Modified: maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml?rev=433283&r1=433282&r2=433283&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml Mon Aug 21 09:57:38 2006
@@ -137,10 +137,16 @@
<u:file var="classpathFile" name="${dotClasspath}"/>
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
+
+ <!-- maven.jar is now overrided as from maven 1.1-RC1 so break the test here -->
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/maven/jars/maven.jar')])"/>
- <assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="override by jar tag not found"/>
- <x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar')])"/>
+ <j:if test="count == 0">
+ <j:set var="mOneDotOnePath" value="${maven.home}/maven/jars/maven.jar"/>
+ <x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,$mOneDotOnePath)])"/>
+ </j:if>
<assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="maven.jar.override didn't work"/>
+ <x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar')])"/>
+ <assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="override by jar tag not found"/>
</goal>