bodewig 2003/04/15 06:19:41
Modified: src/etc/testcases/filters tokenfilter.xml
src/testcases/org/apache/tools/ant/filters
TokenFilterTest.java
Log:
Beanshell and Apache BSF don't like each other. As the test is going
to use Javascript anyway, the check whether scripting is available
should do so, too. In particular, the test will now checke whether
Rhino is there, which the old test didn't.
Remove excess logging that lead me to think the test was failing
instead of skipped.
Revision Changes Path
1.2 +1 -1 ant/src/etc/testcases/filters/tokenfilter.xml
Index: tokenfilter.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/filters/tokenfilter.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tokenfilter.xml 14 Apr 2003 18:02:24 -0000 1.1
+++ tokenfilter.xml 15 Apr 2003 13:19:41 -0000 1.2
@@ -297,7 +297,7 @@
</target>
<target name="hasscript">
- <script language="beanshell">
+ <script language="javascript">
i = 1;
</script>
</target>
1.2 +0 -1
ant/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
Index: TokenFilterTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TokenFilterTest.java 14 Apr 2003 18:02:24 -0000 1.1
+++ TokenFilterTest.java 15 Apr 2003 13:19:41 -0000 1.2
@@ -238,7 +238,6 @@
catch (Throwable ex) {
System.out.println(
test + ": skipped - script not present ");
- ex.printStackTrace(System.out);
return false;
}
return true;
