You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2013/08/17 07:40:27 UTC
svn commit: r1514951 - in /ant/core/trunk/src: main/org/apache/tools/ant/
main/org/apache/tools/ant/filters/
main/org/apache/tools/ant/taskdefs/optional/junit/
main/org/apache/tools/ant/taskdefs/optional/net/
main/org/apache/tools/ant/types/selectors/ ...
Author: bodewig
Date: Sat Aug 17 05:40:26 2013
New Revision: 1514951
URL: http://svn.apache.org/r1514951
Log:
remove debug output
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/ExtensionPoint.java (props changed)
ant/core/trunk/src/main/org/apache/tools/ant/filters/SuffixLines.java (props changed)
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java (props changed)
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java (props changed)
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java (props changed)
ant/core/trunk/src/tests/antunit/core/extension-point-test.xml (props changed)
ant/core/trunk/src/tests/antunit/core/ref-psyntax-hint-test.xml (props changed)
ant/core/trunk/src/tests/antunit/filters/suffix-test.xml (props changed)
ant/core/trunk/src/tests/antunit/taskdefs/dependset-test.xml (props changed)
ant/core/trunk/src/tests/antunit/taskdefs/exec/exec-test.xml (props changed)
ant/core/trunk/src/tests/antunit/taskdefs/exec/expected/utf-8 (props changed)
ant/core/trunk/src/tests/antunit/taskdefs/exec/input/iso8859-1 (props changed)
ant/core/trunk/src/tests/antunit/taskdefs/include-test.xml (props changed)
ant/core/trunk/src/tests/antunit/taskdefs/optional/native2ascii-test.xml (props changed)
ant/core/trunk/src/tests/antunit/taskdefs/xslt/printParams-invalid.xsl (props changed)
ant/core/trunk/src/tests/antunit/types/resources/comparators/test.xml (props changed)
Propchange: ant/core/trunk/src/main/org/apache/tools/ant/ExtensionPoint.java
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/main/org/apache/tools/ant/filters/SuffixLines.java
('svn:mergeinfo' removed)
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java?rev=1514951&r1=1514950&r2=1514951&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java Sat Aug 17 05:40:26 2013
@@ -367,8 +367,6 @@ public class JUnitTestRunner implements
Throwable exception = null;
boolean startTestSuiteSuccess = false;
- savedErr.println("Running test " + junitTest.getName() + " with {loader: " + loader + ", methods: " + methods + "}");
-
try {
try {
@@ -389,11 +387,9 @@ public class JUnitTestRunner implements
try {
// check if there is a suite method
suiteMethod = testClass.getMethod("suite", new Class[0]);
- savedErr.println("found suite method");
} catch (NoSuchMethodException e) {
// no appropriate suite method found. We don't report any
// error here since it might be perfectly normal.
- savedErr.println("didn't find suite method");
}
}
@@ -409,7 +405,6 @@ public class JUnitTestRunner implements
boolean useSingleMethodAdapter = false;
if (junit.framework.TestCase.class.isAssignableFrom(testClass)) {
- savedErr.println("this is a JUnit3 test");
// Do not use JUnit 4 API for running JUnit 3.x
// tests - it is not able to run individual test
// methods.
@@ -433,19 +428,12 @@ public class JUnitTestRunner implements
// will avoid UnsupportedClassVersionError.
try {
- savedErr.println("trying to load java.lang.annotation.Annotation");
Class.forName("java.lang.annotation.Annotation");
- savedErr.println("found");
- savedErr.println("trying to load org.apache.tools.ant.taskdefs.optional.junit.CustomJUnit4TestAdapterCache");
junit4TestAdapterCacheClass = Class.forName("org.apache.tools.ant.taskdefs.optional.junit.CustomJUnit4TestAdapterCache");
- savedErr.println("found");
if (loader == null) {
- savedErr.println("trying to load " + JUNIT_4_TEST_ADAPTER);
junit4TestAdapterClass =
Class.forName(JUNIT_4_TEST_ADAPTER);
- savedErr.println("found");
if (testMethodsSpecified) {
- savedErr.println("trying to load org.apache.tools.ant.taskdefs.optional.junit.JUnit4TestMethodAdapter");
/*
* We cannot try to load the JUnit4TestAdapter
* before trying to load JUnit4TestMethodAdapter
@@ -455,34 +443,27 @@ public class JUnitTestRunner implements
*/
junit4TestAdapterClass = Class.forName(
"org.apache.tools.ant.taskdefs.optional.junit.JUnit4TestMethodAdapter");
- savedErr.println("found");
useSingleMethodAdapter = true;
}
} else {
- savedErr.println("trying to load " + JUNIT_4_TEST_ADAPTER);
junit4TestAdapterClass =
Class.forName(JUNIT_4_TEST_ADAPTER,
true, loader);
- savedErr.println("found");
if (testMethodsSpecified) {
- savedErr.println("trying to load org.apache.tools.ant.taskdefs.optional.junit.JUnit4TestMethodAdapter");
junit4TestAdapterClass =
Class.forName(
"org.apache.tools.ant.taskdefs.optional.junit.JUnit4TestMethodAdapter",
true, loader);
- savedErr.println("found");
useSingleMethodAdapter = true;
}
}
} catch (ClassNotFoundException e) {
// OK, fall back to JUnit 3.
- savedErr.println("NOT found");
}
}
junit4 = junit4TestAdapterClass != null;
if (junit4) {
- savedErr.println("using JUnit4");
// Let's use it!
Class[] formalParams;
Object[] actualParams;
@@ -498,7 +479,6 @@ public class JUnitTestRunner implements
.getConstructor(formalParams).
newInstance(actualParams);
} else {
- savedErr.println("using JUnit3");
// Use JUnit 3.
// try to extract a test suite automatically this
Propchange: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/tests/antunit/core/extension-point-test.xml
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/tests/antunit/core/ref-psyntax-hint-test.xml
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/tests/antunit/filters/suffix-test.xml
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/dependset-test.xml
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/exec/exec-test.xml
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/exec/expected/utf-8
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/exec/input/iso8859-1
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/include-test.xml
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/xslt/printParams-invalid.xsl
('svn:mergeinfo' removed)
Propchange: ant/core/trunk/src/tests/antunit/types/resources/comparators/test.xml
('svn:mergeinfo' removed)