From f04109b5f2183a8251cac9041a3f02ef79e13b0e Mon Sep 17 00:00:00 2001
From: snicoll <snicoll@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 21 Aug 2006 16:57:38 +0000
Subject: [PATCH] [MPECLIPSE-119] Fixed test case so that it handles both m1.0
 and m1.1

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@433283 13f79535-47bb-0310-9956-ffa450edef68
---
 eclipse/src/plugin-test/maintest/maven.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclipse/src/plugin-test/maintest/maven.xml b/eclipse/src/plugin-test/maintest/maven.xml
index c1302b1f..382d841f 100644
--- a/eclipse/src/plugin-test/maintest/maven.xml
+++ b/eclipse/src/plugin-test/maintest/maven.xml
@@ -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>