From ac42900813197090cd118813036016e3ad5aa4e0 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 28 Mar 2004 23:02:04 +0000
Subject: [PATCH] Apply MPANT-11.

The plugin tests are now clearer


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114946 13f79535-47bb-0310-9956-ffa450edef68
---
 ant/project.xml               |  2 +-
 ant/src/plugin-test/maven.xml | 13 ++++++-------
 ant/xdocs/changes.xml         |  3 +++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ant/project.xml b/ant/project.xml
index cef2d4a9..aa010855 100644
--- a/ant/project.xml
+++ b/ant/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-ant-plugin</id>
   <name>Maven Ant Plug-in</name>
-  <currentVersion>1.6</currentVersion>
+  <currentVersion>1.7-SNAPSHOT</currentVersion>
   <description>Generates ant build files from a maven project, so that plain ant users can build your project</description>
   <shortDescription>Generate Ant build file</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ant/</url>
diff --git a/ant/src/plugin-test/maven.xml b/ant/src/plugin-test/maven.xml
index 59ff8131..179fe90c 100644
--- a/ant/src/plugin-test/maven.xml
+++ b/ant/src/plugin-test/maven.xml
@@ -16,19 +16,18 @@
  */
  -->
 <project xmlns:util="jelly:util"
-         xmlns:j="jelly:core">
+         xmlns:j="jelly:core"
+         xmlns:assert="assert">
          
   <goal name="testPlugin" prereqs="test-ant">
     <attainGoal name="clean"/>
   </goal>
   
   <goal name="test-ant">
-    <j:set var="expectedFile" value="${basedir}/build.xml"/>
     <attainGoal name="ant"/>
-    <util:file var="buildXml" name="${expectedFile}" />
-    <j:if test="${!(buildXml.exists())}">
-      <fail>build.xml not generated</fail>
-    </j:if>
-    <delete file="${expectedFile}"/>
+    
+    <assert:assertFileExists file="${basedir}/build.xml"/>
+
+    <delete file="${basedir}/build.xml"/>
   </goal>
 </project>
\ No newline at end of file
diff --git a/ant/xdocs/changes.xml b/ant/xdocs/changes.xml
index 8199780a..f30a6210 100644
--- a/ant/xdocs/changes.xml
+++ b/ant/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="dion@multitask.com.au">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.7" date="in CVS">
+    </release>
+    
     <release version="1.6" date="2004-03-07">
       <action dev="evenisse" type="fix" issue="MPANT-8">Use relative path for javadoc.</action>
       <action dev="dion" type="fix">Check unit test source dir exists before making relative path</action>