svn commit: r480617 - /maven/maven-1/plugins/trunk/eclipse/src/plugin-test/wtptest/maven.xml

[ah...@apache.org]

Author: aheritier
Date: Wed Nov 29 08:35:06 2006
New Revision: 480617

URL: http://svn.apache.org/viewvc?view=rev&rev=480617
Log:
Fix tests to handle wtp settings 0.7 and 1.5

Modified:
    maven/maven-1/plugins/trunk/eclipse/src/plugin-test/wtptest/maven.xml

Modified: maven/maven-1/plugins/trunk/eclipse/src/plugin-test/wtptest/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/eclipse/src/plugin-test/wtptest/maven.xml?view=diff&rev=480617&r1=480616&r2=480617
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/src/plugin-test/wtptest/maven.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/src/plugin-test/wtptest/maven.xml Wed Nov 29 08:35:06 2006
@@ -1,6 +1,6 @@
 <!--
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,38 +22,48 @@
          xmlns:x="jelly:xml"
          xmlns:ant="jelly:ant">
 
-  <goal name="testPlugin" prereqs="test-defaultgoal,test-wtpmodules,test-nowtpmodules">
-  </goal>
+  <goal name="testPlugin" prereqs="test-init,test-defaultgoal,test-wtpmodules-0.7,test-wtpmodules-1.5,test-nowtpmodules"/>
 
-  <goal name="test-init" prereqs="clean">
-    <j:set var="dotWtpmodules" value="${basedir}/.wtpmodules"/>
-    <attainGoal name="eclipse:clean"/>
+  <goal name="test-init">
+    <j:set var="wtpConfig0.7" value="${basedir}/.wtpmodules"/>
+    <j:set var="wtpConfig1.5" value="${basedir}/.settings/org.eclipse.wst.common.component"/>
   </goal>
 
+  <goal name="test-clean" prereqs="clean,eclipse:clean"/>
+
   <goal name="test-defaultgoal">
-    <attainGoal name="test-init"/>
+    <attainGoal name="test-clean"/>
     <attainGoal name="eclipse"/>
   </goal>
 
   <goal name="test-nowtpmodules">
-    <attainGoal name="test-init"/>
+    <attainGoal name="test-clean"/>
     <j:set var="maven.eclipse.projectnatures" value="" />
     <attainGoal name="eclipse" />
-
-    <u:available file="${dotWtpmodules}">
+    <u:available file="wtpConfig0.7">
         <ant:fail>The .wtpmodules file was created, and shouldn't have been.</ant:fail>
     </u:available>
+    <u:available file="wtpConfig1.5">
+        <ant:fail>The .settings/org.eclipse.wst.common.component file was created, and shouldn't have been.</ant:fail>
+    </u:available>
   </goal>
 
-  <goal name="test-wtpmodules">
-    <attainGoal name="test-init"/>
-
+  <goal name="test-wtpmodules-0.7">
+    <attainGoal name="test-clean"/>
+    <j:set var="maven.eclipse.wtp.version" value="0.7" />
     <attainGoal name="eclipse"/>
-    <assert:assertFileExists file="${dotWtpmodules}" />
-
-    <u:file var="wtpmodulesFile" name="${dotWtpmodules}"/>
+    <assert:assertFileExists file="${wtpConfig0.7}" />
+    <u:file var="wtpmodulesFile" name="${wtpConfig0.7}"/>
     <x:parse var="wtpmodulesDoc" xml="${wtpmodulesFile.toURL()}" />
+  </goal>
 
+  <goal name="test-wtpmodules-1.5">
+    <attainGoal name="test-clean"/>
+    <j:set var="maven.eclipse.wtp.version" value="1.5" />
+    <attainGoal name="eclipse"/>
+    <assert:assertFileExists file="${wtpConfig1.5}" />
+    <u:file var="wtpmodulesFile" name="${wtpConfig1.5}"/>
+    <x:parse var="wtpmodulesDoc" xml="${wtpmodulesFile.toURL()}" />
   </goal>
 
 </project>