From fa78f1b3b09f395ad0b32c87e25829f669c91643 Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Mon, 23 Jan 2006 15:31:38 +0000
Subject: [PATCH] fix ANTLRTest in Gump (extra output files created by version
 2.7.6 invalidate assertions made in JUnit.  Made assertions more explicit and
 moved into the test buildfile.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@371555 13f79535-47bb-0310-9956-ffa450edef68
---
 .../testcases/taskdefs/optional/antlr/antlr.xml   | 15 +++++++++++++++
 .../tools/ant/taskdefs/optional/ANTLRTest.java    |  3 ---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/etc/testcases/taskdefs/optional/antlr/antlr.xml b/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
index 3fa0d1596..f9d3a9ddc 100644
--- a/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
+++ b/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
@@ -19,6 +19,21 @@
 
   <target name="test3" depends="setup">
     <antlr target="antlr.g" outputdirectory="${tmp.dir}"/>
+    <fail>
+      <condition>
+        <!-- to prove each of these files exists;
+             ANTLR >= 2.7.6 leaves behind new (.smap) files as well. -->
+        <resourcecount when="ne" count="5">
+          <fileset dir="${tmp.dir}">
+            <include name="CalcParserTokenTypes.txt" />
+            <include name="CalcParserTokenTypes.java" />
+            <include name="CalcLexer.java" />
+            <include name="CalcParser.java" />
+            <include name="CalcTreeWalker.java" />
+          </fileset>
+        </resourcecount>
+      </condition>
+    </fail>
   </target>
 
   <target name="test4" depends="setup">
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
index 1ada45558..86430c13d 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
@@ -57,9 +57,6 @@ public class ANTLRTest extends BuildFileTest {
 
     public void test3() {
         executeTarget("test3");
-        File outputDirectory = new File(System.getProperty("root"), TASKDEFS_DIR + "antlr.tmp");
-        String[] calcFiles = outputDirectory.list(new CalcFileFilter());
-        assertEquals(5, calcFiles.length);
     }
 
     public void test4() {