From 4e101e3c49a970d5818e750d03580421bb99ae28 Mon Sep 17 00:00:00 2001 From: "Jesse N. Glick" Date: Tue, 5 Mar 2013 23:54:38 +0000 Subject: [PATCH] =?UTF-8?q?Junit=20=E2=86=92=20JUnit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1453094 13f79535-47bb-0310-9956-ffa450edef68 --- src/etc/testcases/taskdefs/optional/junit.xml | 4 ++-- src/etc/testcases/taskdefs/optional/junitreport.xml | 4 ++-- .../optional/junit/CustomJUnit4TestAdapterCache.java | 2 +- .../taskdefs/optional/junit/IgnoredTestListener.java | 6 +++--- .../tools/ant/taskdefs/optional/junit/JUnitTask.java | 12 ++++++------ .../taskdefs/optional/junit/JUnitVersionHelper.java | 2 +- .../ant/taskdefs/optional/junit/JUnitTaskTest.java | 6 +++--- .../org/apache/tools/ant/types/AssertionsTest.java | 2 +- .../{Junit4Skippable.java => JUnit4Skippable.java} | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) rename src/tests/junit/org/example/junit/{Junit4Skippable.java => JUnit4Skippable.java} (98%) diff --git a/src/etc/testcases/taskdefs/optional/junit.xml b/src/etc/testcases/taskdefs/optional/junit.xml index 33c9b014f..f44337a3d 100644 --- a/src/etc/testcases/taskdefs/optional/junit.xml +++ b/src/etc/testcases/taskdefs/optional/junit.xml @@ -276,7 +276,7 @@ - + @@ -285,7 +285,7 @@ - + diff --git a/src/etc/testcases/taskdefs/optional/junitreport.xml b/src/etc/testcases/taskdefs/optional/junitreport.xml index 6b921d082..dd6b2e17c 100644 --- a/src/etc/testcases/taskdefs/optional/junitreport.xml +++ b/src/etc/testcases/taskdefs/optional/junitreport.xml @@ -23,7 +23,7 @@ + needed for testNoFileJUnitNoFrames --> @@ -185,4 +185,4 @@ - \ No newline at end of file + diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java index 155c81f72..ffa51225c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java @@ -27,7 +27,7 @@ import org.junit.runner.notification.RunListener; 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 * TestListeners. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestListener.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestListener.java index 131cd9ee0..ac8265919 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestListener.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestListener.java @@ -24,15 +24,15 @@ import org.junit.runner.notification.Failure; /** * 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 diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index a9fe7e568..4a4305a44 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -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(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java index 4ef80f631..87f2fffad 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java @@ -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 diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java index daddb39d2..98e76bec6 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java @@ -304,12 +304,12 @@ public class JUnitTaskTest extends BuildFileTest { 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 BuildFileTest { executeTarget("testTestMethods"); } -} \ No newline at end of file +} diff --git a/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java b/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java index ffe3ec529..cf56bc25b 100644 --- a/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java @@ -94,7 +94,7 @@ public class AssertionsTest extends BuildFileTest { } - public void testJunit() { + public void testJUnit() { executeTarget("test-junit"); } } diff --git a/src/tests/junit/org/example/junit/Junit4Skippable.java b/src/tests/junit/org/example/junit/JUnit4Skippable.java similarity index 98% rename from src/tests/junit/org/example/junit/Junit4Skippable.java rename to src/tests/junit/org/example/junit/JUnit4Skippable.java index 4e8854371..aa89ab7da 100644 --- a/src/tests/junit/org/example/junit/Junit4Skippable.java +++ b/src/tests/junit/org/example/junit/JUnit4Skippable.java @@ -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() {