Author: peterreilly
Date: Sun Sep 24 07:30:33 2006
New Revision: 449409
URL: http://svn.apache.org/viewvc?view=rev&rev=449409
Log:
stop unit tests depending on non-executed references
Modified:
ant/core/trunk/src/etc/testcases/taskdefs/optional/script.xml
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java
Modified: ant/core/trunk/src/etc/testcases/taskdefs/optional/script.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/testcases/taskdefs/optional/script.xml?view=diff&rev=449409&r1=449408&r2=449409
==============================================================================
--- ant/core/trunk/src/etc/testcases/taskdefs/optional/script.xml (original)
+++ ant/core/trunk/src/etc/testcases/taskdefs/optional/script.xml Sun Sep 24
07:30:33 2006
@@ -20,26 +20,6 @@
<target name="example1" depends="setup1"/>
- <target name="sub">
- <echo id="theEcho"/>
- </target>
-
- <target name="sub1">
- <script language="javascript"><![CDATA[
- theEcho.setMessage("In sub1");
- sub.execute();
- ]]></script>
- </target>
-
- <target name="sub2">
- <script language="javascript"><![CDATA[
- theEcho.setMessage("In sub2");
- sub.execute();
- ]]></script>
- </target>
-
- <target name="example2" depends="sub1,sub2"/>
-
<target name="useBeanshell">
<script language="beanshell"><![CDATA[
self.log("I'm here", org.apache.tools.ant.Project.MSG_INFO);
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java?view=diff&rev=449409&r1=449408&r2=449409
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java
Sun Sep 24 07:30:33 2006
@@ -61,9 +61,4 @@
assertTrue(index > -1);
}
- public void testExample2() {
- executeTarget("example2");
- assertTrue(getLog().indexOf("In sub1") > -1);
- assertTrue(getLog().indexOf("In sub2") > -1);
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
