From 5451feff7ddfadebe70a2fd3de401a31287fafbf Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Fri, 7 Jan 2005 00:36:04 +0000
Subject: [PATCH] Remove order assumption from testEach.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277307 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/length.xml         | 20 +++++++++++++------
 .../apache/tools/ant/taskdefs/LengthTest.java |  4 +---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/etc/testcases/taskdefs/length.xml b/src/etc/testcases/taskdefs/length.xml
index 3439baa5d..226393742 100644
--- a/src/etc/testcases/taskdefs/length.xml
+++ b/src/etc/testcases/taskdefs/length.xml
@@ -6,21 +6,29 @@
   <target name="init">
     <mkdir dir="${dir.a}" />
     <mkdir dir="${dir.b}" />
-    <concat destfile="${dir.a}/foo">foo</concat>
-    <concat destfile="${dir.b}/bar">bar</concat>
+    <property name="foo" location="${dir.a}/foo" />
+    <property name="bar" location="${dir.b}/bar" />
+    <echo file="${foo}" message="foo" />
+    <echo file="${bar}" message="bar" />
   </target>
 
   <target name="testEach" depends="init">
     <length mode="each" property="length.each">
       <fileset id="fs" dir="${dir}" />
     </length>
-    <pathconvert property="expected" refid="fs" pathsep="${line.separator}">
-      <globmapper from="*" to="* : 3" />
-    </pathconvert>
+    <length string="${length.each}" property="length.length.each" />
+    <length string="${foo}${bar}........${line.separator}"
+            property="length.expected" />
     <fail>
+      <!-- test that both files are represented, and that the
+           output is the expected length; do not assume order. -->
       <condition>
         <not>
-          <equals arg1="${expected}" arg2="${length.each}" />
+          <and>
+            <contains string="${length.each}" substring="${foo} : 3" />
+            <contains string="${length.each}" substring="${bar} : 3" />
+            <equals arg1="${length.length.each}" arg2="${length.expected}" />
+          </and>
         </not>
       </condition>
     </fail>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/LengthTest.java b/src/testcases/org/apache/tools/ant/taskdefs/LengthTest.java
index 3dab0451f..143cf2788 100755
--- a/src/testcases/org/apache/tools/ant/taskdefs/LengthTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/LengthTest.java
@@ -34,9 +34,7 @@ public class LengthTest extends BuildFileTest {
     }
 
     public void testEach() {
-        // Disable this test as the order of files in a fileset is
-        // not specified
-        // executeTarget("testEach");
+        executeTarget("testEach");
     }
 
     public void testAll() {