From db02762dc7ff784d4b68cbbdf8a86412ce87f11e Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Sun, 11 Oct 2020 17:18:57 +0200 Subject: [PATCH 01/25] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 428715884b4e..ab0d4163018c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ junit junit - 4.13.1 + 4.13.2-SNAPSHOT JUnit JUnit is a unit testing framework for Java, created by Erich Gamma and Kent Beck. @@ -64,7 +64,7 @@ scm:git:git://github.com/junit-team/junit4.git scm:git:git@github.com:junit-team/junit4.git https://github.com/junit-team/junit4 - r4.13.1 + HEAD github From c40e88d2407b7925adc404199be5a367aab1b86c Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Sun, 11 Oct 2020 17:32:06 +0200 Subject: [PATCH 02/25] Update Version.java --- src/main/java/junit/runner/Version.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/junit/runner/Version.java b/src/main/java/junit/runner/Version.java index 9f263840e40f..bb12a70a95aa 100644 --- a/src/main/java/junit/runner/Version.java +++ b/src/main/java/junit/runner/Version.java @@ -9,7 +9,7 @@ private Version() { } public static String id() { - return "4.13.1-SNAPSHOT"; + return "4.13.2-SNAPSHOT"; } public static void main(String[] args) { From 7852b90cfe1cea1e0cdaa19d490c83f0d8684b50 Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Sun, 11 Oct 2020 17:41:24 +0200 Subject: [PATCH 03/25] Document security fix in release notes --- doc/ReleaseNotes4.13.1.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/ReleaseNotes4.13.1.md b/doc/ReleaseNotes4.13.1.md index ab44490622c6..0305102d27f4 100644 --- a/doc/ReleaseNotes4.13.1.md +++ b/doc/ReleaseNotes4.13.1.md @@ -1,5 +1,11 @@ ## Summary of changes in version 4.13.1 +# Rules + +### Security fix: `TemporaryFolder` now limits access to temporary folders on Java 1.7 or later + +A local information disclosure vulnerability in `TemporaryFolder` has been fixed. See the published [security advisory](https://github.com/junit-team/junit4/security/advisories/GHSA-269g-pwp5-87pp) for details. + # Test Runners ### [Pull request #1669:](https://github.com/junit-team/junit/pull/1669) Make `FrameworkField` constructor public From 116c1e7e203d4392c7647bce2b307635896dcd6d Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Sat, 2 Jan 2021 14:53:45 +0100 Subject: [PATCH 04/25] Fix tests for floating point assertions (#1673) Since `assertEquals(1.0, 2.0, 0.0)` and `fail()` both throw AssertionFailedErrors these tests were not actually testing anything. --- .../framework/DoublePrecisionAssertTest.java | 12 ++++++++---- .../junit/tests/framework/FloatAssertTest.java | 18 +++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/test/java/junit/tests/framework/DoublePrecisionAssertTest.java b/src/test/java/junit/tests/framework/DoublePrecisionAssertTest.java index 439cc983dd00..f4161091ec14 100644 --- a/src/test/java/junit/tests/framework/DoublePrecisionAssertTest.java +++ b/src/test/java/junit/tests/framework/DoublePrecisionAssertTest.java @@ -11,17 +11,19 @@ public class DoublePrecisionAssertTest extends TestCase { public void testAssertEqualsNaNFails() { try { assertEquals(1.234, Double.NaN, 0.0); - fail(); } catch (AssertionFailedError e) { + return; } + fail(); } public void testAssertNaNEqualsFails() { try { assertEquals(Double.NaN, 1.234, 0.0); - fail(); } catch (AssertionFailedError e) { + return; } + fail(); } public void testAssertNaNEqualsNaN() { @@ -31,17 +33,19 @@ public void testAssertNaNEqualsNaN() { public void testAssertPosInfinityNotEqualsNegInfinity() { try { assertEquals(Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY, 0.0); - fail(); } catch (AssertionFailedError e) { + return; } + fail(); } public void testAssertPosInfinityNotEquals() { try { assertEquals(Double.POSITIVE_INFINITY, 1.23, 0.0); - fail(); } catch (AssertionFailedError e) { + return; } + fail(); } public void testAssertPosInfinityEqualsInfinity() { diff --git a/src/test/java/junit/tests/framework/FloatAssertTest.java b/src/test/java/junit/tests/framework/FloatAssertTest.java index d390f0b19cf2..aeae9443d80d 100644 --- a/src/test/java/junit/tests/framework/FloatAssertTest.java +++ b/src/test/java/junit/tests/framework/FloatAssertTest.java @@ -11,17 +11,19 @@ public class FloatAssertTest extends TestCase { public void testAssertEqualsNaNFails() { try { assertEquals(1.234f, Float.NaN, 0.0); - fail(); } catch (AssertionFailedError e) { + return; } + fail(); } public void testAssertNaNEqualsFails() { try { assertEquals(Float.NaN, 1.234f, 0.0); - fail(); } catch (AssertionFailedError e) { + return; } + fail(); } public void testAssertNaNEqualsNaN() { @@ -31,17 +33,19 @@ public void testAssertNaNEqualsNaN() { public void testAssertPosInfinityNotEqualsNegInfinity() { try { assertEquals(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY, 0.0); - fail(); } catch (AssertionFailedError e) { + return; } + fail(); } public void testAssertPosInfinityNotEquals() { try { assertEquals(Float.POSITIVE_INFINITY, 1.23f, 0.0); - fail(); } catch (AssertionFailedError e) { + return; } + fail(); } public void testAssertPosInfinityEqualsInfinity() { @@ -53,11 +57,7 @@ public void testAssertNegInfinityEqualsInfinity() { } public void testAllInfinities() { - try { - assertEquals(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY); - fail(); - } catch (AssertionFailedError e) { - } + assertEquals(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY); } } From 66083734d13aa67e616f3c4b429c019c5992bba0 Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Sat, 2 Jan 2021 15:41:57 +0100 Subject: [PATCH 05/25] Fix build for Java 12 and above --- pom.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index ab0d4163018c..31098bfd0d25 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,9 @@ 1.5 2.19.1 1.3 + 1.4 + 2.6 + 2.10.3 ISO-8859-1 67893CC4 @@ -147,7 +150,7 @@ the project, requires only release versions of dependencies of other artifacts. --> maven-enforcer-plugin - 1.4 + ${enforcerPluginVersion} enforce-versions @@ -286,7 +289,7 @@ in jar archive target/junit-*-javadoc.jar. --> maven-javadoc-plugin - 2.10.3 + ${javadocPluginVersion} ${basedir}/src/main/javadoc/stylesheet.css protected @@ -345,7 +348,7 @@ maven-jar-plugin - 2.6 + ${jarPluginVersion} false @@ -408,7 +411,7 @@ maven-javadoc-plugin - 2.10.3 + ${javadocPluginVersion} javadoc/latest ${basedir}/src/main/javadoc/stylesheet.css @@ -556,7 +559,7 @@ java9 - [1.9,) + [1.9,12) @@ -583,5 +586,48 @@ + + java12 + + [12,) + + + + 1.7 + 3.0.0-M3 + 3.2.0 + 3.2.0 + + + + + maven-javadoc-plugin + + 1.7 + false + + + + maven-compiler-plugin + + + -Xdoclint:none + + + + + + + + + maven-javadoc-plugin + + 1.7 + false + + + + + From b4f26d249ae9d25f3ca777908ff430d02487a20a Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Sat, 2 Jan 2021 15:09:55 +0100 Subject: [PATCH 06/25] Add GH Actions workflow --- .github/workflows/main.yml | 48 ++++++++++++++++++++++++++++++++++ .github/workflows/settings.xml | 22 ++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 .github/workflows/main.yml create mode 100644 .github/workflows/settings.xml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000000..3ea3f6a0c584 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,48 @@ +name: CI + +on: + push: + branches: + - main + pull_request: + branches: + - '*' + +jobs: + + build-and-verify: + name: Build and verify (JDK ${{ matrix.java }}) + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + java: [6, 8, 11, 15] + steps: + - uses: actions/checkout@v2 + - name: Download Maven # Download with default JDK because OpenJDK 6 does not support TLS 1.2 + run: ./mvnw --version + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: Build and verify + run: ./mvnw verify javadoc:javadoc site:site --batch-mode --errors --settings .github/workflows/settings.xml + + publish-snapshots: + name: Publish snapshot artifacts + if: github.event_name == 'push' && github.repository == 'junit-team/junit4' && github.ref == 'refs/heads/main' + needs: build-and-verify + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Download Maven # Download with default JDK because OpenJDK 6 does not support TLS 1.2 + run: ./mvnw --version + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: 6 + - name: Publish snapshot artifacts + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + run: ./mvnw deploy --batch-mode --errors --activate-profiles generate-docs --settings .github/workflows/settings.xml diff --git a/.github/workflows/settings.xml b/.github/workflows/settings.xml new file mode 100644 index 000000000000..332f39daa17b --- /dev/null +++ b/.github/workflows/settings.xml @@ -0,0 +1,22 @@ + + + + central + GCS Maven Central mirror + https://maven-central.storage-download.googleapis.com/maven2/ + google-maven-central + + + + + junit-snapshot-repo + ${env.OSSRH_USERNAME} + ${env.OSSRH_PASSWORD} + + + junit-releases-repo + ${env.OSSRH_USERNAME} + ${env.OSSRH_PASSWORD} + + + From 2bca0a42dcb09f522ceadcb97dfb8534a72d584c Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Sat, 2 Jan 2021 15:51:52 +0100 Subject: [PATCH 07/25] Delete Travis config and badge --- .travis.settings.xml | 22 -------------- .travis.yml | 69 -------------------------------------------- README.md | 2 +- 3 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 .travis.settings.xml delete mode 100644 .travis.yml diff --git a/.travis.settings.xml b/.travis.settings.xml deleted file mode 100644 index 332f39daa17b..000000000000 --- a/.travis.settings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - central - GCS Maven Central mirror - https://maven-central.storage-download.googleapis.com/maven2/ - google-maven-central - - - - - junit-snapshot-repo - ${env.OSSRH_USERNAME} - ${env.OSSRH_PASSWORD} - - - junit-releases-repo - ${env.OSSRH_USERNAME} - ${env.OSSRH_PASSWORD} - - - diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5b1744397f29..000000000000 --- a/.travis.yml +++ /dev/null @@ -1,69 +0,0 @@ -dist: trusty - -language: java - -script: ./mvnw verify javadoc:javadoc site:site - -install: -- ./mvnw --version - -stages: - - test - - name: deploy - if: (branch = main) AND (NOT type IN (pull_request)) - -jobs: - include: - - name: Java 6 - env: JDK=openjdk6 - addons: - apt: - packages: - - openjdk-6-jdk - install: - # Download dependencies with JDK 8 because Mave Central supports - # TLS 1.2 only but OpenJDK 6 does not. - - export ORIGINAL_JAVA_HOME=$JAVA_HOME - - jdk_switcher use oraclejdk8 - - ./mvnw test -DskipTests - # Delete all files created with JDK 8 - - ./mvnw clean - # Restore desired JDK - - export JAVA_HOME=$ORIGINAL_JAVA_HOME - - jdk_switcher use openjdk6 - - ./mvnw --version - - name: Java 7 - jdk: openjdk7 - - name: Java 8 - jdk: oraclejdk8 - - name: Java 9 - jdk: oraclejdk9 - - name: Java 10 - jdk: openjdk10 - - name: Java 11 - jdk: openjdk11 - - stage: deploy - name: "Publish snapshot artifacts" - addons: - apt: - packages: - - openjdk-6-jdk - install: - # Download dependencies with JDK 8 because Mave Central supports - # TLS 1.2 only but OpenJDK 6 does not. - - export ORIGINAL_JAVA_HOME=$JAVA_HOME - - jdk_switcher use oraclejdk8 - - ./mvnw test -DskipTests - # Delete all files created with JDK 8 - - ./mvnw clean - # Restore desired JDK - - export JAVA_HOME=$ORIGINAL_JAVA_HOME - - jdk_switcher use openjdk6 - - ./mvnw --version - env: - - JDK=openjdk6 - # OSSRH_USERNAME - - secure: griGZYDtqDMRUaYex/uAnpkWIQ/yodM6IOn4G8izWKpyGLeCxyXBG0FDcVo81xRq/9mMevj2idyW/xNP/HAQ45G4pyJUk/vTSMkNslzVjr7OBEtQQCN8XahSaOO0l0CJ5lzA6LdwWg7uDaf9znqZ0slt81u0S1NJmUZyYeUEim0= - # OSSRH_PASSWORD - - secure: EM7Z2M09HvLJXYJaeD/YmeF5A6tqavG2tBBeDcFZ7C6k0AI/wApe882pEMMoUG06xufKfSlt7WFJxoyU3M+fPOpeK5qZpJQxsHWnNJwbcbKzqMpM9mDsgIL9rtAvm9MuIIbIY2spiT0Cx3sHdh5qofaJHPL/u8Or5L9tE8FV1ew= - script: ./mvnw deploy --batch-mode --activate-profiles generate-docs --settings .travis.settings.xml diff --git a/README.md b/README.md index f73f89ca5ed0..739347df5078 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ For more information, please visit: * [Download and Install guide](https://github.com/junit-team/junit4/wiki/Download-and-Install) * [Getting Started](https://github.com/junit-team/junit4/wiki/Getting-started) -[![Build Status](https://travis-ci.org/junit-team/junit4.svg?branch=main)](https://travis-ci.org/junit-team/junit4) +[![CI Status](https://github.com/junit-team/junit4/workflows/CI/badge.svg)](https://github.com/junit-team/junit4/actions) From 8b39600f931e341fb8a387a20b367bf88762b6a5 Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Sat, 2 Jan 2021 17:41:12 +0100 Subject: [PATCH 08/25] Update POM to reflect changed CI system --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 31098bfd0d25..b651a052bc61 100644 --- a/pom.xml +++ b/pom.xml @@ -71,8 +71,8 @@ https://github.com/junit-team/junit4/issues - travis - https://travis-ci.org/junit-team/junit4 + github + https://github.com/junit-team/junit4/actions https://github.com/junit-team/junit4/wiki/Download-and-Install From 1254795902e56eb545e1fe696827924bc5e82b66 Mon Sep 17 00:00:00 2001 From: Kevin Cooney Date: Sat, 2 Jan 2021 14:09:07 -0800 Subject: [PATCH 09/25] Mark ThreadGroups created by FailOnTimeout as daemon groups (#1687) Mark ThreadGroup created by FailOnTimeout as a daemon group. Previously, FailOnTimeout destroyed the ThreadGroup, which could cause race conditions if the ThreadGroup was referenced by other threads. Fixes #1652 --- .../runners/statements/FailOnTimeout.java | 31 +++++------ .../runners/statements/FailOnTimeoutTest.java | 53 ++++++++++--------- 2 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java b/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java index 94c12e6e9770..e0f3c53947c7 100644 --- a/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java +++ b/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java @@ -121,28 +121,21 @@ public void evaluate() throws Throwable { CallableStatement callable = new CallableStatement(); FutureTask task = new FutureTask(callable); ThreadGroup threadGroup = new ThreadGroup("FailOnTimeoutGroup"); - Thread thread = new Thread(threadGroup, task, "Time-limited test"); - try { - thread.setDaemon(true); - thread.start(); - callable.awaitStarted(); - Throwable throwable = getResult(task, thread); - if (throwable != null) { - throw throwable; - } - } finally { + if (!threadGroup.isDaemon()) { try { - thread.join(1); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - try { - threadGroup.destroy(); - } catch (IllegalThreadStateException e) { - // If a thread from the group is still alive, the ThreadGroup cannot be destroyed. - // Swallow the exception to keep the same behavior prior to this change. + threadGroup.setDaemon(true); + } catch (SecurityException e) { + // Swallow the exception to keep the same behavior as in JUnit 4.12. } } + Thread thread = new Thread(threadGroup, task, "Time-limited test"); + thread.setDaemon(true); + thread.start(); + callable.awaitStarted(); + Throwable throwable = getResult(task, thread); + if (throwable != null) { + throw throwable; + } } /** diff --git a/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java b/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java index 00c3f0b98276..f922169ffe3d 100644 --- a/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java +++ b/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java @@ -14,17 +14,16 @@ import static org.junit.Assert.fail; import static org.junit.internal.runners.statements.FailOnTimeout.builder; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; import org.junit.Test; import org.junit.function.ThrowingRunnable; +import org.junit.internal.runners.statements.Fail; import org.junit.runners.model.Statement; import org.junit.runners.model.TestTimedOutException; + /** * @author Asaf Ary, Stefan Birkner */ @@ -91,20 +90,24 @@ public void throwsExceptionWithTimeoutValueAndTimeUnitSet() { assertEquals(TimeUnit.MILLISECONDS, e.getTimeUnit()); } - private ThrowingRunnable evaluateWithException(final Exception exception) { + private ThrowingRunnable evaluateWithDelegate(final Statement delegate) { return new ThrowingRunnable() { public void run() throws Throwable { - statement.nextException = exception; + statement.nextStatement = delegate; statement.waitDuration = 0; failOnTimeout.evaluate(); } }; } + private ThrowingRunnable evaluateWithException(Exception exception) { + return evaluateWithDelegate(new Fail(exception)); + } + private ThrowingRunnable evaluateWithWaitDuration(final long waitDuration) { return new ThrowingRunnable() { public void run() throws Throwable { - statement.nextException = null; + statement.nextStatement = null; statement.waitDuration = waitDuration; failOnTimeout.evaluate(); } @@ -114,13 +117,13 @@ public void run() throws Throwable { private static final class TestStatement extends Statement { long waitDuration; - Exception nextException; + Statement nextStatement; @Override public void evaluate() throws Throwable { sleep(waitDuration); - if (nextException != null) { - throw nextException; + if (nextStatement != null) { + nextStatement.evaluate(); } } } @@ -210,20 +213,22 @@ private void notTheRealCauseOfTheTimeout() { @Test public void threadGroupNotLeaked() throws Throwable { - Collection groupsBeforeSet = subGroupsOfCurrentThread(); - - evaluateWithWaitDuration(0); - - for (ThreadGroup group: subGroupsOfCurrentThread()) { - if (!groupsBeforeSet.contains(group) && "FailOnTimeoutGroup".equals(group.getName())) { - fail("A 'FailOnTimeoutGroup' thread group remains referenced after the test execution."); + final AtomicReference innerThreadGroup = new AtomicReference(); + final AtomicReference innerThread = new AtomicReference(); + ThrowingRunnable runnable = evaluateWithDelegate(new Statement() { + @Override + public void evaluate() { + innerThread.set(currentThread()); + ThreadGroup group = currentThread().getThreadGroup(); + innerThreadGroup.set(group); + assertTrue("the 'FailOnTimeoutGroup' thread group should be a daemon thread group", group.isDaemon()); } - } - } - - private Collection subGroupsOfCurrentThread() { - ThreadGroup[] subGroups = new ThreadGroup[256]; - int numGroups = currentThread().getThreadGroup().enumerate(subGroups); - return Arrays.asList(subGroups).subList(0, numGroups); + }); + + runnable.run(); + + assertTrue("the Statement was never run", innerThread.get() != null); + innerThread.get().join(); + assertTrue("the 'FailOnTimeoutGroup' thread group should be destroyed after running the test", innerThreadGroup.get().isDestroyed()); } } From cfec8c7d242feaff0d42ff61c28993ffa537fb83 Mon Sep 17 00:00:00 2001 From: Kevin Cooney Date: Mon, 4 Jan 2021 13:35:35 -0800 Subject: [PATCH 10/25] Initial release notes for 4.13.2 (#1692) * Initial release notes for 4.13.2 Co-authored-by: Marc Philipp --- doc/ReleaseNotes4.13.2.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/ReleaseNotes4.13.2.md diff --git a/doc/ReleaseNotes4.13.2.md b/doc/ReleaseNotes4.13.2.md new file mode 100644 index 000000000000..919eadff7e72 --- /dev/null +++ b/doc/ReleaseNotes4.13.2.md @@ -0,0 +1,13 @@ +## Summary of changes in version 4.13.2 + +# Rules + +### [Pull request #1687:](https://github.com/junit-team/junit/pull/1687) Mark ThreadGroups created by FailOnTimeout as daemon groups + +In JUnit 4.13 ([pull request #1517](https://github.com/junit-team/junit4/pull/1517)) an attempt was +made to fix leakage of the `ThreadGroup` instances created when a test is run with a timeout. That +change explicitly destroyed the `ThreadGroup` that was created for the time-limited test. Numerous +people reported problems that were caused by explicitly destroying the `ThreadGroup`. + +In this change, the code was updated to call `ThreadGroup.setDaemon(true)` instead of destroying the +ThreadGroup. From 8d9690a8be8d2c320f73b0f6074fdd8478eab0ae Mon Sep 17 00:00:00 2001 From: "Anosh D. Ullenius" Date: Wed, 27 Nov 2019 15:13:42 +0100 Subject: [PATCH 11/25] Remove commented out code --- src/test/java/junit/tests/runner/TextRunnerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/junit/tests/runner/TextRunnerTest.java b/src/test/java/junit/tests/runner/TextRunnerTest.java index c74acc21335a..44e16fd599d0 100644 --- a/src/test/java/junit/tests/runner/TextRunnerTest.java +++ b/src/test/java/junit/tests/runner/TextRunnerTest.java @@ -32,7 +32,7 @@ void execTest(String testClass, boolean success) throws Exception { Process p = Runtime.getRuntime().exec(cmd); InputStream i = p.getInputStream(); while ((i.read()) != -1) - ; //System.out.write(b); + ; assertTrue((p.waitFor() == 0) == success); if (success) { assertTrue(p.exitValue() == 0); From 318e5a7861940cf0cf796bffb033e148d049b524 Mon Sep 17 00:00:00 2001 From: "Anosh D. Ullenius" Date: Wed, 27 Nov 2019 15:16:45 +0100 Subject: [PATCH 12/25] Clean up imports * Same package classes are always implicitly imported * Remove unused imports --- .../junit/experimental/results/ResultMatchers.java | 1 - .../org/junit/runners/model/FrameworkField.java | 1 - src/test/java/junit/tests/runner/ResultTest.java | 2 -- .../categories/CategoriesAndParameterizedTest.java | 2 -- .../experimental/categories/CategoryTest.java | 13 ++++++------- .../categories/CategoryValidatorTest.java | 2 -- .../junit/experimental/categories/JavadocTest.java | 12 +++++------- .../experimental/categories/MultiCategoryTest.java | 14 ++++++-------- src/test/java/org/junit/rules/RuleChainTest.java | 2 -- src/test/java/org/junit/rules/TestRuleTest.java | 4 ---- .../java/org/junit/runners/AllRunnersTests.java | 1 - .../java/org/junit/runners/RuleContainerTest.java | 2 -- .../parent/ParentRunnerClassLoaderTest.java | 12 +++++------- 13 files changed, 22 insertions(+), 46 deletions(-) diff --git a/src/main/java/org/junit/experimental/results/ResultMatchers.java b/src/main/java/org/junit/experimental/results/ResultMatchers.java index e111093150c1..92f2e6b0482c 100644 --- a/src/main/java/org/junit/experimental/results/ResultMatchers.java +++ b/src/main/java/org/junit/experimental/results/ResultMatchers.java @@ -4,7 +4,6 @@ import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; -import org.junit.runner.notification.Failure; /** * Matchers on a PrintableResult, to enable JUnit self-tests. diff --git a/src/main/java/org/junit/runners/model/FrameworkField.java b/src/main/java/org/junit/runners/model/FrameworkField.java index 1f8a101418fb..ea2b16f8c4ae 100644 --- a/src/main/java/org/junit/runners/model/FrameworkField.java +++ b/src/main/java/org/junit/runners/model/FrameworkField.java @@ -2,7 +2,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Field; -import java.util.List; import org.junit.runners.BlockJUnit4ClassRunner; diff --git a/src/test/java/junit/tests/runner/ResultTest.java b/src/test/java/junit/tests/runner/ResultTest.java index 7a6042996268..734cf6c4ecd4 100644 --- a/src/test/java/junit/tests/runner/ResultTest.java +++ b/src/test/java/junit/tests/runner/ResultTest.java @@ -2,8 +2,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; diff --git a/src/test/java/org/junit/experimental/categories/CategoriesAndParameterizedTest.java b/src/test/java/org/junit/experimental/categories/CategoriesAndParameterizedTest.java index 68e842bb53e9..3d792225d179 100644 --- a/src/test/java/org/junit/experimental/categories/CategoriesAndParameterizedTest.java +++ b/src/test/java/org/junit/experimental/categories/CategoriesAndParameterizedTest.java @@ -6,9 +6,7 @@ import org.junit.Assert; import org.junit.Test; -import org.junit.experimental.categories.Categories; import org.junit.experimental.categories.Categories.IncludeCategory; -import org.junit.experimental.categories.Category; import org.junit.runner.JUnitCore; import org.junit.runner.Result; import org.junit.runner.RunWith; diff --git a/src/test/java/org/junit/experimental/categories/CategoryTest.java b/src/test/java/org/junit/experimental/categories/CategoryTest.java index 59242b447cfa..9aa14fcf95a5 100644 --- a/src/test/java/org/junit/experimental/categories/CategoryTest.java +++ b/src/test/java/org/junit/experimental/categories/CategoryTest.java @@ -1,28 +1,27 @@ package org.junit.experimental.categories; +import static java.lang.String.format; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.AnyOf.anyOf; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.experimental.results.PrintableResult.testResult; -import static org.junit.experimental.results.ResultMatchers.isSuccessful; import static org.junit.experimental.results.ResultMatchers.failureCountIs; -import static org.hamcrest.core.AnyOf.anyOf; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsEqual.equalTo; -import static java.lang.String.format; +import static org.junit.experimental.results.ResultMatchers.isSuccessful; import java.util.Collections; import java.util.HashSet; import java.util.Set; + import org.junit.Ignore; import org.junit.Test; -import org.junit.experimental.categories.Categories; import org.junit.experimental.categories.Categories.CategoryFilter; import org.junit.experimental.categories.Categories.ExcludeCategory; import org.junit.experimental.categories.Categories.IncludeCategory; -import org.junit.experimental.categories.Category; import org.junit.runner.JUnitCore; import org.junit.runner.Request; import org.junit.runner.Result; diff --git a/src/test/java/org/junit/experimental/categories/CategoryValidatorTest.java b/src/test/java/org/junit/experimental/categories/CategoryValidatorTest.java index 654622f594bf..6d7c22ec31dd 100644 --- a/src/test/java/org/junit/experimental/categories/CategoryValidatorTest.java +++ b/src/test/java/org/junit/experimental/categories/CategoryValidatorTest.java @@ -10,8 +10,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.experimental.categories.CategoryValidator; import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.TestClass; diff --git a/src/test/java/org/junit/experimental/categories/JavadocTest.java b/src/test/java/org/junit/experimental/categories/JavadocTest.java index 65fa430f9dbb..fc0df7248bbd 100644 --- a/src/test/java/org/junit/experimental/categories/JavadocTest.java +++ b/src/test/java/org/junit/experimental/categories/JavadocTest.java @@ -1,18 +1,16 @@ package org.junit.experimental.categories; +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import org.junit.Test; -import org.junit.experimental.categories.Categories; -import org.junit.experimental.categories.Category; import org.junit.runner.JUnitCore; import org.junit.runner.Result; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - /** * @author tibor17 * @version 4.12 diff --git a/src/test/java/org/junit/experimental/categories/MultiCategoryTest.java b/src/test/java/org/junit/experimental/categories/MultiCategoryTest.java index c7169aca120a..68a580cdead7 100644 --- a/src/test/java/org/junit/experimental/categories/MultiCategoryTest.java +++ b/src/test/java/org/junit/experimental/categories/MultiCategoryTest.java @@ -1,19 +1,17 @@ package org.junit.experimental.categories; -import org.junit.Test; -import org.junit.experimental.categories.Categories; -import org.junit.experimental.categories.Category; -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; +import org.junit.Test; +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + /** * @author tibor17 * @version 4.12 diff --git a/src/test/java/org/junit/rules/RuleChainTest.java b/src/test/java/org/junit/rules/RuleChainTest.java index 914b6a9088c5..54daf8dc59a7 100644 --- a/src/test/java/org/junit/rules/RuleChainTest.java +++ b/src/test/java/org/junit/rules/RuleChainTest.java @@ -10,8 +10,6 @@ import static org.junit.experimental.results.PrintableResult.testResult; import static org.junit.rules.RuleChain.outerRule; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/junit/rules/TestRuleTest.java b/src/test/java/org/junit/rules/TestRuleTest.java index 23d4bfbc8ff4..cc6db7d9eb34 100644 --- a/src/test/java/org/junit/rules/TestRuleTest.java +++ b/src/test/java/org/junit/rules/TestRuleTest.java @@ -1,11 +1,9 @@ package org.junit.rules; -import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.junit.experimental.results.PrintableResult.testResult; import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining; import static org.junit.experimental.results.ResultMatchers.isSuccessful; @@ -14,11 +12,9 @@ import java.util.List; import org.junit.After; -import org.junit.Assume; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.internal.AssumptionViolatedException; import org.junit.runner.Description; import org.junit.runner.JUnitCore; import org.junit.runner.Result; diff --git a/src/test/java/org/junit/runners/AllRunnersTests.java b/src/test/java/org/junit/runners/AllRunnersTests.java index a51072c054a6..5464fb27f9ac 100644 --- a/src/test/java/org/junit/runners/AllRunnersTests.java +++ b/src/test/java/org/junit/runners/AllRunnersTests.java @@ -1,7 +1,6 @@ package org.junit.runners; import org.junit.runner.RunWith; -import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; import org.junit.runners.model.AllModelTests; import org.junit.runners.parameterized.AllParameterizedTests; diff --git a/src/test/java/org/junit/runners/RuleContainerTest.java b/src/test/java/org/junit/runners/RuleContainerTest.java index 714d0dfdf660..8c6649c5022f 100644 --- a/src/test/java/org/junit/runners/RuleContainerTest.java +++ b/src/test/java/org/junit/runners/RuleContainerTest.java @@ -2,8 +2,6 @@ import static org.junit.Assert.assertEquals; -import java.util.Arrays; - import org.junit.Test; import org.junit.rules.MethodRule; import org.junit.rules.TestRule; diff --git a/src/test/java/org/junit/tests/running/classes/parent/ParentRunnerClassLoaderTest.java b/src/test/java/org/junit/tests/running/classes/parent/ParentRunnerClassLoaderTest.java index bb6ba14e4c44..16443368d7dc 100644 --- a/src/test/java/org/junit/tests/running/classes/parent/ParentRunnerClassLoaderTest.java +++ b/src/test/java/org/junit/tests/running/classes/parent/ParentRunnerClassLoaderTest.java @@ -1,5 +1,10 @@ package org.junit.tests.running.classes.parent; +import static org.junit.Assert.assertEquals; + +import java.lang.reflect.Field; +import java.net.URL; +import java.net.URLClassLoader; import org.junit.Test; import org.junit.runner.Description; @@ -9,13 +14,6 @@ import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.InitializationError; -import java.lang.reflect.Field; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.List; - -import static org.junit.Assert.assertEquals; - public class ParentRunnerClassLoaderTest { @Test public void testClassRuleAccessToClassInAnotherClassLoader() throws Exception { From ba3799facea95317bfd09ab802d0725b984ac2e3 Mon Sep 17 00:00:00 2001 From: "Anosh D. Ullenius" Date: Wed, 27 Nov 2019 15:38:58 +0100 Subject: [PATCH 13/25] Reordering the modifiers to comply with the JLS: * Java Language Specification --- .../junit/extensions/ActiveTestSuite.java | 2 +- src/main/java/junit/framework/Assert.java | 74 ++++++++--------- .../runner/notification/RunNotifier.java | 2 +- .../junit/validator/AnnotationsValidator.java | 2 +- .../java/junit/tests/runner/ResultTest.java | 2 +- .../experimental/categories/CategoryTest.java | 2 +- .../org/junit/rules/DisableOnDebugTest.java | 2 +- .../java/org/junit/rules/MethodRulesTest.java | 2 +- .../java/org/junit/rules/StopwatchTest.java | 2 +- .../tests/experimental/AssumptionTest.java | 4 +- .../theories/AssumingInTheoriesTest.java | 2 +- .../runner/SuccessfulWithDataPointFields.java | 2 +- .../junit3compatibility/AllTestsTest.java | 4 +- .../ForwardCompatibilityTest.java | 2 +- .../JUnit38ClassRunnerTest.java | 2 +- .../tests/junit3compatibility/OldTests.java | 2 +- .../junit3compatibility/SuiteMethodTest.java | 8 +- .../junit/tests/listening/ListenerTest.java | 2 +- .../tests/manipulation/SingleMethodTest.java | 6 +- .../tests/running/classes/EnclosedTest.java | 2 +- .../classes/ParameterizedTestTest.java | 28 +++---- .../tests/running/core/CommandLineTest.java | 4 +- .../JUnitCoreReturnsCorrectExitCodeTest.java | 4 +- .../tests/running/methods/AnnotationTest.java | 80 +++++++++---------- .../methods/ParameterizedTestMethodTest.java | 6 +- 25 files changed, 124 insertions(+), 124 deletions(-) diff --git a/src/main/java/junit/extensions/ActiveTestSuite.java b/src/main/java/junit/extensions/ActiveTestSuite.java index 95c5e2e71062..6f0f99dad04e 100644 --- a/src/main/java/junit/extensions/ActiveTestSuite.java +++ b/src/main/java/junit/extensions/ActiveTestSuite.java @@ -63,7 +63,7 @@ synchronized void waitUntilFinished() { } } - synchronized public void runFinished() { + public synchronized void runFinished() { fActiveTestDeathCount++; notifyAll(); } diff --git a/src/main/java/junit/framework/Assert.java b/src/main/java/junit/framework/Assert.java index d10cdb4247b6..43482a16b6f2 100644 --- a/src/main/java/junit/framework/Assert.java +++ b/src/main/java/junit/framework/Assert.java @@ -17,7 +17,7 @@ protected Assert() { * Asserts that a condition is true. If it isn't it throws * an AssertionFailedError with the given message. */ - static public void assertTrue(String message, boolean condition) { + public static void assertTrue(String message, boolean condition) { if (!condition) { fail(message); } @@ -27,7 +27,7 @@ static public void assertTrue(String message, boolean condition) { * Asserts that a condition is true. If it isn't it throws * an AssertionFailedError. */ - static public void assertTrue(boolean condition) { + public static void assertTrue(boolean condition) { assertTrue(null, condition); } @@ -35,7 +35,7 @@ static public void assertTrue(boolean condition) { * Asserts that a condition is false. If it isn't it throws * an AssertionFailedError with the given message. */ - static public void assertFalse(String message, boolean condition) { + public static void assertFalse(String message, boolean condition) { assertTrue(message, !condition); } @@ -43,14 +43,14 @@ static public void assertFalse(String message, boolean condition) { * Asserts that a condition is false. If it isn't it throws * an AssertionFailedError. */ - static public void assertFalse(boolean condition) { + public static void assertFalse(boolean condition) { assertFalse(null, condition); } /** * Fails a test with the given message. */ - static public void fail(String message) { + public static void fail(String message) { if (message == null) { throw new AssertionFailedError(); } @@ -60,7 +60,7 @@ static public void fail(String message) { /** * Fails a test with no message. */ - static public void fail() { + public static void fail() { fail(null); } @@ -68,7 +68,7 @@ static public void fail() { * Asserts that two objects are equal. If they are not * an AssertionFailedError is thrown with the given message. */ - static public void assertEquals(String message, Object expected, Object actual) { + public static void assertEquals(String message, Object expected, Object actual) { if (expected == null && actual == null) { return; } @@ -82,14 +82,14 @@ static public void assertEquals(String message, Object expected, Object actual) * Asserts that two objects are equal. If they are not * an AssertionFailedError is thrown. */ - static public void assertEquals(Object expected, Object actual) { + public static void assertEquals(Object expected, Object actual) { assertEquals(null, expected, actual); } /** * Asserts that two Strings are equal. */ - static public void assertEquals(String message, String expected, String actual) { + public static void assertEquals(String message, String expected, String actual) { if (expected == null && actual == null) { return; } @@ -103,7 +103,7 @@ static public void assertEquals(String message, String expected, String actual) /** * Asserts that two Strings are equal. */ - static public void assertEquals(String expected, String actual) { + public static void assertEquals(String expected, String actual) { assertEquals(null, expected, actual); } @@ -112,7 +112,7 @@ static public void assertEquals(String expected, String actual) { * an AssertionFailedError is thrown with the given message. If the expected * value is infinity then the delta value is ignored. */ - static public void assertEquals(String message, double expected, double actual, double delta) { + public static void assertEquals(String message, double expected, double actual, double delta) { if (Double.compare(expected, actual) == 0) { return; } @@ -125,7 +125,7 @@ static public void assertEquals(String message, double expected, double actual, * Asserts that two doubles are equal concerning a delta. If the expected * value is infinity then the delta value is ignored. */ - static public void assertEquals(double expected, double actual, double delta) { + public static void assertEquals(double expected, double actual, double delta) { assertEquals(null, expected, actual, delta); } @@ -134,7 +134,7 @@ static public void assertEquals(double expected, double actual, double delta) { * are not an AssertionFailedError is thrown with the given message. If the * expected value is infinity then the delta value is ignored. */ - static public void assertEquals(String message, float expected, float actual, float delta) { + public static void assertEquals(String message, float expected, float actual, float delta) { if (Float.compare(expected, actual) == 0) { return; } @@ -147,7 +147,7 @@ static public void assertEquals(String message, float expected, float actual, fl * Asserts that two floats are equal concerning a delta. If the expected * value is infinity then the delta value is ignored. */ - static public void assertEquals(float expected, float actual, float delta) { + public static void assertEquals(float expected, float actual, float delta) { assertEquals(null, expected, actual, delta); } @@ -155,14 +155,14 @@ static public void assertEquals(float expected, float actual, float delta) { * Asserts that two longs are equal. If they are not * an AssertionFailedError is thrown with the given message. */ - static public void assertEquals(String message, long expected, long actual) { + public static void assertEquals(String message, long expected, long actual) { assertEquals(message, Long.valueOf(expected), Long.valueOf(actual)); } /** * Asserts that two longs are equal. */ - static public void assertEquals(long expected, long actual) { + public static void assertEquals(long expected, long actual) { assertEquals(null, expected, actual); } @@ -170,14 +170,14 @@ static public void assertEquals(long expected, long actual) { * Asserts that two booleans are equal. If they are not * an AssertionFailedError is thrown with the given message. */ - static public void assertEquals(String message, boolean expected, boolean actual) { + public static void assertEquals(String message, boolean expected, boolean actual) { assertEquals(message, Boolean.valueOf(expected), Boolean.valueOf(actual)); } /** * Asserts that two booleans are equal. */ - static public void assertEquals(boolean expected, boolean actual) { + public static void assertEquals(boolean expected, boolean actual) { assertEquals(null, expected, actual); } @@ -185,14 +185,14 @@ static public void assertEquals(boolean expected, boolean actual) { * Asserts that two bytes are equal. If they are not * an AssertionFailedError is thrown with the given message. */ - static public void assertEquals(String message, byte expected, byte actual) { + public static void assertEquals(String message, byte expected, byte actual) { assertEquals(message, Byte.valueOf(expected), Byte.valueOf(actual)); } /** * Asserts that two bytes are equal. */ - static public void assertEquals(byte expected, byte actual) { + public static void assertEquals(byte expected, byte actual) { assertEquals(null, expected, actual); } @@ -200,14 +200,14 @@ static public void assertEquals(byte expected, byte actual) { * Asserts that two chars are equal. If they are not * an AssertionFailedError is thrown with the given message. */ - static public void assertEquals(String message, char expected, char actual) { + public static void assertEquals(String message, char expected, char actual) { assertEquals(message, Character.valueOf(expected), Character.valueOf(actual)); } /** * Asserts that two chars are equal. */ - static public void assertEquals(char expected, char actual) { + public static void assertEquals(char expected, char actual) { assertEquals(null, expected, actual); } @@ -215,14 +215,14 @@ static public void assertEquals(char expected, char actual) { * Asserts that two shorts are equal. If they are not * an AssertionFailedError is thrown with the given message. */ - static public void assertEquals(String message, short expected, short actual) { + public static void assertEquals(String message, short expected, short actual) { assertEquals(message, Short.valueOf(expected), Short.valueOf(actual)); } /** * Asserts that two shorts are equal. */ - static public void assertEquals(short expected, short actual) { + public static void assertEquals(short expected, short actual) { assertEquals(null, expected, actual); } @@ -230,21 +230,21 @@ static public void assertEquals(short expected, short actual) { * Asserts that two ints are equal. If they are not * an AssertionFailedError is thrown with the given message. */ - static public void assertEquals(String message, int expected, int actual) { + public static void assertEquals(String message, int expected, int actual) { assertEquals(message, Integer.valueOf(expected), Integer.valueOf(actual)); } /** * Asserts that two ints are equal. */ - static public void assertEquals(int expected, int actual) { + public static void assertEquals(int expected, int actual) { assertEquals(null, expected, actual); } /** * Asserts that an object isn't null. */ - static public void assertNotNull(Object object) { + public static void assertNotNull(Object object) { assertNotNull(null, object); } @@ -252,7 +252,7 @@ static public void assertNotNull(Object object) { * Asserts that an object isn't null. If it is * an AssertionFailedError is thrown with the given message. */ - static public void assertNotNull(String message, Object object) { + public static void assertNotNull(String message, Object object) { assertTrue(message, object != null); } @@ -263,7 +263,7 @@ static public void assertNotNull(String message, Object object) { * * @param object Object to check or null */ - static public void assertNull(Object object) { + public static void assertNull(Object object) { if (object != null) { assertNull("Expected: but was: " + object.toString(), object); } @@ -273,7 +273,7 @@ static public void assertNull(Object object) { * Asserts that an object is null. If it is not * an AssertionFailedError is thrown with the given message. */ - static public void assertNull(String message, Object object) { + public static void assertNull(String message, Object object) { assertTrue(message, object == null); } @@ -281,7 +281,7 @@ static public void assertNull(String message, Object object) { * Asserts that two objects refer to the same object. If they are not * an AssertionFailedError is thrown with the given message. */ - static public void assertSame(String message, Object expected, Object actual) { + public static void assertSame(String message, Object expected, Object actual) { if (expected == actual) { return; } @@ -292,7 +292,7 @@ static public void assertSame(String message, Object expected, Object actual) { * Asserts that two objects refer to the same object. If they are not * the same an AssertionFailedError is thrown. */ - static public void assertSame(Object expected, Object actual) { + public static void assertSame(Object expected, Object actual) { assertSame(null, expected, actual); } @@ -301,7 +301,7 @@ static public void assertSame(Object expected, Object actual) { * refer to the same object an AssertionFailedError is thrown with the * given message. */ - static public void assertNotSame(String message, Object expected, Object actual) { + public static void assertNotSame(String message, Object expected, Object actual) { if (expected == actual) { failSame(message); } @@ -311,21 +311,21 @@ static public void assertNotSame(String message, Object expected, Object actual) * Asserts that two objects do not refer to the same object. If they do * refer to the same object an AssertionFailedError is thrown. */ - static public void assertNotSame(Object expected, Object actual) { + public static void assertNotSame(Object expected, Object actual) { assertNotSame(null, expected, actual); } - static public void failSame(String message) { + public static void failSame(String message) { String formatted = (message != null) ? message + " " : ""; fail(formatted + "expected not same"); } - static public void failNotSame(String message, Object expected, Object actual) { + public static void failNotSame(String message, Object expected, Object actual) { String formatted = (message != null) ? message + " " : ""; fail(formatted + "expected same:<" + expected + "> was not:<" + actual + ">"); } - static public void failNotEquals(String message, Object expected, Object actual) { + public static void failNotEquals(String message, Object expected, Object actual) { fail(format(message, expected, actual)); } diff --git a/src/main/java/org/junit/runner/notification/RunNotifier.java b/src/main/java/org/junit/runner/notification/RunNotifier.java index 8b686cdf287a..752fa3bdf6ac 100644 --- a/src/main/java/org/junit/runner/notification/RunNotifier.java +++ b/src/main/java/org/junit/runner/notification/RunNotifier.java @@ -78,7 +78,7 @@ void run() { fireTestFailures(safeListeners, failures); } - abstract protected void notifyListener(RunListener each) throws Exception; + protected abstract void notifyListener(RunListener each) throws Exception; } /** diff --git a/src/main/java/org/junit/validator/AnnotationsValidator.java b/src/main/java/org/junit/validator/AnnotationsValidator.java index 44d99d2a2f8d..d8b58404f9a5 100644 --- a/src/main/java/org/junit/validator/AnnotationsValidator.java +++ b/src/main/java/org/junit/validator/AnnotationsValidator.java @@ -40,7 +40,7 @@ public List validateTestClass(TestClass testClass) { return validationErrors; } - private static abstract class AnnotatableValidator { + private abstract static class AnnotatableValidator { private static final AnnotationValidatorFactory ANNOTATION_VALIDATOR_FACTORY = new AnnotationValidatorFactory(); abstract Iterable getAnnotatablesForTestClass(TestClass testClass); diff --git a/src/test/java/junit/tests/runner/ResultTest.java b/src/test/java/junit/tests/runner/ResultTest.java index 734cf6c4ecd4..8cd7ac2d657e 100644 --- a/src/test/java/junit/tests/runner/ResultTest.java +++ b/src/test/java/junit/tests/runner/ResultTest.java @@ -96,7 +96,7 @@ private void assertResultReserializable(Result result, SerializationFormat resou fromStream, resourceSerializationFormat); } - static public class AssumptionFailedTest { + public static class AssumptionFailedTest { @Test public void assumptionFailed() throws Exception { org.junit.Assume.assumeTrue(false); diff --git a/src/test/java/org/junit/experimental/categories/CategoryTest.java b/src/test/java/org/junit/experimental/categories/CategoryTest.java index 9aa14fcf95a5..6088f1d26229 100644 --- a/src/test/java/org/junit/experimental/categories/CategoryTest.java +++ b/src/test/java/org/junit/experimental/categories/CategoryTest.java @@ -411,7 +411,7 @@ public void classesCanBeCategories() { } @Category(SlowTests.class) - public static abstract class Ancestor{} + public abstract static class Ancestor{} public static class Inherited extends Ancestor { @Test diff --git a/src/test/java/org/junit/rules/DisableOnDebugTest.java b/src/test/java/org/junit/rules/DisableOnDebugTest.java index d61db9e528db..8bf6b9deeee4 100644 --- a/src/test/java/org/junit/rules/DisableOnDebugTest.java +++ b/src/test/java/org/junit/rules/DisableOnDebugTest.java @@ -48,7 +48,7 @@ public void evaluate() throws Throwable { } - public static abstract class AbstractDisableOnDebugTest { + public abstract static class AbstractDisableOnDebugTest { @Rule public TestRule failOnExecution; diff --git a/src/test/java/org/junit/rules/MethodRulesTest.java b/src/test/java/org/junit/rules/MethodRulesTest.java index 93eb68468d28..6c59f7edab3c 100644 --- a/src/test/java/org/junit/rules/MethodRulesTest.java +++ b/src/test/java/org/junit/rules/MethodRulesTest.java @@ -44,7 +44,7 @@ public void nothing() { } } - static abstract class NonPublicExampleTest { + abstract static class NonPublicExampleTest { @Rule public MethodRule example = new TestMethodRule(); diff --git a/src/test/java/org/junit/rules/StopwatchTest.java b/src/test/java/org/junit/rules/StopwatchTest.java index 69fbcb03ec68..5941eb9b1bb1 100644 --- a/src/test/java/org/junit/rules/StopwatchTest.java +++ b/src/test/java/org/junit/rules/StopwatchTest.java @@ -49,7 +49,7 @@ private static class Record { } } - public static abstract class AbstractStopwatchTest { + public abstract static class AbstractStopwatchTest { /** * Fake implementation of {@link Stopwatch.Clock} that increments the time diff --git a/src/test/java/org/junit/tests/experimental/AssumptionTest.java b/src/test/java/org/junit/tests/experimental/AssumptionTest.java index 45e94b026edc..e011619cf679 100644 --- a/src/test/java/org/junit/tests/experimental/AssumptionTest.java +++ b/src/test/java/org/junit/tests/experimental/AssumptionTest.java @@ -237,8 +237,8 @@ public void assumeWithExpectedExceptionShouldThrowAssumptionViolatedException() assertThat(result.getAssumptionFailureCount(), is(1)); } - final static String message = "Some random message string."; - final static Throwable e = new Throwable(); + static final String message = "Some random message string."; + static final Throwable e = new Throwable(); /** * @see AssumptionTest#assumptionsWithMessage() diff --git a/src/test/java/org/junit/tests/experimental/theories/AssumingInTheoriesTest.java b/src/test/java/org/junit/tests/experimental/theories/AssumingInTheoriesTest.java index 758e6fbe2b2d..099b50fe14c4 100644 --- a/src/test/java/org/junit/tests/experimental/theories/AssumingInTheoriesTest.java +++ b/src/test/java/org/junit/tests/experimental/theories/AssumingInTheoriesTest.java @@ -31,7 +31,7 @@ public void theoryMeansOnlyAssumeShouldFail() throws InitializationError { public static class TheoryWithNoUnassumedParameters { @DataPoint - public final static boolean FALSE = false; + public static final boolean FALSE = false; @Theory public void theoryWithNoUnassumedParameters(boolean value) { diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/SuccessfulWithDataPointFields.java b/src/test/java/org/junit/tests/experimental/theories/runner/SuccessfulWithDataPointFields.java index 2b5d587be21c..80cfd897642d 100644 --- a/src/test/java/org/junit/tests/experimental/theories/runner/SuccessfulWithDataPointFields.java +++ b/src/test/java/org/junit/tests/experimental/theories/runner/SuccessfulWithDataPointFields.java @@ -195,7 +195,7 @@ public static void calledTwice() { } @RunWith(Theories.class) - static public class StaticPublicNonDataPoints { + public static class StaticPublicNonDataPoints { // DataPoint which passes the test @DataPoint public static int ZERO = 0; diff --git a/src/test/java/org/junit/tests/junit3compatibility/AllTestsTest.java b/src/test/java/org/junit/tests/junit3compatibility/AllTestsTest.java index 99468128907a..3f4a7f40435c 100644 --- a/src/test/java/org/junit/tests/junit3compatibility/AllTestsTest.java +++ b/src/test/java/org/junit/tests/junit3compatibility/AllTestsTest.java @@ -24,7 +24,7 @@ public void testSomething() { @RunWith(AllTests.class) public static class All { - static public junit.framework.Test suite() { + public static junit.framework.Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(OneTest.class); return suite; @@ -60,7 +60,7 @@ public void testSomething() { @RunWith(AllTests.class) public static class AllJUnit4 { - static public junit.framework.Test suite() { + public static junit.framework.Test suite() { TestSuite suite = new TestSuite(); suite.addTest(new JUnit4TestAdapter(JUnit4Test.class)); return suite; diff --git a/src/test/java/org/junit/tests/junit3compatibility/ForwardCompatibilityTest.java b/src/test/java/org/junit/tests/junit3compatibility/ForwardCompatibilityTest.java index 34673e9fbd1b..79539d1497b4 100644 --- a/src/test/java/org/junit/tests/junit3compatibility/ForwardCompatibilityTest.java +++ b/src/test/java/org/junit/tests/junit3compatibility/ForwardCompatibilityTest.java @@ -19,7 +19,7 @@ public class ForwardCompatibilityTest extends TestCase { static String fLog; - static public class NewTest { + public static class NewTest { @Before public void before() { fLog += "before "; diff --git a/src/test/java/org/junit/tests/junit3compatibility/JUnit38ClassRunnerTest.java b/src/test/java/org/junit/tests/junit3compatibility/JUnit38ClassRunnerTest.java index b7a1c515e3f2..429bde6910e7 100644 --- a/src/test/java/org/junit/tests/junit3compatibility/JUnit38ClassRunnerTest.java +++ b/src/test/java/org/junit/tests/junit3compatibility/JUnit38ClassRunnerTest.java @@ -53,7 +53,7 @@ public void canUnadaptAnAdapter() { static int count; - static public class OneTest extends TestCase { + public static class OneTest extends TestCase { public void testOne() { } } diff --git a/src/test/java/org/junit/tests/junit3compatibility/OldTests.java b/src/test/java/org/junit/tests/junit3compatibility/OldTests.java index e8b3ab8eca32..bee32f50b84d 100644 --- a/src/test/java/org/junit/tests/junit3compatibility/OldTests.java +++ b/src/test/java/org/junit/tests/junit3compatibility/OldTests.java @@ -6,7 +6,7 @@ @RunWith(AllTests.class) public class OldTests { - static public Test suite() { + public static Test suite() { return junit.tests.AllTests.suite(); } } diff --git a/src/test/java/org/junit/tests/junit3compatibility/SuiteMethodTest.java b/src/test/java/org/junit/tests/junit3compatibility/SuiteMethodTest.java index edc9eac2b0c4..55c1cd119afe 100644 --- a/src/test/java/org/junit/tests/junit3compatibility/SuiteMethodTest.java +++ b/src/test/java/org/junit/tests/junit3compatibility/SuiteMethodTest.java @@ -18,7 +18,7 @@ public class SuiteMethodTest { public static boolean wasRun; - static public class OldTest extends TestCase { + public static class OldTest extends TestCase { public OldTest(String name) { super(name); } @@ -41,7 +41,7 @@ public void makeSureSuiteIsCalled() { assertTrue(wasRun); } - static public class NewTest { + public static class NewTest { @Test public void sample() { wasRun = true; @@ -81,7 +81,7 @@ public void descriptionAndRunNotificationsAreConsistent() { assertEquals(0, description.getChildren().size()); } - static public class NewTestSuiteFails { + public static class NewTestSuiteFails { @Test public void sample() { wasRun = true; @@ -101,7 +101,7 @@ public void suiteIsUsedWithJUnit4Classes() { assertFalse(wasRun); } - static public class NewTestSuiteNotUsed { + public static class NewTestSuiteNotUsed { private static boolean wasIgnoredRun; @Test diff --git a/src/test/java/org/junit/tests/listening/ListenerTest.java b/src/test/java/org/junit/tests/listening/ListenerTest.java index c76581a0d5c6..b3003394797b 100644 --- a/src/test/java/org/junit/tests/listening/ListenerTest.java +++ b/src/test/java/org/junit/tests/listening/ListenerTest.java @@ -8,7 +8,7 @@ import org.junit.runner.notification.RunListener; public class ListenerTest { - static private String log; + private static String log; public static class OneTest { @Test diff --git a/src/test/java/org/junit/tests/manipulation/SingleMethodTest.java b/src/test/java/org/junit/tests/manipulation/SingleMethodTest.java index cf62c98e4d79..a15340708fab 100644 --- a/src/test/java/org/junit/tests/manipulation/SingleMethodTest.java +++ b/src/test/java/org/junit/tests/manipulation/SingleMethodTest.java @@ -27,7 +27,7 @@ public class SingleMethodTest { public static int count; - static public class OneTimeSetup { + public static class OneTimeSetup { @BeforeClass public static void once() { count++; @@ -53,7 +53,7 @@ public void oneTimeSetup() throws Exception { } @RunWith(Parameterized.class) - static public class ParameterizedOneTimeSetup { + public static class ParameterizedOneTimeSetup { @Parameters public static List params() { return Arrays.asList(new Object[]{1}, new Object[]{2}); @@ -78,7 +78,7 @@ public void parameterizedFilterToSingleMethod() throws Exception { } @RunWith(Parameterized.class) - static public class ParameterizedOneTimeBeforeClass { + public static class ParameterizedOneTimeBeforeClass { @Parameters public static List params() { return Arrays.asList(new Object[]{1}, new Object[]{2}); diff --git a/src/test/java/org/junit/tests/running/classes/EnclosedTest.java b/src/test/java/org/junit/tests/running/classes/EnclosedTest.java index 9f71deadaf18..9a8165a4c73e 100644 --- a/src/test/java/org/junit/tests/running/classes/EnclosedTest.java +++ b/src/test/java/org/junit/tests/running/classes/EnclosedTest.java @@ -30,7 +30,7 @@ public void b() {} @Test public void c() {} } - abstract public static class C { + public abstract static class C { @Test public void a() {} } } diff --git a/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java b/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java index 14fb825df5bc..6288dbc4af43 100644 --- a/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java +++ b/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java @@ -168,7 +168,7 @@ public void providesDataByAnnotatedFields() { } @RunWith(Parameterized.class) - static public class BadIndexForAnnotatedFieldTest { + public static class BadIndexForAnnotatedFieldTest { @Parameters public static Collection data() { return Arrays.asList(new Object[][]{{0}}); @@ -200,7 +200,7 @@ public void failureOnInitialization() { } @RunWith(Parameterized.class) - static public class BadNumberOfAnnotatedFieldTest { + public static class BadNumberOfAnnotatedFieldTest { @Parameters public static Collection data() { return Arrays.asList(new Object[][]{{0, 0}}); @@ -232,7 +232,7 @@ public void numberOfFieldsAndParametersShouldMatch() { private static String fLog; @RunWith(Parameterized.class) - static public class BeforeAndAfter { + public static class BeforeAndAfter { @BeforeClass public static void before() { fLog += "before "; @@ -487,7 +487,7 @@ public void beforeParamAndAfterParamValidationNumberOfParameters() { } @RunWith(Parameterized.class) - static public class EmptyTest { + public static class EmptyTest { @BeforeClass public static void before() { fLog += "before "; @@ -506,7 +506,7 @@ public void validateClassCatchesNoParameters() { } @RunWith(Parameterized.class) - static public class IncorrectTest { + public static class IncorrectTest { @Test public int test() { return 0; @@ -525,7 +525,7 @@ public void failuresAddedForBadTestMethod() throws Exception { } @RunWith(Parameterized.class) - static public class ProtectedParametersTest { + public static class ProtectedParametersTest { @Parameters protected static Collection data() { return Collections.emptyList(); @@ -544,7 +544,7 @@ public void meaningfulFailureWhenParametersNotPublic() { } @RunWith(Parameterized.class) - static public class ParametersNotIterable { + public static class ParametersNotIterable { @Parameters public static String data() { return "foo"; @@ -563,7 +563,7 @@ public void meaningfulFailureWhenParametersAreNotAnIterable() { } @RunWith(Parameterized.class) - static public class PrivateConstructor { + public static class PrivateConstructor { private PrivateConstructor(int x) { } @@ -613,7 +613,7 @@ public void runsEveryTestOfArray() { } @RunWith(Parameterized.class) - static public class SingleArgumentTestWithArray { + public static class SingleArgumentTestWithArray { @Parameters public static Object[] data() { return new Object[] { "first test", "second test" }; @@ -634,7 +634,7 @@ public void runsForEverySingleArgumentOfArray() { } @RunWith(Parameterized.class) - static public class SingleArgumentTestWithIterable { + public static class SingleArgumentTestWithIterable { private static final AtomicBoolean dataCalled = new AtomicBoolean(false); @Parameters @@ -677,7 +677,7 @@ public void runsForEverySingleArgumentOfIterable() { } @RunWith(Parameterized.class) - static public class SingleArgumentTestWithCollection { + public static class SingleArgumentTestWithCollection { @Parameters public static Iterable data() { return Collections.unmodifiableCollection(asList("first test", "second test")); @@ -699,7 +699,7 @@ public void runsForEverySingleArgumentOfCollection() { } - static public class ExceptionThrowingRunnerFactory implements + public static class ExceptionThrowingRunnerFactory implements ParametersRunnerFactory { public Runner createRunnerForTestWithParameters(TestWithParameters test) throws InitializationError { @@ -710,7 +710,7 @@ public Runner createRunnerForTestWithParameters(TestWithParameters test) @RunWith(Parameterized.class) @UseParametersRunnerFactory(ExceptionThrowingRunnerFactory.class) - static public class TestWithUseParametersRunnerFactoryAnnotation { + public static class TestWithUseParametersRunnerFactoryAnnotation { @Parameters public static Iterable data() { return asList("single test"); @@ -739,7 +739,7 @@ private void assertTestCreatesSingleFailureWithMessage(Class test, String mes @RunWith(Parameterized.class) @UseParametersRunnerFactory(ExceptionThrowingRunnerFactory.class) - public static abstract class UseParameterizedFactoryAbstractTest { + public abstract static class UseParameterizedFactoryAbstractTest { @Parameters public static Iterable data() { return asList("single test"); diff --git a/src/test/java/org/junit/tests/running/core/CommandLineTest.java b/src/test/java/org/junit/tests/running/core/CommandLineTest.java index f72b3e916075..37f065902884 100644 --- a/src/test/java/org/junit/tests/running/core/CommandLineTest.java +++ b/src/test/java/org/junit/tests/running/core/CommandLineTest.java @@ -28,7 +28,7 @@ public void after() { System.setOut(oldOut); } - static public class Example { + public static class Example { @Test public void test() { testWasRun = true; @@ -55,7 +55,7 @@ public void runAClass() { private static int fCount; - static public class Count { + public static class Count { @Test public void increment() { fCount++; diff --git a/src/test/java/org/junit/tests/running/core/JUnitCoreReturnsCorrectExitCodeTest.java b/src/test/java/org/junit/tests/running/core/JUnitCoreReturnsCorrectExitCodeTest.java index 21e13ddb7c6f..64af301ae93e 100644 --- a/src/test/java/org/junit/tests/running/core/JUnitCoreReturnsCorrectExitCodeTest.java +++ b/src/test/java/org/junit/tests/running/core/JUnitCoreReturnsCorrectExitCodeTest.java @@ -8,7 +8,7 @@ public class JUnitCoreReturnsCorrectExitCodeTest { - static public class Fail { + public static class Fail { @Test public void kaboom() { fail(); @@ -25,7 +25,7 @@ public void missingClassCausesExitCodeOf1() throws Exception { runClass("Foo", 1); } - static public class Succeed { + public static class Succeed { @Test public void peacefulSilence() { } diff --git a/src/test/java/org/junit/tests/running/methods/AnnotationTest.java b/src/test/java/org/junit/tests/running/methods/AnnotationTest.java index 593cdb1c27a6..002517891012 100644 --- a/src/test/java/org/junit/tests/running/methods/AnnotationTest.java +++ b/src/test/java/org/junit/tests/running/methods/AnnotationTest.java @@ -34,7 +34,7 @@ public void setUp() { run = false; } - static public class SimpleTest { + public static class SimpleTest { @Test public void success() { run = true; @@ -48,7 +48,7 @@ public void testAnnotatedMethod() throws Exception { } @RunWith(JUnit4.class) - static public class SimpleTestWithFutureProofExplicitRunner { + public static class SimpleTestWithFutureProofExplicitRunner { @Test public void success() { run = true; @@ -61,7 +61,7 @@ public void testAnnotatedMethodWithFutureProofExplicitRunner() throws Exception assertTrue(run); } - static public class SetupTest { + public static class SetupTest { @Before public void before() { run = true; @@ -78,7 +78,7 @@ public void testSetup() throws Exception { assertTrue(run); } - static public class TeardownTest { + public static class TeardownTest { @After public void after() { run = true; @@ -95,7 +95,7 @@ public void testTeardown() throws Exception { assertTrue(run); } - static public class FailureTest { + public static class FailureTest { @Test public void error() throws Exception { org.junit.Assert.fail(); @@ -110,7 +110,7 @@ public void testRunFailure() throws Exception { assertEquals(AssertionError.class, result.getFailures().get(0).getException().getClass()); } - static public class SetupFailureTest { + public static class SetupFailureTest { @Before public void before() { throw new Error(); @@ -131,7 +131,7 @@ public void testSetupFailure() throws Exception { assertFalse(run); } - static public class TeardownFailureTest { + public static class TeardownFailureTest { @After public void after() { throw new Error(); @@ -150,7 +150,7 @@ public void testTeardownFailure() throws Exception { assertEquals(Error.class, runner.getFailures().get(0).getException().getClass()); } - static public class TestAndTeardownFailureTest { + public static class TestAndTeardownFailureTest { @After public void after() { throw new Error("hereAfter"); @@ -170,7 +170,7 @@ public void testTestAndTeardownFailure() throws Exception { assertThat(runner.getFailures().toString(), allOf(containsString("hereAfter"), containsString("inTest"))); } - static public class TeardownAfterFailureTest { + public static class TeardownAfterFailureTest { @After public void after() { run = true; @@ -191,7 +191,7 @@ public void testTeardownAfterFailure() throws Exception { static int count; static Collection