Author: jglick
Date: Tue Mar 5 23:54:38 2013
New Revision: 1453094
URL: http://svn.apache.org/r1453094
Log:
Junit → JUnit
Added:
ant/core/trunk/src/tests/junit/org/example/junit/JUnit4Skippable.java
- copied, changed from r1453087,
ant/core/trunk/src/tests/junit/org/example/junit/Junit4Skippable.java
Removed:
ant/core/trunk/src/tests/junit/org/example/junit/Junit4Skippable.java
Modified:
ant/core/trunk/src/etc/testcases/taskdefs/optional/junit.xml
ant/core/trunk/src/etc/testcases/taskdefs/optional/junitreport.xml
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestListener.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java
Modified: ant/core/trunk/src/etc/testcases/taskdefs/optional/junit.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/testcases/taskdefs/optional/junit.xml?rev=1453094&r1=1453093&r2=1453094&view=diff
==============================================================================
--- ant/core/trunk/src/etc/testcases/taskdefs/optional/junit.xml (original)
+++ ant/core/trunk/src/etc/testcases/taskdefs/optional/junit.xml Tue Mar 5
23:54:38 2013
@@ -276,7 +276,7 @@
</junit>
</target>
- <!-- Junit4 Ignore and Assume for skipping tests -->
+ <!-- JUnit4 Ignore and Assume for skipping tests -->
<target name="testSkippableTests">
<mkdir dir="out"/>
<junit fork="true">
@@ -285,7 +285,7 @@
<classpath refid="test"/>
<batchtest todir="out">
<fileset dir="../../../../tests/junit">
- <include name="org/example/junit/Junit4Skippable.java"/>
+ <include name="org/example/junit/JUnit4Skippable.java"/>
<!-- tests remove out-dir on tearDown -->
</fileset>
</batchtest>
Modified: ant/core/trunk/src/etc/testcases/taskdefs/optional/junitreport.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/testcases/taskdefs/optional/junitreport.xml?rev=1453094&r1=1453093&r2=1453094&view=diff
==============================================================================
--- ant/core/trunk/src/etc/testcases/taskdefs/optional/junitreport.xml
(original)
+++ ant/core/trunk/src/etc/testcases/taskdefs/optional/junitreport.xml Tue Mar
5 23:54:38 2013
@@ -23,7 +23,7 @@
<!-- reports1 take care of transformation of 2 test result files and
produce reports according to the default format (frames)
- needed for testNoFileJunitNoFrames -->
+ needed for testNoFileJUnitNoFrames -->
<target name="reports1">
<mkdir dir="${outputdir}"/>
<mkdir dir="${outputdir}/html"/>
@@ -185,4 +185,4 @@
</target>
</project>
-
\ No newline at end of file
+
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java?rev=1453094&r1=1453093&r2=1453094&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java
Tue Mar 5 23:54:38 2013
@@ -27,7 +27,7 @@ import org.junit.runner.notification.Run
import org.junit.runner.notification.RunNotifier;
/**
- * Provides a custom implementation of the notifier for a Junit4TestAdapter
+ * Provides a custom implementation of the notifier for a JUnit4TestAdapter
* so that skipped and ignored tests can be reported to the existing
* <tt>TestListener</tt>s.
*
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestListener.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestListener.java?rev=1453094&r1=1453093&r2=1453094&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestListener.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestListener.java
Tue Mar 5 23:54:38 2013
@@ -24,15 +24,15 @@ import org.junit.runner.notification.Fai
/**
* Provides the functionality for TestListeners to be able to be notified of
- * the necessary Junit4 events for test being ignored (@Ignore annotation)
- * or skipped (Assume failures). Tests written in Junit4 will report against
+ * the necessary JUnit4 events for test being ignored (@Ignore annotation)
+ * or skipped (Assume failures). Tests written in JUnit4 will report against
* the methods in this interface alongside the methods in the existing
TestListener
*/
public interface IgnoredTestListener extends TestListener {
/**
* Reports when a test has been marked with the @Ignore annotation. The
parameter
- * should normally be typed to Junit's {@link
junit.framework.JUnit4TestCaseFacade}
+ * should normally be typed to JUnit's {@link
junit.framework.JUnit4TestCaseFacade}
* so implementing classes should be able to get the details of the ignore
by casting
* the argument and retrieving the descriptor from the test.
* @param test
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java?rev=1453094&r1=1453093&r2=1453094&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Tue Mar 5 23:54:38 2013
@@ -164,7 +164,7 @@ public class JUnitTask extends Task {
private Permissions perm = null;
private ForkMode forkMode = new ForkMode("perTest");
- private boolean splitJunit = false;
+ private boolean splitJUnit = false;
private boolean enableTestListenerEvents = false;
private JUnitTaskMirror delegate;
private ClassLoader mirrorLoader;
@@ -714,7 +714,7 @@ public class JUnitTask extends Task {
*/
public void init() {
antRuntimeClasses = new Path(getProject());
- splitJunit = !addClasspathResource("/junit/framework/TestCase.class");
+ splitJUnit = !addClasspathResource("/junit/framework/TestCase.class");
addClasspathEntry("/org/apache/tools/ant/launch/AntMain.class");
addClasspathEntry("/org/apache/tools/ant/Task.class");
addClasspathEntry("/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.class");
@@ -751,7 +751,7 @@ public class JUnitTask extends Task {
*/
protected void setupJUnitDelegate() {
final ClassLoader myLoader = JUnitTask.class.getClassLoader();
- if (splitJunit) {
+ if (splitJUnit) {
final Path path = new Path(getProject());
path.add(antRuntimeClasses);
Path extra = getCommandline().getClasspath();
@@ -825,7 +825,7 @@ public class JUnitTask extends Task {
/**
* Run the tests.
- * @param arg one JunitTest
+ * @param arg one JUnitTest
* @throws BuildException in case of test failures or errors
*/
protected void execute(JUnitTest arg) throws BuildException {
@@ -1379,7 +1379,7 @@ public class JUnitTask extends Task {
try {
log("Using System properties " + System.getProperties(),
Project.MSG_VERBOSE);
- if (splitJunit) {
+ if (splitJUnit) {
classLoader = (AntClassLoader)
delegate.getClass().getClassLoader();
} else {
createClassLoader();
@@ -1636,7 +1636,7 @@ public class JUnitTask extends Task {
try {
log("Using System properties " + System.getProperties(),
Project.MSG_VERBOSE);
- if (splitJunit) {
+ if (splitJUnit) {
classLoader = (AntClassLoader)
delegate.getClass().getClassLoader();
} else {
createClassLoader();
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java?rev=1453094&r1=1453093&r2=1453094&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
Tue Mar 5 23:54:38 2013
@@ -112,7 +112,7 @@ public class JUnitVersionHelper {
/**
* Tries to find the name of the class which a test represents
- * across JUnit 3 and 4. For Junit4 it parses the toString() value of the
+ * across JUnit 3 and 4. For JUnit4 it parses the toString() value of the
* test, and extracts it from there.
* @since Ant 1.7.1 (it was private until then)
* @param test test case to look at
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java?rev=1453094&r1=1453093&r2=1453094&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
Tue Mar 5 23:54:38 2013
@@ -304,12 +304,12 @@ public class JUnitTaskTest extends Build
assertEquals(search, line);
}
- public void testJunit4Skip() throws Exception {
+ public void testJUnit4Skip() throws Exception {
executeTarget("testSkippableTests");
DocumentBuilderFactory dbFactory =
DocumentBuilderFactory.newInstance();
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
- Document doc =
dBuilder.parse(getProject().getResource("out/TEST-org.example.junit.Junit4Skippable.xml").getInputStream());
+ Document doc =
dBuilder.parse(getProject().getResource("out/TEST-org.example.junit.JUnit4Skippable.xml").getInputStream());
assertEquals("Incorrect number of nodes created", 8,
doc.getElementsByTagName("testcase").getLength());
@@ -333,4 +333,4 @@ public class JUnitTaskTest extends Build
executeTarget("testTestMethods");
}
-}
\ No newline at end of file
+}
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java?rev=1453094&r1=1453093&r2=1453094&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java
Tue Mar 5 23:54:38 2013
@@ -94,7 +94,7 @@ public class AssertionsTest extends Buil
}
- public void testJunit() {
+ public void testJUnit() {
executeTarget("test-junit");
}
}
Copied: ant/core/trunk/src/tests/junit/org/example/junit/JUnit4Skippable.java
(from r1453087,
ant/core/trunk/src/tests/junit/org/example/junit/Junit4Skippable.java)
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/example/junit/JUnit4Skippable.java?p2=ant/core/trunk/src/tests/junit/org/example/junit/JUnit4Skippable.java&p1=ant/core/trunk/src/tests/junit/org/example/junit/Junit4Skippable.java&r1=1453087&r2=1453094&rev=1453094&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/example/junit/Junit4Skippable.java
(original)
+++ ant/core/trunk/src/tests/junit/org/example/junit/JUnit4Skippable.java Tue
Mar 5 23:54:38 2013
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class Junit4Skippable {
+public class JUnit4Skippable {
@Test
public void passingTest() {
