bodewig 02/04/16 08:14:59
Modified: src/testcases/org/apache/tools/ant BuildFileTest.java
Added: src/etc/testcases/taskdefs/optional junit.xml
src/testcases/org/example/junit Output.java
ThreadedOutput.java
Log:
Testfile for bugs 5377 and 7980 - this is supposed to create no output
at all, but does for the fork="no" thread case.
I tried to put this into a JUnit testcase, but either you can capture
System.out (and destroy DemuxOutputStream's magic) or you don't (and
can't assert there is no output).
Revision Changes Path
1.1 jakarta-ant/src/etc/testcases/taskdefs/optional/junit.xml
Index: junit.xml
===================================================================
<?xml version="1.0"?>
<project name="junit-test" basedir="." default="outputTests">
<path id="test">
<pathelement path="${java.class.path}" />
<pathelement location="../../../../../build/testcases" />
</path>
<target name="testForkedOutput">
<junit fork="yes" haltonerror="true" haltonfailure="true">
<test name="org.example.junit.Output" />
<classpath refid="test" />
</junit>
</target>
<target name="testNonForkedOutput">
<junit fork="false" haltonerror="true" haltonfailure="true">
<test name="org.example.junit.Output" />
<classpath refid="test" />
</junit>
</target>
<target name="testForkedThreadedOutput">
<junit fork="yes" haltonerror="true" haltonfailure="true">
<test name="org.example.junit.ThreadedOutput" />
<classpath refid="test" />
</junit>
</target>
<target name="testNonForkedThreadedOutput">
<junit fork="false" haltonerror="true" haltonfailure="true">
<test name="org.example.junit.ThreadedOutput" />
<classpath refid="test" />
</junit>
</target>
<target name="outputTests"
depends="testForkedOutput,testNonForkedOutput,testForkedThreadedOutput,testNonForkedThreadedOutput"
/>
</project>
1.14 +6 -0
jakarta-ant/src/testcases/org/apache/tools/ant/BuildFileTest.java
Index: BuildFileTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/BuildFileTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BuildFileTest.java 4 Apr 2002 10:20:19 -0000 1.13
+++ BuildFileTest.java 16 Apr 2002 15:14:59 -0000 1.14
@@ -189,6 +189,10 @@
return cleanBuffer(errBuffer);
}
+ protected BuildException getBuildException() {
+ return buildException;
+ }
+
private String cleanBuffer(StringBuffer buffer) {
StringBuffer cleanedBuffer = new StringBuffer();
boolean cr = false;
@@ -284,6 +288,7 @@
try {
executeTarget(target);
} catch (org.apache.tools.ant.BuildException ex) {
+ buildException = ex;
if ((null != msg) && (!ex.getMessage().equals(msg))) {
fail("Should throw BuildException because '" + cause
+ "' with message '" + msg
@@ -307,6 +312,7 @@
try {
executeTarget(target);
} catch (org.apache.tools.ant.BuildException ex) {
+ buildException = ex;
if ((null != contains) && (ex.getMessage().indexOf(contains) ==
-1)) {
fail("Should throw BuildException because '" + cause + "'
with message containing '" + contains + "' (actual message '" + ex.getMessage()
+ "' instead)");
}
1.1 jakarta-ant/src/testcases/org/example/junit/Output.java
Index: Output.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Ant", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.example.junit;
import junit.framework.TestCase;
/**
* Not really a test of Ant but a test that is run by the test of the
* junit task. Confused?
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @since Ant 1.5
*/
public class Output extends TestCase {
public Output(String s) {
super(s);
}
public void testOutput() {
System.out.println("foo");
}
}
1.1
jakarta-ant/src/testcases/org/example/junit/ThreadedOutput.java
Index: ThreadedOutput.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Ant", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.example.junit;
import junit.framework.TestCase;
/**
* Not really a test of Ant but a test that is run by the test of the
* junit task. Confused?
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @since Ant 1.5
*/
public class ThreadedOutput extends TestCase {
public ThreadedOutput(String s) {
super(s);
}
public void testOutput() throws InterruptedException {
Thread t = new Thread(new Runnable() {
public void run() {
System.out.println("foo");
}
});
t.start();
t.join();
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
