From dfb50d12f7f0d605cf65dfcdb394d50ebebc52b0 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 4 Oct 2000 10:42:00 +0000 Subject: [PATCH] Extended testcase for to show that Bug #38 (report #184) has already been fixed. Submitted by: Erik Meade git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268056 13f79535-47bb-0310-9956-ffa450edef68 --- src/etc/testcases/taskdefs/filter.xml | 20 +++++++ src/etc/testcases/taskdefs/filter1.txt | 1 + src/etc/testcases/taskdefs/filter2.txt | 1 + .../apache/tools/ant/taskdefs/FilterTest.java | 58 ++++++++++++++++++- 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 src/etc/testcases/taskdefs/filter1.txt create mode 100644 src/etc/testcases/taskdefs/filter2.txt diff --git a/src/etc/testcases/taskdefs/filter.xml b/src/etc/testcases/taskdefs/filter.xml index e05daa72e..9e11981b3 100644 --- a/src/etc/testcases/taskdefs/filter.xml +++ b/src/etc/testcases/taskdefs/filter.xml @@ -18,4 +18,24 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/etc/testcases/taskdefs/filter1.txt b/src/etc/testcases/taskdefs/filter1.txt new file mode 100644 index 000000000..4e4f97636 --- /dev/null +++ b/src/etc/testcases/taskdefs/filter1.txt @@ -0,0 +1 @@ +@year@ diff --git a/src/etc/testcases/taskdefs/filter2.txt b/src/etc/testcases/taskdefs/filter2.txt new file mode 100644 index 000000000..dccd06b8a --- /dev/null +++ b/src/etc/testcases/taskdefs/filter2.txt @@ -0,0 +1 @@ +<%@ include file="@ROOT@/some/include.jsp"%> diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java index 037f19f34..232bc4bc3 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java @@ -54,17 +54,25 @@ 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 */ public class FilterTest extends TaskdefsTest { + private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/"; + public FilterTest(String name) { super(name); } public void setUp() { - configureProject("src/etc/testcases/taskdefs/filter.xml"); + configureProject(TASKDEFS_DIR + "filter.xml"); } public void test1() { @@ -83,4 +91,52 @@ public class FilterTest extends TaskdefsTest { 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; + } }