Return-Path: <emeade@geekfarm.org>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 23401 invoked from network); 2 Oct 2000 01:27:08 -0000
Received: from uhura.concentric.net (206.173.118.93)
  by locus.apache.org with SMTP; 2 Oct 2000 01:27:08 -0000
Received: from marconi.concentric.net (marconi.concentric.net
 [206.173.118.71])
	by uhura.concentric.net (8.9.1a/(98/12/15 5.12))
	id VAA13438; Sun, 1 Oct 2000 21:26:42 -0400 (EDT)
	[1-800-745-2747 The Concentric Network]
Errors-To: <emeade@geekfarm.org>
Received: from buji (ts001d14.sjc-ca.concentric.net [206.173.234.26])
	by marconi.concentric.net (8.9.1a)
	id VAA14796; Sun, 1 Oct 2000 21:26:39 -0400 (EDT)
Reply-To: <emeade@geekfarm.org>
From: "Erik Meade" <emeade@geekfarm.org>
To: <ant-dev@jakarta.apache.org>
Subject: RE: BugRat Report #184 has been filed.
Date: Sun, 1 Oct 2000 18:32:25 -0700
Message-ID: <DGELJGNMBMGEHFCKJNJCEELBCMAA.emeade@geekfarm.org>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
X-Priority: 3 (Normal)
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2911.0)
In-Reply-To: <135646939.970273295838.JavaMail.nobody@fatman>
X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
Importance: Normal
X-Spam-Rating: locus.apache.org 1.6.2 0/1000/N

I took a look at this bug, and couldn't reproduce it, my attempts
to do so follow.  I created the first test file ( filter1.txt )
to make sure I didn't break anything, and the second ( filter2.txt )
so I could "fix the bug".  The only time I got close to producing
this bug is when I forgot to add filtering="yes" to tasks.

add files filter1.txt and filter2.txt to src/etc/testcases/taskdefs

Index: filter1.txt
===================================================================
@year@


Index: filter2.txt
===================================================================
<%@ include file="@ROOT@/some/include.jsp"%>


Index: filter.xml
===================================================================
RCS file:
/home/cvspublic/jakarta-ant/src/etc/testcases/taskdefs/filter.xml,v
retrieving revision 1.1
diff -u -r1.1 filter.xml
--- filter.xml	2000/09/20 13:38:47	1.1
+++ filter.xml	2000/10/02 01:11:00
@@ -18,4 +18,24 @@
     <filter token="" value=""/>
   </target>

+  <target name="test5">
+    <filter token="year" value="2000" />
+    <copyfile src="filter1.txt" dest="filtered.tmp" filtering="yes"/>
+  </target>
+
+  <target name="test6">
+    <filter token="year" value="2000" />
+    <copydir src="." dest="./taskdefs.tmp" filtering="yes"
includes="filter1.txt"/>
+  </target>
+
+  <target name="test7">
+    <filter token="ROOT" value="root" />
+    <copyfile src="filter2.txt" dest="filtered.tmp" filtering="yes"/>
+  </target>
+
+  <target name="test8">
+    <filter token="ROOT" value="root" />
+    <copydir src="." dest="./taskdefs.tmp" filtering="yes"
includes="filter2.txt"/>
+  </target>
+
 </project>


Index: FilterTest.java
===================================================================
RCS file:
/home/cvspublic/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/Filt
erTest.java,v
retrieving revision 1.1
diff -u -r1.1 FilterTest.java
--- FilterTest.java	2000/09/20 13:38:50	1.1
+++ FilterTest.java	2000/10/02 01:14:31
@@ -54,33 +54,88 @@

 package org.apache.tools.ant.taskdefs;

+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
 /**
- * @author Nico Seessle <nico@seessle.de>
+ * @author Nico Seessle <nico@seessle.de>
  */
-public class FilterTest extends TaskdefsTest

-
-    public FilterTest(String name)

+public class FilterTest extends TaskdefsTest {
+
+    private final static TASKDEFS_DIR = "src/etc/testcases/taskdefs/";
+
+    public FilterTest(String name) {
         super(name);
-    }
-
-    public void setUp()

-        configureProject("src/etc/testcases/taskdefs/filter.xml");
+    }
+
+    public void setUp() {
+        configureProject(TASKDEFS_DIR + "filter.xml");
     }

-    public void test1()

+    public void test1() {
         expectBuildException("test1", "required argument missing");
     }

-    public void test2()

+    public void test2() {
         expectBuildException("test2", "required argument missing");
     }

-    public void test3()

+    public void test3() {
         expectBuildException("test3", "required argument missing");
     }
-
-    public void test4()

+
+    public void test4() {
         executeTarget("test4");
+    }
+
+    public void test5() {
+        executeTarget("test5");
+        assertEquals("2000",
+            getFilteredFile("5", TASKDEFS_DIR + "filtered.tmp"));
     }
-
+
+    public void test6() {
+        executeTarget("test6");
+        assertEquals("2000",
+            getFilteredFile("6", TASKDEFS_DIR +
"taskdefs.tmp/filter1.txt"));
+    }
+
+    public void test7() {
+        executeTarget("test7");
+        assertEquals("<%@ include file=\"root/some/include.jsp\"%>",
+            getFilteredFile("7", TASKDEFS_DIR + "filtered.tmp"));
+    }
+
+    public void test8() {
+        executeTarget("test8");
+        assertEquals("<%@ include file=\"root/some/include.jsp\"%>",
+            getFilteredFile("8", TASKDEFS_DIR +
"taskdefs.tmp/filter2.txt"));
+    }
+
+    private String getFilteredFile(String testNumber, String filteredFile)
{
+        String line = null;
+        File f = new File(filteredFile);
+        if (!f.exists()) {
+            fail("filter test"+testNumber+" failed");
+        } else {
+            BufferedReader in = null;
+            try {
+                in = new BufferedReader(new FileReader(f));
+            } catch (FileNotFoundException fnfe) {
+                fail("filter test"+testNumber+" failed, filtered file: " +
f.toString() + " not found");
+            }
+            try {
+                line = in.readLine();
+                in.close();
+            } catch (IOException ioe) {
+                fail("filter test"+testNumber+" failed.  IOException while
reading filtered file: " + ioe);
+            }
+        }
+        f.delete();
+        return line;
+    }
 }
+



> -----Original Message-----
> From: BugRat Mail System [mailto:tomcat-bugs@cortexity.com]
> Sent: Friday, September 29, 2000 5:22 PM
> To: ant-bugs@cortexity.com
> Subject: BugRat Report #184 has been filed.
>
>
> Bug report #184 has just been filed.
>
> You can view the report at the following URL:
>
>    <http://znutar.cortexity.com:8888/BugRatViewer/ShowReport/184>
>
> REPORT #184 Details.
>
> Project: Ant
> Category: Bug Report
> SubCategory: New Bug Report
> Class: swbug
> State: received
> Priority: medium
> Severity: non-critical
> Confidence: public
> Environment:
>    Release: CVS of September 15th
>    JVM Release: 1.2.2
>    Operating System: NT / Solaris
>    OS Release: 4.0 / 2.6
>    Platform: PC / Sun
>
> Synopsis:
> Filters don't work when multiple '@' on the line
>
> Description:
> Imagine the following jsp file fragment:
>
> <%@ include file="@ROOT@/some/include.jsp%>
>
> The filter doen't replace @ROOT@ with it's value, and the
> line is unchanged.
>