From e84c70cd16eb5fc3f0aee5ddcf4803bea59eb2b6 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 12 Jan 2009 12:38:50 +0000
Subject: [PATCH] rename test, remove unneeded tasks, add some assertions

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@733706 13f79535-47bb-0310-9956-ffa450edef68
---
 src/tests/antunit/types/glob-test.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/tests/antunit/types/glob-test.xml b/src/tests/antunit/types/glob-test.xml
index c7cbc0b9a..572ab2bc9 100644
--- a/src/tests/antunit/types/glob-test.xml
+++ b/src/tests/antunit/types/glob-test.xml
@@ -22,17 +22,13 @@
 
   <import file="../antunit-base.xml" />
 
-  <target name="test-move">
-    <property 
-      name="glob-test-out-dir"
-      location="${glob-test.dir}/../../../../../build/antunit/glob-test"/>
-    <echo>${glob-test-out-dir}</echo>
-    <!-- the following should work -->
-    <delete dir="${input}"/>
-    <delete dir="${output}"/>
+  <target name="test-overlapping-patterns">
     <mkdir dir="${input}"/>
     <mkdir dir="${output}"/>
+    <!-- shouldn't be moved because pre- and postfix of from pattern
+         overlap -->
     <touch file="${input}/foobar-1.2.3.jar"/>
+
     <touch file="${input}/foobar-janfu-1.2.3.jar"/>
     <touch file="${input}/foobar--1.2.3.jar"/>
     <touch file="${input}/foobar-x-1.2.3.jar"/>
@@ -42,5 +38,10 @@
       </fileset>
       <mapper type="glob" from="foobar-*-1.2.3.jar" to="*.jar"/>
     </move>
+    <au:assertFileExists file="${input}/foobar-1.2.3.jar"/>
+    <au:assertFileExists file="${output}/janfu.jar"/>
+    <au:assertFileExists file="${output}/.jar"/>
+    <au:assertFileExists file="${output}/x.jar"/>
   </target>
+
 </project>