diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08b8a9ba7209..fd6024e4c3c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: CI +name: CI ♻️ on: push: @@ -134,3 +134,37 @@ jobs: antora \ -Pantora.downloadNode=false \ -Dscan.tag.Documentation + + sanity: + name: Sanity Check 🕊 + runs-on: ubuntu-latest + steps: + - name: Checkout Repository 📥 + uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + with: + persist-credentials: false + - name: Checkstyle ☑️ + uses: ./.github/actions/run-gradle + with: + encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + arguments: checkstyleMain + - name: Spotless ✨ + uses: ./.github/actions/run-gradle + with: + encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + arguments: spotlessCheck + - name: ArchUnit 🏛️ + uses: ./.github/actions/run-gradle + with: + encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + arguments: archUnit + - name: OSGi 🧩 + uses: ./.github/actions/run-gradle + with: + encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + arguments: verifyOSGiTask + - name: Rewrite ⚙️ + uses: ./.github/actions/run-gradle + with: + encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + arguments: rewriteDryRun -Dorg.gradle.jvmargs=-Xmx3G diff --git a/.github/workflows/sanity-check.yml b/.github/workflows/sanity-check.yml new file mode 100644 index 000000000000..3df45b3cd5c3 --- /dev/null +++ b/.github/workflows/sanity-check.yml @@ -0,0 +1,48 @@ +name: Sanity Check 🕊 +on: + push: + branches: + - main + - 'releases/**' + paths: + - '.github/**' + pull_request: + paths: + - '.github/**' +permissions: {} +jobs: + validate: + name: Validate 📊 + runs-on: ubuntu-latest + permissions: + security-events: write + steps: + - name: Checkout Repository 📥 + uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + with: + persist-credentials: false + - name: Checkstyle ☑️ + uses: ./.github/actions/run-gradle + with: + encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + arguments: checkstyleMain + - name: Spotless ✨ + uses: ./.github/actions/run-gradle + with: + encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + arguments: spotlessCheck + - name: ArchUnit 🏛️ + uses: ./.github/actions/run-gradle + with: + encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + arguments: archUnit + - name: OSGi 🧩 + uses: ./.github/actions/run-gradle + with: + encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + arguments: verifyOSGiTask + - name: Rewrite ⚙️ + uses: ./.github/actions/run-gradle + with: + encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + arguments: rewriteDryRun -Dorg.gradle.jvmargs=-Xmx3G diff --git a/documentation/src/main/java/example/domain/Person.java b/documentation/src/main/java/example/domain/Person.java index ad7d9ca52f69..36d86decd0a7 100644 --- a/documentation/src/main/java/example/domain/Person.java +++ b/documentation/src/main/java/example/domain/Person.java @@ -52,8 +52,8 @@ public LocalDate getDateOfBirth() { @Override public int hashCode() { - final int prime = 31; - int result = 1; + final var prime = 31; + var result = 1; result = prime * result + ((firstName == null) ? 0 : firstName.hashCode()); result = prime * result + ((lastName == null) ? 0 : lastName.hashCode()); return result; diff --git a/documentation/src/main/java/example/util/StringUtils.java b/documentation/src/main/java/example/util/StringUtils.java index f2443b1addb4..fad1b9b13d08 100644 --- a/documentation/src/main/java/example/util/StringUtils.java +++ b/documentation/src/main/java/example/util/StringUtils.java @@ -17,8 +17,8 @@ public class StringUtils { public static boolean isPalindrome(@Nullable String candidate) { - int length = requireNonNull(candidate).length(); - for (int i = 0; i < length / 2; i++) { + var length = requireNonNull(candidate).length(); + for (var i = 0; i < length / 2; i++) { if (candidate.charAt(i) != candidate.charAt(length - (i + 1))) { return false; } diff --git a/documentation/src/tools/java/org/junit/api/tools/ApiReportGenerator.java b/documentation/src/tools/java/org/junit/api/tools/ApiReportGenerator.java index 5aff637da94e..1760903ba63c 100644 --- a/documentation/src/tools/java/org/junit/api/tools/ApiReportGenerator.java +++ b/documentation/src/tools/java/org/junit/api/tools/ApiReportGenerator.java @@ -85,7 +85,7 @@ public static void main(String... args) { // ------------------------------------------------------------------------- private static Map parseArgs(String[] args) { - Map outputByStatus = new EnumMap<>(Status.class); + var outputByStatus = new EnumMap(Status.class); if (args.length == 0) { outputByStatus.put(Status.EXPERIMENTAL, () -> null); } @@ -107,7 +107,7 @@ private interface StreamOpener { } private static ApiReport generateReport(ScanResult scanResult) { - Map> declarations = new EnumMap<>(Status.class); + var declarations = new EnumMap>(Status.class); for (var status : Status.values()) { declarations.put(status, new ArrayList<>()); } diff --git a/gradle/config/rewrite.yml b/gradle/config/rewrite.yml new file mode 100644 index 000000000000..431c94194fec --- /dev/null +++ b/gradle/config/rewrite.yml @@ -0,0 +1,15 @@ +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.junit.openrewrite.SanityCheck +displayName: Apply all common best practices +description: Comprehensive code quality recipe combining modernization, security, and best practices. +recipeList: + - org.openrewrite.java.migrate.lang.var.UseVarForGenericsConstructors + - org.openrewrite.java.migrate.lang.var.UseVarForPrimitive + - org.openrewrite.staticanalysis.NoDoubleBraceInitialization +# - org.openrewrite.gradle.UpdateGradleWrapper +# - org.openrewrite.java.migrate.lang.var.UseVarForGenericMethodInvocations # bug +# - org.openrewrite.java.migrate.lang.var.UseVarForObject # bug +# - org.openrewrite.java.testing.junit.JupiterBestPractices +# - org.openrewrite.java.testing.junit5.CleanupAssertions +--- diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6f06005720c2..84a5ce04e7a6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -94,6 +94,7 @@ commonCustomUserData = { id = "com.gradle.common-custom-user-data-gradle-plugin" develocity = { id = "com.gradle.develocity", version = "4.2.2" } download = { id = "de.undercouch.download", version = "5.6.0" } errorProne = { id = "net.ltgt.errorprone", version = "4.3.0" } +rewrite = { id = "org.openrewrite.rewrite", version = "7.22.0" } foojayResolver = { id = "org.gradle.toolchains.foojay-resolver", version = "1.0.0" } jmh = { id = "me.champeau.jmh", version = "0.7.3" } jreleaser = { id = "org.jreleaser", version = "1.21.0" } diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts index 3e05ad907f86..a8dce6e70ec7 100644 --- a/gradle/plugins/common/build.gradle.kts +++ b/gradle/plugins/common/build.gradle.kts @@ -7,16 +7,17 @@ plugins { dependencies { implementation("junitbuild.base:dsl-extensions") - implementation(projects.buildParameters) implementation(projects.backwardCompatibility) - implementation(libs.plugins.kotlin.markerCoordinates) + implementation(projects.buildParameters) implementation(libs.plugins.bnd.markerCoordinates) implementation(libs.plugins.commonCustomUserData.markerCoordinates) implementation(libs.plugins.develocity.markerCoordinates) implementation(libs.plugins.errorProne.markerCoordinates) implementation(libs.plugins.foojayResolver.markerCoordinates) implementation(libs.plugins.jmh.markerCoordinates) + implementation(libs.plugins.kotlin.markerCoordinates) implementation(libs.plugins.nullaway.markerCoordinates) + implementation(libs.plugins.rewrite.markerCoordinates) implementation(libs.plugins.shadow.markerCoordinates) implementation(libs.plugins.spotless.markerCoordinates) } diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.checkstyle-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.checkstyle-conventions.gradle.kts index eae33aa9151a..62b9636e7caa 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.checkstyle-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.checkstyle-conventions.gradle.kts @@ -20,7 +20,3 @@ checkstyle { toolVersion = requiredVersionFromLibs("checkstyle") configDirectory = rootProject.layout.projectDirectory.dir("gradle/config/checkstyle") } - -tasks.check { - dependsOn(tasks.withType()) -} diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts index 260495b5d978..d28343a7642c 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts @@ -9,6 +9,7 @@ plugins { id("junitbuild.eclipse-conventions") id("junitbuild.jacoco-java-conventions") id("junitbuild.java-errorprone-conventions") + id("junitbuild.rewrite-conventions") } val mavenizedProjects: List by rootProject.extra diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts index 6040ad6663af..7a4ec4cb7a6b 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts @@ -99,14 +99,21 @@ val osgiVerificationClasspath = configurations.resolvable("osgiVerificationClass extendsFrom(osgiVerification.get()) } +// Make the task available for calling from outside +tasks.register("verifyOSGiTask") { + description = "Verifies OSGi metadata in the built jar" + group = "verification" + dependsOn(verify) +} + // Bnd's Resolve task is what verifies that a jar can be used in OSGi and // that its metadata is valid. If the metadata is invalid this task will // fail. -val verifyOSGi by tasks.registering(Resolve::class) { +val verify by tasks.registering(Resolve::class) { bndrun = osgiProperties.flatMap { it.destinationFile } outputBndrun = layout.buildDirectory.file("resolvedOSGiProperties.bndrun") isReportOptional = false - // By default bnd will use jars found in: + // By default, bnd will use jars found in: // 1. project.sourceSets.main.runtimeClasspath // 2. project.configurations.archives.artifacts.files // to validate the metadata. @@ -116,7 +123,3 @@ val verifyOSGi by tasks.registering(Resolve::class) { bundles(osgiVerificationClasspath) properties.empty() } - -tasks.check { - dependsOn(verifyOSGi) -} diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.rewrite-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.rewrite-conventions.gradle.kts new file mode 100644 index 000000000000..e4213a2d8466 --- /dev/null +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.rewrite-conventions.gradle.kts @@ -0,0 +1,24 @@ +plugins { + id("org.openrewrite.rewrite") +} + +dependencies { + rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.24.0") + rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.23.0") + rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.23.0") +} + +rewrite { + activeRecipe("org.junit.openrewrite.SanityCheck") + configFile = project.getRootProject().file("gradle/config/rewrite.yml") + exclusion( + // "**AssertionsTests.java", // https://github.com/openrewrite/rewrite-static-analysis/issues/799 + // legacy + "**TestCase.java", + "**TestCases.java", + "**documentation/src/test/java/example**", + "**testFixtures/java/org/junit/vintage/engine/samples**", + ) + setExportDatatables(true) + setFailOnDryRunResults(true) +} diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java index 56c707d7c489..06c891ee451c 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java @@ -195,7 +195,7 @@ private static void assertArrayEquals(boolean @Nullable [] expected, boolean @Nu } assertArraysHaveSameLength(expected.length, actual.length, indexes, messageOrSupplier); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { if (expected[i] != actual[i]) { failArraysNotEqual(expected[i], actual[i], nullSafeIndexes(indexes, i), messageOrSupplier); } @@ -217,7 +217,7 @@ private static void assertArrayEquals(char @Nullable [] expected, char @Nullable } assertArraysHaveSameLength(expected.length, actual.length, indexes, messageOrSupplier); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { if (expected[i] != actual[i]) { failArraysNotEqual(expected[i], actual[i], nullSafeIndexes(indexes, i), messageOrSupplier); } @@ -239,7 +239,7 @@ private static void assertArrayEquals(byte @Nullable [] expected, byte @Nullable } assertArraysHaveSameLength(expected.length, actual.length, indexes, messageOrSupplier); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { if (expected[i] != actual[i]) { failArraysNotEqual(expected[i], actual[i], nullSafeIndexes(indexes, i), messageOrSupplier); } @@ -261,7 +261,7 @@ private static void assertArrayEquals(short @Nullable [] expected, short @Nullab } assertArraysHaveSameLength(expected.length, actual.length, indexes, messageOrSupplier); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { if (expected[i] != actual[i]) { failArraysNotEqual(expected[i], actual[i], nullSafeIndexes(indexes, i), messageOrSupplier); } @@ -283,7 +283,7 @@ private static void assertArrayEquals(int @Nullable [] expected, int @Nullable [ } assertArraysHaveSameLength(expected.length, actual.length, indexes, messageOrSupplier); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { if (expected[i] != actual[i]) { failArraysNotEqual(expected[i], actual[i], nullSafeIndexes(indexes, i), messageOrSupplier); } @@ -305,7 +305,7 @@ private static void assertArrayEquals(long @Nullable [] expected, long @Nullable } assertArraysHaveSameLength(expected.length, actual.length, indexes, messageOrSupplier); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { if (expected[i] != actual[i]) { failArraysNotEqual(expected[i], actual[i], nullSafeIndexes(indexes, i), messageOrSupplier); } @@ -327,7 +327,7 @@ private static void assertArrayEquals(float @Nullable [] expected, float @Nullab } assertArraysHaveSameLength(expected.length, actual.length, indexes, messageOrSupplier); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { if (!AssertionUtils.floatsAreEqual(expected[i], actual[i])) { failArraysNotEqual(expected[i], actual[i], nullSafeIndexes(indexes, i), messageOrSupplier); } @@ -350,7 +350,7 @@ private static void assertArrayEquals(float @Nullable [] expected, float @Nullab } assertArraysHaveSameLength(expected.length, actual.length, indexes, messageOrSupplier); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { if (!AssertionUtils.floatsAreEqual(expected[i], actual[i], delta)) { failArraysNotEqual(expected[i], actual[i], nullSafeIndexes(indexes, i), messageOrSupplier); } @@ -372,7 +372,7 @@ private static void assertArrayEquals(double @Nullable [] expected, double @Null } assertArraysHaveSameLength(expected.length, actual.length, indexes, messageOrSupplier); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { if (!AssertionUtils.doublesAreEqual(expected[i], actual[i])) { failArraysNotEqual(expected[i], actual[i], nullSafeIndexes(indexes, i), messageOrSupplier); } @@ -395,7 +395,7 @@ private static void assertArrayEquals(double @Nullable [] expected, double @Null } assertArraysHaveSameLength(expected.length, actual.length, indexes, messageOrSupplier); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { if (!AssertionUtils.doublesAreEqual(expected[i], actual[i], delta)) { failArraysNotEqual(expected[i], actual[i], nullSafeIndexes(indexes, i), messageOrSupplier); } @@ -417,7 +417,7 @@ private static void assertArrayEquals(@Nullable Object @Nullable [] expected, @N } assertArraysHaveSameLength(expected.length, actual.length, indexes, messageOrSupplier); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { Object expectedElement = expected[i]; Object actualElement = actual[i]; diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java index 9523ecd19124..ffd6af167f4f 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java @@ -72,7 +72,7 @@ private static void assertIterableEquals(@Nullable Iterable expected, @Nullab Iterator expectedIterator = expected.iterator(); Iterator actualIterator = actual.iterator(); - int processed = 0; + var processed = 0; while (expectedIterator.hasNext() && actualIterator.hasNext()) { Object expectedElement = expectedIterator.next(); Object actualElement = actualIterator.next(); diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java index 722aaec87ee4..b759efc10a59 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java @@ -16,7 +16,6 @@ import static org.junit.platform.commons.util.Preconditions.notNull; import java.util.ArrayDeque; -import java.util.Deque; import java.util.List; import java.util.regex.PatternSyntaxException; import java.util.stream.IntStream; @@ -86,8 +85,8 @@ private record LinesMatcher(List expectedLines, List actualLines @Nullable Object messageOrSupplier) { void assertLinesMatch() { - int expectedSize = expectedLines.size(); - int actualSize = actualLines.size(); + var expectedSize = expectedLines.size(); + var actualSize = actualLines.size(); // trivial case: when expecting more than actual lines available, something is wrong if (expectedSize > actualSize) { @@ -106,12 +105,12 @@ void assertLinesMatch() { } void assertLinesMatchWithFastForward() { - Deque expectedDeque = new ArrayDeque<>(expectedLines); - Deque actualDeque = new ArrayDeque<>(actualLines); + var expectedDeque = new ArrayDeque(expectedLines); + var actualDeque = new ArrayDeque(actualLines); main: while (!expectedDeque.isEmpty()) { String expectedLine = expectedDeque.pop(); - int expectedLineNumber = expectedLines.size() - expectedDeque.size(); // 1-based line number + var expectedLineNumber = expectedLines.size() - expectedDeque.size(); // 1-based line number // trivial case: no more actual lines available if (actualDeque.isEmpty()) { fail("expected line #%d:`%s` not found - actual lines depleted", expectedLineNumber, @@ -127,8 +126,8 @@ void assertLinesMatchWithFastForward() { // fast-forward marker found in expected line: fast-forward actual line... if (isFastForwardLine(expectedLine)) { - int fastForwardLimit = parseFastForwardLimit(expectedLine); - int actualRemaining = actualDeque.size(); + var fastForwardLimit = parseFastForwardLimit(expectedLine); + var actualRemaining = actualDeque.size(); // trivial case: fast-forward marker was in last expected line if (expectedDeque.isEmpty()) { @@ -147,7 +146,7 @@ void assertLinesMatchWithFastForward() { actualRemaining); } // fast-forward now: actualDeque.pop(fastForwardLimit) - for (int i = 0; i < fastForwardLimit; i++) { + for (var i = 0; i < fastForwardLimit; i++) { actualDeque.pop(); } continue; // main @@ -167,7 +166,7 @@ void assertLinesMatchWithFastForward() { } } - int actualLineNumber = actualLines.size() - actualDeque.size() + 1; // 1-based line number + var actualLineNumber = actualLines.size() - actualDeque.size() + 1; // 1-based line number fail("expected line #%d doesn't match actual line #%d%n" + "\texpected: `%s`%n" + "\t actual: `%s`", expectedLineNumber, actualLineNumber, expectedLine, actualLine); } @@ -207,7 +206,7 @@ static int parseFastForwardLimit(String fastForwardLine) { fastForwardLine = fastForwardLine.strip(); String text = fastForwardLine.substring(2, fastForwardLine.length() - 2).strip(); try { - int limit = Integer.parseInt(text); + var limit = Integer.parseInt(text); condition(limit > 0, () -> "fast-forward(%d) limit must be greater than zero".formatted(limit)); return limit; } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java index baefebfe50b4..b970ed809ae1 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java @@ -66,8 +66,8 @@ static void assertTimeout(Duration timeout, Executable executable, Supplier<@Nul private static T assertTimeout(Duration timeout, ThrowingSupplier supplier, @Nullable Object messageOrSupplier) { - long timeoutInMillis = timeout.toMillis(); - long start = System.currentTimeMillis(); + var timeoutInMillis = timeout.toMillis(); + var start = System.currentTimeMillis(); T result; try { result = supplier.get(); @@ -76,7 +76,7 @@ static void assertTimeout(Duration timeout, Executable executable, Supplier<@Nul throw throwAsUncheckedException(ex); } - long timeElapsed = System.currentTimeMillis() - start; + var timeElapsed = System.currentTimeMillis() - start; if (timeElapsed > timeoutInMillis) { assertionFailure() // .message(messageOrSupplier) // diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java index 8b28418b3d60..5bc91626f74c 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java @@ -216,8 +216,8 @@ private void maybeTrimStackTrace(Throwable throwable) { var pruneTargetClassName = trimStackTraceTarget.getName(); var stackTrace = throwable.getStackTrace(); - int lastIndexOf = -1; - for (int i = 0; i < stackTrace.length; i++) { + var lastIndexOf = -1; + for (var i = 0; i < stackTrace.length; i++) { var element = stackTrace[i]; var className = element.getClassName(); if (className.equals(pruneTargetClassName)) { @@ -226,7 +226,7 @@ private void maybeTrimStackTrace(Throwable throwable) { } if (lastIndexOf != -1) { - int from = clamp0(lastIndexOf + 1 - retainStackTraceElements, stackTrace.length); + var from = clamp0(lastIndexOf + 1 - retainStackTraceElements, stackTrace.length); var trimmed = Arrays.copyOfRange(stackTrace, from, stackTrace.length); throwable.setStackTrace(trimmed); } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java index 4ecdb6b431f9..a0ff80c8c82b 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java @@ -221,7 +221,7 @@ public Standard() { @Override public String generateDisplayNameForClass(Class testClass) { String name = testClass.getName(); - int lastDot = name.lastIndexOf('.'); + var lastDot = name.lastIndexOf('.'); return name.substring(lastDot + 1); } @@ -414,7 +414,7 @@ private String getSentenceBeginning(Class testClass, List> enclosing // Only build prefix based on the enclosing class if the enclosing // class is also configured to use the IndicativeSentences generator. - boolean buildPrefix = findDisplayNameGeneration(enclosingClass, remainingEnclosingInstanceTypes)// + var buildPrefix = findDisplayNameGeneration(enclosingClass, remainingEnclosingInstanceTypes)// .map(DisplayNameGeneration::value)// .filter(IndicativeSentences.class::equals)// .isPresent(); diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractJreRangeCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractJreRangeCondition.java index 342d25e9a266..378cffd411e6 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractJreRangeCondition.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractJreRangeCondition.java @@ -36,10 +36,10 @@ abstract class AbstractJreRangeCondition extends BooleanEx protected final boolean isCurrentVersionWithinRange(JRE minJre, JRE maxJre, int minVersion, int maxVersion) { String annotationName = super.annotationType.getSimpleName(); - boolean minJreSet = minJre != JRE.UNDEFINED; - boolean maxJreSet = maxJre != JRE.UNDEFINED; - boolean minVersionSet = minVersion != JRE.UNDEFINED_VERSION; - boolean maxVersionSet = maxVersion != JRE.UNDEFINED_VERSION; + var minJreSet = minJre != JRE.UNDEFINED; + var maxJreSet = maxJre != JRE.UNDEFINED; + var minVersionSet = minVersion != JRE.UNDEFINED_VERSION; + var maxVersionSet = maxVersion != JRE.UNDEFINED_VERSION; // Users must choose between JRE enum constants and version numbers. Preconditions.condition(!minJreSet || !minVersionSet, diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java index 27328a81568a..e468c80ec3ee 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java @@ -30,12 +30,12 @@ class DisabledOnOsCondition extends AbstractOsBasedExecutionCondition 0; - boolean archSpecified = annotation.architectures().length > 0; + var osSpecified = annotation.value().length > 0; + var archSpecified = annotation.architectures().length > 0; Preconditions.condition(osSpecified || archSpecified, "You must declare at least one OS or architecture in @DisabledOnOs"); - boolean enabled = isEnabledBasedOnOs(annotation) || isEnabledBasedOnArchitecture(annotation); + var enabled = isEnabledBasedOnOs(annotation) || isEnabledBasedOnArchitecture(annotation); String reason = createReason(enabled, osSpecified, archSpecified); return enabled ? ConditionEvaluationResult.enabled(reason) diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java index cf9e9d6682f9..16983fd5b45b 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java @@ -30,12 +30,12 @@ class EnabledOnOsCondition extends AbstractOsBasedExecutionCondition 0; - boolean archSpecified = annotation.architectures().length > 0; + var osSpecified = annotation.value().length > 0; + var archSpecified = annotation.architectures().length > 0; Preconditions.condition(osSpecified || archSpecified, "You must declare at least one OS or architecture in @EnabledOnOs"); - boolean enabled = isEnabledBasedOnOs(annotation) && isEnabledBasedOnArchitecture(annotation); + var enabled = isEnabledBasedOnOs(annotation) && isEnabledBasedOnArchitecture(annotation); String reason = createReason(enabled, osSpecified, archSpecified); return enabled ? ConditionEvaluationResult.enabled(reason) diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java index f671e37b214d..2aff120193f0 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java @@ -97,7 +97,7 @@ private static boolean invokeMethod(Method method, ExtensionContext context, @Nu } private boolean acceptsExtensionContextOrNoArguments(Method method) { - int parameterCount = method.getParameterCount(); + var parameterCount = method.getParameterCount(); return parameterCount == 0 || (parameterCount == 1 && method.getParameterTypes()[0] == ExtensionContext.class); } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java index d77d7e589dd5..4bc47a74e40c 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java @@ -960,7 +960,7 @@ public int hashCode() { public Namespace append(Object... parts) { Preconditions.notEmpty(parts, "parts array must not be null or empty"); Preconditions.containsNoNullElements(parts, "individual parts must not be null"); - ArrayList newParts = new ArrayList<>(this.parts.size() + parts.length); + var newParts = new ArrayList(this.parts.size() + parts.length); newParts.addAll(this.parts); Collections.addAll(newParts, parts); return new Namespace(newParts); diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java index 2cb6654cfeec..4aef4c915db2 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.List; import java.util.Optional; import java.util.function.Consumer; @@ -109,7 +108,7 @@ public interface TestInstancePreDestroyCallback extends Extension { */ @API(status = STABLE, since = "5.10") static void preDestroyTestInstances(ExtensionContext context, Consumer callback) { - List destroyedInstances = new ArrayList<>(context.getRequiredTestInstances().getAllInstances()); + var destroyedInstances = new ArrayList(context.getRequiredTestInstances().getAllInstances()); for (Optional current = context.getParent(); current.isPresent(); current = current.get().getParent()) { current.get().getTestInstances().map(TestInstances::getAllInstances).ifPresent( destroyedInstances::removeAll); diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/timeout/PreemptiveTimeoutUtils.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/timeout/PreemptiveTimeoutUtils.java index b07144ce3d05..68d4c36f385f 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/timeout/PreemptiveTimeoutUtils.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/timeout/PreemptiveTimeoutUtils.java @@ -61,7 +61,7 @@ public class PreemptiveTimeoutUtils { ThrowingSupplier supplier, @Nullable Supplier<@Nullable String> messageSupplier, TimeoutFailureFactory failureFactory) throws E { - AtomicReference threadReference = new AtomicReference<>(); + var threadReference = new AtomicReference(); ExecutorService executorService = Executors.newSingleThreadExecutor(new TimeoutThreadFactory()); try { diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultTimeZoneExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultTimeZoneExtension.java index ca511918b9ba..d68e83080390 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultTimeZoneExtension.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultTimeZoneExtension.java @@ -67,8 +67,8 @@ private static TimeZone createTimeZone(DefaultTimeZone annotation) { } private static void validateCorrectConfiguration(DefaultTimeZone annotation) { - boolean noValue = annotation.value().isEmpty(); - boolean noProvider = annotation.timeZoneProvider() == NullTimeZoneProvider.class; + var noValue = annotation.value().isEmpty(); + var noProvider = annotation.timeZoneProvider() == NullTimeZoneProvider.class; if (noValue == noProvider) { throw new ExtensionConfigurationException( "Either a valid time zone id or a TimeZoneProvider must be provided to " diff --git a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/AssertionTestUtils.java b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/AssertionTestUtils.java index 1bbfb6f7d59d..67166ee18b9e 100644 --- a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/AssertionTestUtils.java +++ b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/AssertionTestUtils.java @@ -122,7 +122,7 @@ public static void assertExpectedExceptionTypes(MultipleFailuresError multipleFa Throwable[] suppressed = multipleFailuresError.getSuppressed(); assertEquals(exceptionTypes.length, suppressed.length, "number of suppressed exceptions"); - for (int i = 0; i < exceptionTypes.length; i++) { + for (var i = 0; i < exceptionTypes.length; i++) { assertEquals(exceptionTypes[i], failures.get(i).getClass(), "exception type [" + i + "]"); assertEquals(exceptionTypes[i], suppressed[i].getClass(), "suppressed exception type [" + i + "]"); } diff --git a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java index 1e0b84a946f3..94d3e811d278 100644 --- a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java +++ b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java @@ -60,8 +60,8 @@ public void afterEach(ExtensionContext context) { @Override public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { - boolean isTestMethodLevel = extensionContext.getTestMethod().isPresent(); - boolean isListener = parameterContext.getParameter().getType() == LogRecordListener.class; + var isTestMethodLevel = extensionContext.getTestMethod().isPresent(); + var isListener = parameterContext.getParameter().getType() == LogRecordListener.class; return isTestMethodLevel && isListener; } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java index 5aacb02d1af2..fd2d0f798d4d 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java @@ -510,7 +510,7 @@ private void registerBeforeEachMethodAdapters(ExtensionRegistrar registrar) { private void registerAfterEachMethodAdapters(ExtensionRegistrar registrar) { // Make a local copy since findAfterEachMethods() returns an immutable list. - List afterEachMethods = new ArrayList<>(requireLifecycleMethods().afterEach); + var afterEachMethods = new ArrayList(requireLifecycleMethods().afterEach); // Since the bottom-up ordering of afterEachMethods will later be reversed when the // synthesized AfterEachMethodAdapters are executed within TestMethodTestDescriptor, @@ -589,7 +589,7 @@ private static class LifecycleMethods { LifecycleMethods(ClassInfo classInfo) { Class testClass = classInfo.testClass; - boolean requireStatic = classInfo.lifecycle == Lifecycle.PER_METHOD; + var requireStatic = classInfo.lifecycle == Lifecycle.PER_METHOD; DiscoveryIssueReporter issueReporter = DiscoveryIssueReporter.collecting(discoveryIssues); this.beforeAll = findBeforeAllMethods(testClass, requireStatic, issueReporter); this.afterAll = findAfterAllMethods(testClass, requireStatic, issueReporter); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTemplateTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTemplateTestDescriptor.java index dfabcb222079..a9404b466bac 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTemplateTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTemplateTestDescriptor.java @@ -85,7 +85,7 @@ protected void validateCoreLifecycleMethods(DiscoveryIssueReporter reporter) { @Override protected void validateClassTemplateInvocationLifecycleMethods(DiscoveryIssueReporter reporter) { - boolean requireStatic = this.classInfo.lifecycle == PER_METHOD; + var requireStatic = this.classInfo.lifecycle == PER_METHOD; validateClassTemplateInvocationLifecycleMethodsAreDeclaredCorrectly(getTestClass(), requireStatic, reporter); } @@ -134,7 +134,7 @@ public void prune() { // Second iteration to avoid processing children that were pruned in the first iteration this.children.forEach(child -> { if (child instanceof ClassTemplateInvocationTestDescriptor descriptor) { - int index = descriptor.getIndex(); + var index = descriptor.getIndex(); this.dynamicDescendantFilter.allowIndex(index - 1); this.childrenPrototypesByIndex.put(index, child.getChildren()); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java index 94bd50b986c5..ad75f75419a5 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java @@ -95,7 +95,7 @@ static void registerExtensionsFromStaticFields(ExtensionRegistrar registrar, Cla .forEach(field -> { List> extensionTypes = streamDeclarativeExtensionTypes(field).collect( toList()); - boolean isExtendWithPresent = !extensionTypes.isEmpty(); + var isExtendWithPresent = !extensionTypes.isEmpty(); if (isExtendWithPresent) { extensionTypes.forEach(registrar::registerExtension); @@ -124,7 +124,7 @@ static void registerExtensionsFromInstanceFields(ExtensionRegistrar registrar, C .forEach(field -> { List> extensionTypes = streamDeclarativeExtensionTypes(field).collect( toList()); - boolean isExtendWithPresent = !extensionTypes.isEmpty(); + var isExtendWithPresent = !extensionTypes.isEmpty(); if (isExtendWithPresent) { extensionTypes.forEach(registrar::registerExtension); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java index 512741d22558..56d601633c09 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java @@ -80,11 +80,11 @@ public abstract class JupiterTestDescriptor extends AbstractTestDescriptor static Set getTags(AnnotatedElement element, Supplier elementDescription, Supplier sourceProvider, Consumer issueCollector) { - AtomicReference<@Nullable TestSource> source = new AtomicReference<>(); + var source = new AtomicReference<@Nullable TestSource>(); return findRepeatableAnnotations(element, Tag.class).stream() // .map(Tag::value) // .filter(tag -> { - boolean isValid = TestTag.isValid(tag); + var isValid = TestTag.isValid(tag); if (!isValid) { String message = "Invalid tag syntax in @Tag(\"%s\") declaration on %s. Tag will be ignored.".formatted( tag, elementDescription.get()); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java index ae07732fdf70..d65349298669 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java @@ -81,7 +81,7 @@ public final Method getTestMethod() { @Override public final Set getTags() { // return modifiable copy - Set allTags = new LinkedHashSet<>(this.methodInfo.tags); + var allTags = new LinkedHashSet(this.methodInfo.tags); getParent().ifPresent(parentDescriptor -> allTags.addAll(parentDescriptor.getTags())); return allTags; } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java index 6680c28f6b94..832de7e2668a 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java @@ -74,7 +74,7 @@ protected NestedClassTestDescriptor withUniqueId(UnaryOperator uniqueI @Override public final Set getTags() { // return modifiable copy - Set allTags = new LinkedHashSet<>(this.classInfo.tags); + var allTags = new LinkedHashSet(this.classInfo.tags); getParent().ifPresent(parentDescriptor -> allTags.addAll(parentDescriptor.getTags())); return allTags; } @@ -89,7 +89,7 @@ public List> getEnclosingTestClasses() { @API(status = INTERNAL, since = "5.12") public static List> getEnclosingTestClasses(@Nullable TestDescriptor parent) { if (parent instanceof TestClassAware testClassAwareParent) { - List> result = new ArrayList<>(testClassAwareParent.getEnclosingTestClasses()); + var result = new ArrayList>(testClassAwareParent.getEnclosingTestClasses()); result.add(testClassAwareParent.getTestClass()); return List.copyOf(result); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ResourceLockAware.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ResourceLockAware.java index d7d5a85e6cbf..91ae5063912f 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ResourceLockAware.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ResourceLockAware.java @@ -13,7 +13,6 @@ import static org.junit.jupiter.api.parallel.ResourceLockTarget.CHILDREN; import java.util.ArrayDeque; -import java.util.Deque; import java.util.List; import java.util.Set; import java.util.function.BiFunction; @@ -33,7 +32,7 @@ interface ResourceLockAware extends TestDescriptor { default Stream determineExclusiveResources() { - Deque ancestors = new ArrayDeque<>(); + var ancestors = new ArrayDeque(); TestDescriptor parent = this.getParent().orElse(null); while (parent instanceof ResourceLockAware resourceLockAwareParent) { ancestors.addFirst(resourceLockAwareParent); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TemplateExecutor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TemplateExecutor.java index acb006eb0370..b765a48cd207 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TemplateExecutor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TemplateExecutor.java @@ -50,7 +50,7 @@ void execute(JupiterEngineExecutionContext context, Node.DynamicTestExecutor dyn private void executeForProvider(P provider, AtomicInteger invocationIndex, Node.DynamicTestExecutor dynamicTestExecutor, ExtensionContext extensionContext) { - int initialValue = invocationIndex.get(); + var initialValue = invocationIndex.get(); Stream stream = provideContexts(provider, extensionContext); try { diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java index 5ad248efa279..9edff0ed35ff 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java @@ -116,7 +116,7 @@ protected void invokeTestMethod(JupiterEngineExecutionContext context, DynamicTe TestSource defaultTestSource = getSource().orElseThrow( () -> new JUnitException("Illegal state: TestSource must be present")); try (Stream dynamicNodeStream = toDynamicNodeStream(testFactoryMethodResult)) { - int index = 1; + var index = 1; Iterator iterator = dynamicNodeStream.iterator(); while (iterator.hasNext()) { DynamicNode dynamicNode = iterator.next(); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java index 5f1ba08f8c16..45c46eba8300 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java @@ -166,12 +166,12 @@ private boolean canOrderWrappers() { } private void orderWrappers(PARENT parentTestDescriptor, List wrappers, Consumer errorHandler) { - List orderedWrappers = new ArrayList<>(wrappers); + var orderedWrappers = new ArrayList(wrappers); requireNonNull(this.orderingAction).order(parentTestDescriptor, orderedWrappers); Map distinctWrappersToIndex = distinctWrappersToIndex(orderedWrappers); - int difference = orderedWrappers.size() - wrappers.size(); - int distinctDifference = distinctWrappersToIndex.size() - wrappers.size(); + var difference = orderedWrappers.size() - wrappers.size(); + var distinctDifference = distinctWrappersToIndex.size() - wrappers.size(); if (difference > 0) { // difference >= distinctDifference reportDescriptorsAddedWarning(difference, errorHandler, parentTestDescriptor); } @@ -183,8 +183,8 @@ private void orderWrappers(PARENT parentTestDescriptor, List wrappers, } private Map distinctWrappersToIndex(List wrappers) { - Map toIndex = new HashMap<>(); - for (int i = 0; i < wrappers.size(); i++) { + var toIndex = new HashMap(); + for (var i = 0; i < wrappers.size(); i++) { // Avoid ClassCastException if a misbehaving ordering action added a non-WRAPPER Object wrapper = wrappers.get(i); if (!toIndex.containsKey(wrapper)) { diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java index 2f64d22a7af2..04d35c7e30bd 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java @@ -152,7 +152,7 @@ public Resolution resolve(UniqueIdSelector selector, Context context) { case ClassTemplateInvocationTestDescriptor.SEGMENT_TYPE -> { Optional testDescriptor = context.addToParent( () -> selectUniqueId(uniqueId.removeLastSegment()), parent -> { - int index = Integer.parseInt(lastSegment.getValue().substring(1)); + var index = Integer.parseInt(lastSegment.getValue().substring(1)); return Optional.of(newDummyClassTemplateInvocationTestDescriptor(parent, index)); }); yield toInvocationMatch(testDescriptor) // @@ -286,7 +286,7 @@ private Supplier> expansionCallback(ClassBasedT } private static List> getTestClasses(TestClassAware testDescriptor) { - List> testClasses = new ArrayList<>(testDescriptor.getEnclosingTestClasses()); + var testClasses = new ArrayList>(testDescriptor.getEnclosingTestClasses()); testClasses.add(testDescriptor.getTestClass()); return testClasses; } @@ -318,7 +318,7 @@ private DiscoverySelector selectClass(List> classes) { if (classes.size() == 1) { return DiscoverySelectors.selectClass(classes.get(0)); } - int lastIndex = classes.size() - 1; + var lastIndex = classes.size() - 1; return DiscoverySelectors.selectNestedClass(classes.subList(0, lastIndex), classes.get(lastIndex)); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java index 07dbb1b3d068..34aac4a5a1ba 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java @@ -90,7 +90,7 @@ public Resolution resolve(DiscoverySelector selector, Context context) { if (testClasses.size() == 1) { return resolve(context, emptyList(), testClasses.get(0), methodSelector::method, Match::exact); } - int lastIndex = testClasses.size() - 1; + var lastIndex = testClasses.size() - 1; return resolve(context, testClasses.subList(0, lastIndex), testClasses.get(lastIndex), methodSelector::method, Match::exact); } @@ -132,7 +132,7 @@ public Resolution resolve(UniqueIdSelector selector, Context context) { .map(methodType -> methodType.resolveUniqueIdIntoTestDescriptor(uniqueId, context, configuration)) .flatMap(Optional::stream) .map(testDescriptor -> { - boolean exactMatch = uniqueId.equals(testDescriptor.getUniqueId()); + var exactMatch = uniqueId.equals(testDescriptor.getUniqueId()); if (testDescriptor instanceof Filterable filterable) { if (exactMatch) { filterable.getDynamicDescendantFilter().allowAll(); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java index da3bb569f5d8..7fc772f7e8bb 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java @@ -62,7 +62,7 @@ private static boolean isCompatible(Method method, DiscoveryIssueReporter issueR issueReporter.reportIssue(createTooGenericReturnTypeIssue(method)); return true; } - boolean validContainerType = !returnType.isArray() && isConvertibleToStream(returnType); + var validContainerType = !returnType.isArray() && isConvertibleToStream(returnType); return validContainerType && isCompatibleContainerType(method, issueReporter); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/TestClassPredicates.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/TestClassPredicates.java index f44347380446..4442ff4c6144 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/TestClassPredicates.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/TestClassPredicates.java @@ -90,8 +90,8 @@ public boolean isValidNestedTestClass(Class candidate) { } public @Nullable NestedClassInvalidityReason validateNestedTestClass(Class candidate) { - boolean isInner = this.isInnerNestedClass.check(candidate); - boolean isNotPrivateUnlessAbstract = this.isNotPrivateUnlessAbstractNestedClass.check(candidate); + var isInner = this.isInnerNestedClass.check(candidate); + var isNotPrivateUnlessAbstract = this.isNotPrivateUnlessAbstractNestedClass.check(candidate); if (isNotPrivateUnlessAbstract && isNotAbstract(candidate)) { return isInner ? null : NestedClassInvalidityReason.NOT_INNER; } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java index 1561bb762926..1a8e5cd52e7c 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java @@ -30,7 +30,7 @@ public static DefaultTestInstances of(Object instance) { } public static DefaultTestInstances of(TestInstances testInstances, Object instance) { - List allInstances = new ArrayList<>(testInstances.getAllInstances()); + var allInstances = new ArrayList(testInstances.getAllInstances()); allInstances.add(instance); return new DefaultTestInstances(Collections.unmodifiableList(allInstances)); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java index 27a0b5fc2f60..bf2511781d0c 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java @@ -62,7 +62,7 @@ public T invoke(Constructor constructor, Optional outerInstance, @Nullable Object[] arguments = resolveParameters(constructor, Optional.empty(), outerInstance, extensionContext, extensionRegistry); - ConstructorInvocation invocation = new ConstructorInvocation<>(constructor, arguments); + var invocation = new ConstructorInvocation(constructor, arguments); return invoke(invocation, invocation, extensionContext, extensionRegistry, interceptorCall); } @@ -94,7 +94,7 @@ public void invokeVoid(Method method, @Nullable Object target, ExtensionContext : Optional.ofNullable(target)); @Nullable Object[] arguments = resolveParameters(method, optionalTarget, extensionContext, extensionRegistry); - MethodInvocation invocation = new MethodInvocation<>(method, optionalTarget, arguments); + var invocation = new MethodInvocation(method, optionalTarget, arguments); return invoke(invocation, invocation, extensionContext, extensionRegistry, interceptorCall); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java index 52a7fb65e12a..f3a02f9538aa 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java @@ -42,7 +42,7 @@ public class InvocationInterceptorChain { private T chainAndInvoke(Invocation invocation, InterceptorCall call, List interceptors) { - ValidatingInvocation validatingInvocation = new ValidatingInvocation<>(invocation, interceptors); + var validatingInvocation = new ValidatingInvocation(invocation, interceptors); Invocation chainedInvocation = chainInterceptors(validatingInvocation, call, interceptors); T result = proceed(chainedInvocation); validatingInvocation.verifyInvokedAtLeastOnce(); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java index 79f1bc8b6c77..b559275b3d15 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java @@ -107,7 +107,7 @@ public class ParameterResolutionUtils { @Nullable Object[] values = new Object[parameters.length]; - int start = 0; + var start = 0; // Ensure that the outer instance is resolved as the first parameter if // the executable is a constructor for an inner class. @@ -117,7 +117,7 @@ public class ParameterResolutionUtils { } // Resolve remaining parameters dynamically - for (int i = start; i < parameters.length; i++) { + for (var i = start; i < parameters.length; i++) { ParameterContext parameterContext = new DefaultParameterContext(parameters[i], i, target); values[i] = resolveParameter(parameterContext, executable, extensionContext, extensionRegistry); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java index e5037f938262..a91647fe25f9 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java @@ -104,7 +104,7 @@ private static void registerAutoDetectedExtensions(MutableExtensionRegistry exte ServiceLoader serviceLoader = ServiceLoader.load(Extension.class, ClassLoaderUtils.getDefaultClassLoader()); ServiceLoaderUtils.filter(serviceLoader, clazz -> { - boolean included = filter.test(clazz); + var included = filter.test(clazz); if (!included) { excludedExtensions.add(clazz); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java index 8ca5f9509a3a..d97aa4711e75 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java @@ -41,9 +41,9 @@ public Stream provideTestTemplateInvocationContex Method testMethod = context.getRequiredTestMethod(); String displayName = context.getDisplayName(); RepeatedTest repeatedTest = findAnnotation(testMethod, RepeatedTest.class).get(); - int totalRepetitions = totalRepetitions(repeatedTest, testMethod); + var totalRepetitions = totalRepetitions(repeatedTest, testMethod); AtomicInteger failureCount = new AtomicInteger(); - int failureThreshold = failureThreshold(repeatedTest, testMethod); + var failureThreshold = failureThreshold(repeatedTest, testMethod); RepeatedTestDisplayNameFormatter formatter = displayNameFormatter(repeatedTest, testMethod, displayName); // @formatter:off @@ -55,7 +55,7 @@ public Stream provideTestTemplateInvocationContex } private int totalRepetitions(RepeatedTest repeatedTest, Method method) { - int repetitions = repeatedTest.value(); + var repetitions = repeatedTest.value(); Preconditions.condition(repetitions > 0, () -> "Configuration error: @RepeatedTest on method [%s] must be declared with a positive 'value'.".formatted( method)); @@ -63,9 +63,9 @@ private int totalRepetitions(RepeatedTest repeatedTest, Method method) { } private int failureThreshold(RepeatedTest repeatedTest, Method method) { - int failureThreshold = repeatedTest.failureThreshold(); + var failureThreshold = repeatedTest.failureThreshold(); if (failureThreshold != Integer.MAX_VALUE) { - int repetitions = repeatedTest.value(); + var repetitions = repeatedTest.value(); Preconditions.condition((failureThreshold > 0) && (failureThreshold < repetitions), () -> """ Configuration error: @RepeatedTest on method [%s] must declare a \ diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionExtension.java index 388c8fa33840..417c4af0867b 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionExtension.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionExtension.java @@ -68,7 +68,7 @@ public void testFailed(ExtensionContext context, @Nullable Throwable cause) { @Override public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { - int failureThreshold = this.repetitionInfo.getFailureThreshold(); + var failureThreshold = this.repetitionInfo.getFailureThreshold(); if (this.repetitionInfo.getFailureCount() >= failureThreshold) { return disabled("Failure threshold [" + failureThreshold + "] exceeded"); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocation.java index c1df07a23e43..fbad44b78d1a 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocation.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocation.java @@ -55,7 +55,7 @@ public T proceed() throws Throwable { failure = t; } finally { - boolean cancelled = future.cancel(false); + var cancelled = future.cancel(false); if (!cancelled) { future.get(); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java index 7c55d1f51599..44eb1448f526 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java @@ -41,7 +41,6 @@ import java.nio.file.attribute.DosFileAttributeView; import java.util.Collections; import java.util.HashSet; -import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; import java.util.function.Predicate; @@ -359,7 +358,7 @@ private static String descriptionFor(AnnotatedElement annotatedElement) { * @since 5.12 */ private static String descriptionFor(Executable executable) { - boolean isConstructor = executable instanceof Constructor; + var isConstructor = executable instanceof Constructor; String type = isConstructor ? "constructor" : "method"; String name = isConstructor ? executable.getDeclaringClass().getSimpleName() : executable.getName(); return "%s %s(%s)".formatted(type, name, @@ -374,8 +373,8 @@ private SortedMap deleteAllFilesAndDirectories(FileOperations return Collections.emptySortedMap(); } - SortedMap failures = new TreeMap<>(); - Set retriedPaths = new HashSet<>(); + var failures = new TreeMap(); + var retriedPaths = new HashSet(); Path rootRealPath = rootDir.toRealPath(); tryToResetPermissions(rootDir); @@ -461,7 +460,7 @@ private void delete(Path path) { } private void resetPermissionsAndTryToDeleteAgain(Path path, IOException exception) { - boolean notYetRetried = retriedPaths.add(path); + var notYetRetried = retriedPaths.add(path); if (notYetRetried) { try { tryToResetPermissions(path); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java index cba8abbc873e..80b8b96776d7 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java @@ -49,7 +49,7 @@ class TimeoutDurationParser { TimeoutDuration parse(CharSequence text) throws DateTimeParseException { Matcher matcher = PATTERN.matcher(text); if (matcher.matches()) { - long value = Long.parseLong(matcher.group(1)); + var value = Long.parseLong(matcher.group(1)); String unitAbbreviation = matcher.group(2); TimeUnit unit = unitAbbreviation == null ? SECONDS : requireNonNull(UNITS_BY_ABBREVIATION.get(unitAbbreviation.toLowerCase(Locale.ENGLISH))); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java index 3a7aba81c43c..2a24fcc13294 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java @@ -67,7 +67,7 @@ ScheduledExecutorService get() { @Override public void close() throws Exception { executor.shutdown(); - boolean terminated = executor.awaitTermination(5, TimeUnit.SECONDS); + var terminated = executor.awaitTermination(5, TimeUnit.SECONDS); if (!terminated) { executor.shutdownNow(); throw new JUnitException("Scheduled executor could not be stopped in an orderly manner"); diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java index e909745b4f41..1e94fe718ec1 100644 --- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java +++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java @@ -61,7 +61,7 @@ public void handleTestExecutionException(ExtensionContext context, Throwable thr @Override public void afterEach(ExtensionContext context) throws Exception { - boolean handled = getStore(context).computeIfAbsent(EXCEPTION_WAS_HANDLED, key -> false, Boolean.class); + var handled = getStore(context).computeIfAbsent(EXCEPTION_WAS_HANDLED, key -> false, Boolean.class); if (!handled) { this.support.afterEach(context); } diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java index 0b4c286c1e62..26a0a3dc3e2b 100644 --- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java +++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java @@ -60,7 +60,7 @@ class TestRuleSupport implements BeforeEachCallback, TestExecutionExceptionHandl */ @SuppressWarnings("JavadocReference") private List findRuleAnnotatedMembers(Object testInstance) { - List result = new ArrayList<>(); + var result = new ArrayList(); // @formatter:off // Instantiate rules from methods by calling them findAnnotatedMethods(testInstance).stream() @@ -96,7 +96,7 @@ public void beforeEach(ExtensionContext context) { @Override public void handleTestExecutionException(ExtensionContext context, Throwable throwable) throws Throwable { - int numRuleAnnotatedMembers = invokeAppropriateMethodOnRuleAnnotatedMembers(context, true, + var numRuleAnnotatedMembers = invokeAppropriateMethodOnRuleAnnotatedMembers(context, true, advice -> advice.handleTestExecutionException(throwable)); // If no appropriate @Rule annotated members were discovered, we then diff --git a/junit-jupiter-params/src/jmh/java/org/junit/jupiter/params/ParameterizedInvocationNameFormatterBenchmarks.java b/junit-jupiter-params/src/jmh/java/org/junit/jupiter/params/ParameterizedInvocationNameFormatterBenchmarks.java index 069caa616320..df80723130b6 100644 --- a/junit-jupiter-params/src/jmh/java/org/junit/jupiter/params/ParameterizedInvocationNameFormatterBenchmarks.java +++ b/junit-jupiter-params/src/jmh/java/org/junit/jupiter/params/ParameterizedInvocationNameFormatterBenchmarks.java @@ -54,7 +54,7 @@ public void formatTestNames(Blackhole blackhole) throws Exception { new ParameterizedTestContext(TestCase.class, method, requireNonNull(method.getAnnotation(ParameterizedTest.class))), 512); - for (int i = 0; i < argumentsList.size(); i++) { + for (var i = 0; i < argumentsList.size(); i++) { Arguments arguments = argumentsList.get(i); blackhole.consume(formatter.format(i, EvaluatedArgumentSet.allOf(arguments), false)); } diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ArgumentCountValidator.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ArgumentCountValidator.java index cbb1330f53a9..cacd19dda863 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ArgumentCountValidator.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ArgumentCountValidator.java @@ -43,9 +43,9 @@ void validate(ExtensionContext extensionContext) { case DEFAULT, NONE -> { } case STRICT -> { - int consumedCount = this.declarationContext.getResolverFacade().determineConsumedArgumentCount( + var consumedCount = this.declarationContext.getResolverFacade().determineConsumedArgumentCount( this.arguments); - int totalCount = this.arguments.getTotalLength(); + var totalCount = this.arguments.getTotalLength(); Preconditions.condition(consumedCount == totalCount, () -> wrongNumberOfArgumentsMessages("consumes", consumedCount, null, null)); } @@ -66,7 +66,7 @@ private void validateRequiredArgumentsArePresent() { private String wrongNumberOfArgumentsMessages(String verb, int actualCount, @Nullable String parameterAdjective, @Nullable String reason) { - int totalCount = this.arguments.getTotalLength(); + var totalCount = this.arguments.getTotalLength(); return "Configuration error: @%s %s %s %s%s%s but there %s %s %s provided.%nNote: the provided arguments were %s".formatted( this.declarationContext.getAnnotationName(), verb, actualCount, parameterAdjective == null ? "" : parameterAdjective + " ", diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedInvocationNameFormatter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedInvocationNameFormatter.java index 6ada5d73d774..8c98a79cbf6c 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedInvocationNameFormatter.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedInvocationNameFormatter.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; @@ -72,7 +71,7 @@ static ParameterizedInvocationNameFormatter create(ExtensionContext extensionCon declarationContext.getAnnotationName(), declarationContext.getResolverFacade().getIndexedParameterDeclarations().getSourceElementDescription())); - int argumentMaxLength = extensionContext.getConfigurationParameter(ARGUMENT_MAX_LENGTH_KEY, Integer::parseInt) // + var argumentMaxLength = extensionContext.getConfigurationParameter(ARGUMENT_MAX_LENGTH_KEY, Integer::parseInt) // .orElse(512); return new ParameterizedInvocationNameFormatter(pattern, extensionContext.getDisplayName(), declarationContext, @@ -118,7 +117,7 @@ private String formatSafely(int invocationIndex, EvaluatedArgumentSet arguments, private PartialFormatter[] parse(String pattern, String displayName, ParameterizedDeclarationContext declarationContext, int argumentMaxLength) { - List result = new ArrayList<>(); + var result = new ArrayList(); PartialFormatters formatters = createPartialFormatters(displayName, declarationContext, argumentMaxLength); String unparsedSegment = pattern; @@ -145,7 +144,7 @@ private PartialFormatter[] parse(String pattern, String displayName, } PlaceholderPosition minimum = null; for (String placeholder : formatters.placeholders()) { - int index = segment.indexOf(placeholder); + var index = segment.indexOf(placeholder); if (index >= 0) { if (index < formatters.minimumPlaceholderLength) { return new PlaceholderPosition(index, placeholder); @@ -194,7 +193,7 @@ private static String argumentsPattern(int length) { return argumentsPatternCache.computeIfAbsent(length, // key -> { StringJoiner sj = new StringJoiner(", "); - for (int i = 0; i < length; i++) { + for (var i = 0; i < length; i++) { sj.add("{" + i + "}"); } return sj.toString(); @@ -266,7 +265,7 @@ public synchronized void append(ArgumentsContext context, StringBuffer result) { Format[] formats = messageFormat.getFormatsByArgumentIndex(); @Nullable Object[] result = Arrays.copyOf(arguments, Math.min(arguments.length, formats.length), Object[].class); - for (int i = 0; i < result.length; i++) { + for (var i = 0; i < result.length; i++) { if (formats[i] == null) { Object argument = arguments[i]; String prefix = ""; @@ -342,7 +341,7 @@ private static class PartialFormatters { void put(String placeholder, PartialFormatter formatter) { formattersByPlaceholder.put(placeholder, formatter); - int newPlaceholderLength = placeholder.length(); + var newPlaceholderLength = placeholder.length(); if (newPlaceholderLength < minimumPlaceholderLength) { minimumPlaceholderLength = newPlaceholderLength; } diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/QuoteUtils.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/QuoteUtils.java index 474bd333b188..5ef3d5cb774b 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/QuoteUtils.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/QuoteUtils.java @@ -27,7 +27,7 @@ public static String quote(CharSequence text) { } StringBuilder builder = new StringBuilder(); builder.append('"'); - for (int i = 0; i < text.length(); i++) { + for (var i = 0; i < text.length(); i++) { builder.append(escape(text.charAt(i), true)); } builder.append('"'); diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ResolverFacade.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ResolverFacade.java index 1eb0c2d721f3..3eabff7f7d04 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ResolverFacade.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ResolverFacade.java @@ -70,13 +70,13 @@ class ResolverFacade { static ResolverFacade create(Class clazz, List fields) { Preconditions.notEmpty(fields, "Fields must not be empty"); - NavigableMap> allIndexedParameters = new TreeMap<>(); - Set aggregatorParameters = new LinkedHashSet<>(); + var allIndexedParameters = new TreeMap>(); + var aggregatorParameters = new LinkedHashSet(); for (Field field : fields) { Parameter annotation = findAnnotation(field, Parameter.class) // .orElseThrow(() -> new JUnitException("No @Parameter annotation present")); - int index = annotation.value(); + var index = annotation.value(); FieldParameterDeclaration declaration = new FieldParameterDeclaration(field, annotation.value()); if (declaration.isAggregator()) { @@ -135,9 +135,9 @@ private static ResolverFacade create(Executable executable, Annotation annotatio private static ResolverFacade create(Executable executable, Annotation annotation, int indexOffset, java.lang.reflect.Parameter[] parameters) { - NavigableMap indexedParameters = new TreeMap<>(); - NavigableMap aggregatorParameters = new TreeMap<>(); - for (int index = indexOffset; index < parameters.length; index++) { + var indexedParameters = new TreeMap(); + var aggregatorParameters = new TreeMap(); + for (var index = indexOffset; index < parameters.length; index++) { ExecutableParameterDeclaration declaration = new ExecutableParameterDeclaration(parameters[index], index, indexOffset); if (declaration.isAggregator()) { @@ -187,7 +187,7 @@ RequiredParameterCount getRequiredParameterCount() { } boolean isSupportedParameter(ParameterContext parameterContext, EvaluatedArgumentSet arguments) { - int index = toLogicalIndex(parameterContext); + var index = toLogicalIndex(parameterContext); if (this.indexedParameterDeclarations.get(index).isPresent()) { return index < arguments.getConsumedLength(); } @@ -242,7 +242,7 @@ ArgumentSetLifecycleMethod.ParameterResolver createLifecycleMethodParameterResol ResolverFacade originalResolverFacade = this; ResolverFacade lifecycleMethodResolverFacade = create(method, annotation); - Map parameterDeclarationMapping = new HashMap<>(); + var parameterDeclarationMapping = new HashMap(); List errors = validateLifecycleMethodParameters(originalResolverFacade, lifecycleMethodResolverFacade, parameterDeclarationMapping); @@ -264,7 +264,7 @@ ArgumentSetLifecycleMethod.ParameterResolver createLifecycleMethodParameterResol Object resolve(ParameterContext parameterContext, ExtensionContext extensionContext, EvaluatedArgumentSet arguments, int invocationIndex, ResolutionCache resolutionCache) { - int parameterIndex = toLogicalIndex(parameterContext); + var parameterIndex = toLogicalIndex(parameterContext); ResolvableParameterDeclaration declaration = findDeclaration(parameterIndex) // .orElseThrow( () -> new ParameterResolutionException("Parameter index out of bounds: " + parameterIndex)); @@ -328,7 +328,7 @@ private Resolver getResolver(ExtensionContext extensionContext, ResolvableParame } private int toLogicalIndex(ParameterContext parameterContext) { - int index = parameterContext.getIndex() - this.parameterIndexOffset; + var index = parameterContext.getIndex() - this.parameterIndexOffset; Preconditions.condition(index >= 0, () -> "Parameter index must be greater than or equal to zero"); return index; } @@ -337,7 +337,7 @@ private static NavigableMap validateFieldDec NavigableMap> indexedParameters, Set aggregatorParameters) { - List errors = new ArrayList<>(); + var errors = new ArrayList(); validateIndexedParameters(indexedParameters, errors); validateAggregatorParameters(aggregatorParameters, errors); @@ -349,8 +349,8 @@ private static List validateLifecycleMethodParameters(ResolverFacade ori ResolverFacade lifecycleMethodResolverFacade, Map parameterDeclarationMapping) { List actualDeclarations = lifecycleMethodResolverFacade.indexedParameterDeclarations.getAll(); - List errors = new ArrayList<>(); - for (int parameterIndex = 0; parameterIndex < actualDeclarations.size(); parameterIndex++) { + var errors = new ArrayList(); + for (var parameterIndex = 0; parameterIndex < actualDeclarations.size(); parameterIndex++) { ParameterDeclaration actualDeclaration = actualDeclarations.get(parameterIndex); ResolvableParameterDeclaration originalDeclaration = originalResolverFacade.indexedParameterDeclarations.declarationsByIndex // .get(parameterIndex); @@ -401,7 +401,7 @@ private static void validateIndexedParameters( indexedParameters.forEach( (index, declarations) -> validateIndexedParameterDeclarations(index, declarations, errors)); - for (int index = 0; index <= indexedParameters.lastKey(); index++) { + for (var index = 0; index <= indexedParameters.lastKey(); index++) { if (!indexedParameters.containsKey(index)) { errors.add("no field annotated with @Parameter(%d) declared".formatted(index)); } diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java index f91d22d0cf65..9b3e9c2c2317 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java @@ -36,7 +36,7 @@ class JavaTimeArgumentConverter extends AnnotationBasedArgumentConverter, TemporalQuery> TEMPORAL_QUERIES; static { - Map, TemporalQuery> queries = new LinkedHashMap<>(); + var queries = new LinkedHashMap, TemporalQuery>(); queries.put(ChronoLocalDate.class, ChronoLocalDate::from); queries.put(ChronoLocalDateTime.class, ChronoLocalDateTime::from); queries.put(ChronoZonedDateTime.class, ChronoZonedDateTime::from); diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java index 49f330538c46..f015c1adc1cf 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java @@ -38,10 +38,10 @@ protected Stream provideArguments(ParameterDeclarations par CsvReaderFactory.validate(csvSource); - List arguments = new ArrayList<>(); + var arguments = new ArrayList(); try (var reader = CsvReaderFactory.createReaderFor(csvSource, getData(csvSource))) { - boolean useHeadersInDisplayName = csvSource.useHeadersInDisplayName(); + var useHeadersInDisplayName = csvSource.useHeadersInDisplayName(); for (CsvRecord record : reader) { arguments.add(processCsvRecord(record, useHeadersInDisplayName)); } @@ -62,8 +62,8 @@ private static String getData(CsvSource csvSource) { return csvSource.textBlock(); } else { - for (int i = 0; i < values.length; i++) { - int finalI = i; + for (var i = 0; i < values.length; i++) { + var finalI = i; Preconditions.notBlank(values[i], () -> "CSV record at index %d must not be blank".formatted(finalI + 1)); } @@ -87,7 +87,7 @@ static Arguments processCsvRecord(CsvRecord record, boolean useHeadersInDisplayN @Nullable Object[] arguments = new Object[fields.size()]; - for (int i = 0; i < fields.size(); i++) { + for (var i = 0; i < fields.size(); i++) { Object argument = resolveNullMarker(fields.get(i)); if (useHeadersInDisplayName) { String header = resolveNullMarker(headers.get(i)); diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java index 128416d91bd7..f1b29d86ba65 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java @@ -78,7 +78,7 @@ private static Charset getCharsetFrom(CsvFileSource csvFileSource) { private static Stream toStream(CsvReader reader, CsvFileSource csvFileSource) { var spliterator = CsvExceptionHandlingSpliterator.delegatingTo(reader.spliterator(), csvFileSource); - boolean useHeadersInDisplayName = csvFileSource.useHeadersInDisplayName(); + var useHeadersInDisplayName = csvFileSource.useHeadersInDisplayName(); // @formatter:off return StreamSupport.stream(spliterator, false) .skip(csvFileSource.numLinesToSkip()) diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvReaderFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvReaderFactory.java index 122d426d5ea3..e6659adc7edf 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvReaderFactory.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvReaderFactory.java @@ -149,7 +149,7 @@ private static void validateControlCharactersDiffer(String delimiter, char quote } private static boolean stringValuesUnique(Object... values) { - long uniqueCount = Stream.of(values).map(String::valueOf).distinct().count(); + var uniqueCount = Stream.of(values).map(String::valueOf).distinct().count(); return uniqueCount == values.length; } diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java index fd7df78146c1..b111fed02d3f 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java @@ -90,11 +90,11 @@ private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodNa if (factoryMethodName.contains("#")) { return true; } - int indexOfFirstDot = factoryMethodName.indexOf('.'); + var indexOfFirstDot = factoryMethodName.indexOf('.'); if (indexOfFirstDot == -1) { return false; } - int indexOfLastOpeningParenthesis = factoryMethodName.lastIndexOf('('); + var indexOfLastOpeningParenthesis = factoryMethodName.lastIndexOf('('); if (indexOfLastOpeningParenthesis > 0) { // Exclude simple/local method names with parameters return indexOfFirstDot < indexOfLastOpeningParenthesis; @@ -122,7 +122,7 @@ static Method findFactoryMethodByFullyQualifiedName(Class testClass, Optional return factoryMethod; } - boolean explicitParameterListSpecified = // + var explicitParameterListSpecified = // StringUtils.isNotBlank(methodParameters) || fullyQualifiedMethodName.endsWith("()"); // If we didn't find an exact match but an explicit parameter list was specified, diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java index e48a5995a4ea..47503052d837 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java @@ -82,7 +82,7 @@ private static Class findConsumedAnnotationType(T anno @SuppressWarnings("unchecked") private static Class getAnnotationType(Method method) { - int annotationIndex = annotationConsumingMethodSignatures.stream() // + var annotationIndex = annotationConsumingMethodSignatures.stream() // .filter(signature -> signature.isMatchingWith(method)) // .findFirst() // .map(AnnotationConsumingMethodSignature::annotationParameterIndex) // diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java index 711b42d6c658..38b364c9876c 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java @@ -143,7 +143,7 @@ public void trace(@Nullable Throwable throwable, Supplier messageSupplie } private void log(Level level, @Nullable Throwable throwable, Supplier messageSupplier) { - boolean loggable = this.julLogger.isLoggable(level); + var loggable = this.julLogger.isLoggable(level); if (loggable || !listeners.isEmpty()) { LogRecord logRecord = createLogRecord(level, throwable, messageSupplier.get()); if (loggable) { @@ -156,7 +156,7 @@ private void log(Level level, @Nullable Throwable throwable, Supplier me private LogRecord createLogRecord(Level level, @Nullable Throwable throwable, String message) { String sourceClassName = null; String sourceMethodName = null; - boolean found = false; + var found = false; for (StackTraceElement element : new Throwable().getStackTrace()) { String className = element.getClassName(); if (FQCN.equals(className)) { diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/conversion/StringToBooleanConverter.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/conversion/StringToBooleanConverter.java index 4bfefc7b48b1..8287b8eef3a0 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/conversion/StringToBooleanConverter.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/conversion/StringToBooleanConverter.java @@ -21,7 +21,7 @@ public boolean canConvertTo(Class targetType) { @Override public Object convert(String source, Class targetType) { - boolean isTrue = "true".equalsIgnoreCase(source); + var isTrue = "true".equalsIgnoreCase(source); Preconditions.condition(isTrue || "false".equalsIgnoreCase(source), () -> "String must be 'true' or 'false' (ignoring case): " + source); return isTrue; diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java index be312dc7986d..089bb81b3aca 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java @@ -139,7 +139,7 @@ public static Optional findAnnotation(Parameter parame public static Optional findAnnotation(@Nullable AnnotatedElement element, Class annotationType) { Preconditions.notNull(annotationType, "annotationType must not be null"); - boolean inherited = annotationType.isAnnotationPresent(Inherited.class); + var inherited = annotationType.isAnnotationPresent(Inherited.class); return findAnnotation(element, annotationType, inherited, new HashSet<>()); } @@ -284,7 +284,7 @@ public static List findRepeatableAnnotations(@Nullable Repeatable repeatable = annotationType.getAnnotation(Repeatable.class); Preconditions.notNull(repeatable, () -> annotationType.getName() + " must be @Repeatable"); Class containerType = repeatable.value(); - boolean inherited = containerType.isAnnotationPresent(Inherited.class); + var inherited = containerType.isAnnotationPresent(Inherited.class); // Short circuit the search algorithm. if (element == null) { diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java index fd98cd61202c..5ab261dd2433 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java @@ -110,7 +110,7 @@ private static Predicate createPredicateFromPatterns(String patterns, Fun List patternList = convertToRegularExpressions(patterns); return object -> { - boolean isMatchingAnyPattern = patternList.stream().anyMatch( + var isMatchingAnyPattern = patternList.stream().anyMatch( pattern -> pattern.matcher(classNameProvider.apply(object)).matches()); return (type == FilterType.INCLUDE) == isMatchingAnyPattern; }; diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java index 2673781c8ca2..3ee57aef4520 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java @@ -56,7 +56,7 @@ static CloseablePath create(URI uri, FileSystemProvider fileSystemProvider) thro if (JAR_URI_SCHEME.equals(uri.getScheme())) { // Parsing: jar:!/[], see java.net.JarURLConnection String uriString = uri.toString(); - int lastJarUriSeparator = uriString.lastIndexOf(JAR_URI_SEPARATOR); + var lastJarUriSeparator = uriString.lastIndexOf(JAR_URI_SEPARATOR); String jarUri = uriString.substring(0, lastJarUriSeparator); String jarEntry = uriString.substring(lastJarUriSeparator + 1); return createForJarFileSystem(new URI(jarUri), fileSystem -> fileSystem.getPath(jarEntry), diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/DefaultClasspathScanner.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/DefaultClasspathScanner.java index 849c78cd654d..e161b4b14356 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/DefaultClasspathScanner.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/DefaultClasspathScanner.java @@ -26,7 +26,6 @@ import java.util.Enumeration; import java.util.LinkedHashSet; import java.util.List; -import java.util.Set; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Consumer; @@ -130,7 +129,7 @@ private List> findClassesForUris(List baseUris, String basePackage } private List> findClassesForUri(URI baseUri, String basePackageName, ClassFilter classFilter) { - List> classes = new ArrayList<>(); + var classes = new ArrayList>(); // @formatter:off walkFilesForUri(baseUri, SearchPathUtils::isClassOrSourceFile, (baseDir, file) -> @@ -154,7 +153,7 @@ private List findResourcesForUris(List baseUris, String basePacka } private List findResourcesForUri(URI baseUri, String basePackageName, ResourceFilter resourceFilter) { - List resources = new ArrayList<>(); + var resources = new ArrayList(); // @formatter:off walkFilesForUri(baseUri, SearchPathUtils::isResourceFile, (baseDir, file) -> @@ -300,7 +299,7 @@ private ClassLoader getClassLoader() { } private List getRootUrisForPackageNameOnClassPathAndModulePath(String basePackageName) { - Set uriSet = new LinkedHashSet<>(getRootUrisForPackage(basePackageName)); + var uriSet = new LinkedHashSet(getRootUrisForPackage(basePackageName)); if (!basePackageName.isEmpty() && !basePackageName.endsWith(PACKAGE_SEPARATOR_STRING)) { getRootUrisForPackage(basePackageName + PACKAGE_SEPARATOR_STRING).stream() // .map(DefaultClasspathScanner::removeTrailingClasspathResourcePathSeparator) // @@ -325,7 +324,7 @@ private static String packagePath(String packageName) { } private List getRootUrisForPackage(String basePackageName) { - List uris = new ArrayList<>(); + var uris = new ArrayList(); try { Enumeration resources = getClassLoader().getResources(packagePath(basePackageName)); while (resources.hasMoreElements()) { diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java index 45af4204233f..c36d82d0b90e 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java @@ -18,10 +18,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Deque; import java.util.LinkedHashSet; import java.util.List; -import java.util.Set; import java.util.function.Predicate; import org.apiguardian.api.API; @@ -128,12 +126,12 @@ public static void pruneStackTrace(Throwable throwable, List classNames) Preconditions.notNull(classNames, "List of class names must not be null"); List stackTrace = Arrays.asList(throwable.getStackTrace()); - List prunedStackTrace = new ArrayList<>(); - List junitStartStackTrace = new ArrayList<>(0); + var prunedStackTrace = new ArrayList(); + var junitStartStackTrace = new ArrayList(0); Collections.reverse(stackTrace); - for (int i = 0; i < stackTrace.size(); i++) { + for (var i = 0; i < stackTrace.size(); i++) { StackTraceElement element = stackTrace.get(i); String className = element.getClassName(); @@ -188,13 +186,13 @@ private static boolean includesJunitStart(List stackTrace, in public static List findNestedThrowables(Throwable rootThrowable) { Preconditions.notNull(rootThrowable, "Throwable must not be null"); - Set visited = new LinkedHashSet<>(); - Deque toVisit = new ArrayDeque<>(); + var visited = new LinkedHashSet(); + var toVisit = new ArrayDeque(); toVisit.add(rootThrowable); while (!toVisit.isEmpty()) { Throwable current = toVisit.remove(); - boolean isFirstVisit = visited.add(current); + var isFirstVisit = visited.add(current); if (isFirstVisit) { Throwable cause = current.getCause(); if (cause != null) { diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/KotlinReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/KotlinReflectionUtils.java index f3a04fe2e1a7..b1f26d624df3 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/KotlinReflectionUtils.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/KotlinReflectionUtils.java @@ -68,7 +68,7 @@ private static Try> tryToLoadKotlinMetadataClass() { @API(status = INTERNAL, since = "6.0") public static boolean isKotlinSuspendingFunction(Method method) { if (!method.isSynthetic() && kotlinCoroutineContinuation != null && isKotlinType(method.getDeclaringClass())) { - int parameterCount = method.getParameterCount(); + var parameterCount = method.getParameterCount(); return parameterCount > 0 // && method.getParameterTypes()[parameterCount - 1] == kotlinCoroutineContinuation; } diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/KotlinSuspendingFunctionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/KotlinSuspendingFunctionUtils.java index fe2f348fea31..db71ac35c937 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/KotlinSuspendingFunctionUtils.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/KotlinSuspendingFunctionUtils.java @@ -93,8 +93,8 @@ static Class[] getParameterTypes(Method method) { private static Map toArgumentMap(@Nullable Object target, @Nullable Object[] args, KFunction function) { - Map arguments = new HashMap<>(args.length + 1); - int index = 0; + var arguments = new HashMap(args.length + 1); + var index = 0; for (KParameter parameter : function.getParameters()) { switch (parameter.getKind()) { case INSTANCE -> arguments.put(parameter, target); diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java index ec682e6c1132..4ed72eb5dbe8 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java @@ -209,7 +209,7 @@ private static Stream streamResolvedModules(Predicate mo private static List> scan(Set references, ClassFilter filter, ClassLoader loader) { logger.debug(() -> "Scanning " + references.size() + " module references: " + references); ModuleReferenceClassScanner scanner = new ModuleReferenceClassScanner(filter, loader); - List> classes = new ArrayList<>(); + var classes = new ArrayList>(); for (ModuleReference reference : references) { classes.addAll(scanner.scan(reference)); } @@ -224,7 +224,7 @@ private static List> scan(Set references, ClassFilter private static List scan(Set references, ResourceFilter filter, ClassLoader loader) { logger.debug(() -> "Scanning " + references.size() + " module references: " + references); ModuleReferenceResourceScanner scanner = new ModuleReferenceResourceScanner(filter, loader); - List resources = new ArrayList<>(); + var resources = new ArrayList(); for (ModuleReference reference : references) { resources.addAll(scanner.scan(reference)); } diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/SearchPathUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/SearchPathUtils.java index 48eb38c1ed87..6aa48269b571 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/SearchPathUtils.java +++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/SearchPathUtils.java @@ -67,7 +67,7 @@ static String determineSimpleClassName(Path file) { } private static String removeExtension(String fileName) { - int lastDot = fileName.lastIndexOf(FILE_NAME_EXTENSION_SEPARATOR_CHAR); + var lastDot = fileName.lastIndexOf(FILE_NAME_EXTENSION_SEPARATOR_CHAR); if (lastDot < 0) { throw new JUnitException("Expected file name with file extension, but got: " + fileName); } diff --git a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java index 057dc98d986a..5d7dafbb37d2 100644 --- a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java +++ b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java @@ -38,8 +38,8 @@ public static void executeConcurrently(int threads, Runnable action) throws Exce ExecutorService executorService = Executors.newFixedThreadPool(threads); try { CountDownLatch latch = new CountDownLatch(threads); - List> futures = new ArrayList<>(); - for (int i = 0; i < threads; i++) { + var futures = new ArrayList>(); + for (var i = 0; i < threads; i++) { futures.add(CompletableFuture.supplyAsync(() -> { try { latch.countDown(); @@ -55,7 +55,7 @@ public static void executeConcurrently(int threads, Runnable action) throws Exce } }, executorService)); } - List list = new ArrayList<>(); + var list = new ArrayList(); for (CompletableFuture future : futures) { list.add(future.get(5, SECONDS)); } diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/command/DiscoveryRequestCreator.java b/junit-platform-console/src/main/java/org/junit/platform/console/command/DiscoveryRequestCreator.java index 021a4197adde..c1f114c7be80 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/command/DiscoveryRequestCreator.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/command/DiscoveryRequestCreator.java @@ -91,7 +91,7 @@ private static Set determineClasspathRoots(TestDiscoveryOptions options) { var selectedClasspathEntries = Preconditions.notNull(options.getSelectedClasspathEntries(), () -> "No classpath entries selected"); if (selectedClasspathEntries.isEmpty()) { - Set rootDirs = new LinkedHashSet<>(ReflectionUtils.getAllClasspathRootDirectories()); + var rootDirs = new LinkedHashSet(ReflectionUtils.getAllClasspathRootDirectories()); rootDirs.addAll(options.getAdditionalClasspathEntries()); return rootDirs; } @@ -99,8 +99,8 @@ private static Set determineClasspathRoots(TestDiscoveryOptions options) { } private static Set validateAndLogInvalidRoots(Set roots) { - LinkedHashSet valid = new LinkedHashSet<>(); - HashSet seen = new HashSet<>(); + var valid = new LinkedHashSet(); + var seen = new HashSet(); for (Path root : roots) { if (!seen.add(root)) { diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/command/ExecuteTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/command/ExecuteTestsCommand.java index e7c8bf37a16a..ad8c6da5ef7c 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/command/ExecuteTestsCommand.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/command/ExecuteTestsCommand.java @@ -84,7 +84,7 @@ TestConsoleOutputOptions toTestConsoleOutputOptions() { @Override public int getExitCode() { TestExecutionSummary executionResult = commandSpec.commandLine().getExecutionResult(); - boolean failIfNoTests = getReportingOptions().map(it -> it.failIfNoTests).orElse(false); + var failIfNoTests = getReportingOptions().map(it -> it.failIfNoTests).orElse(false); if (failIfNoTests && executionResult.getTestsFoundCount() == 0) { return NO_TESTS_FOUND; } diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/command/MainCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/command/MainCommand.java index 224afd8887fe..8c3063b4e6d2 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/command/MainCommand.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/command/MainCommand.java @@ -99,7 +99,7 @@ private static CommandResult runCommand(CommandLine commandLine, String[] arg @SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional outputStreamConfig) { BaseCommand.initialize(commandLine); outputStreamConfig.ifPresent(it -> it.applyTo(commandLine)); - int exitCode = commandLine.execute(args); + var exitCode = commandLine.execute(args); return CommandResult.create(exitCode, getLikelyExecutedCommand(commandLine).getExecutionResult()); } diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptions.java index 2e5b15cad03a..c185bfc84227 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptions.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptions.java @@ -201,7 +201,7 @@ public void setSelectorIdentifiers(List selectorIde } public List getExplicitSelectors() { - List selectors = new ArrayList<>(); + var selectors = new ArrayList(); selectors.addAll(getSelectedUniqueIds()); selectors.addAll(getSelectedUris()); selectors.addAll(getSelectedFiles()); diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/output/ColorPalette.java b/junit-platform-console/src/main/java/org/junit/platform/console/output/ColorPalette.java index 714cfc0a3174..57de396c6319 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/output/ColorPalette.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/output/ColorPalette.java @@ -42,7 +42,7 @@ public class ColorPalette { // https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_parameters private static Map defaultPalette() { - Map colorsToAnsiSequences = new EnumMap<>(Style.class); + var colorsToAnsiSequences = new EnumMap(Style.class); colorsToAnsiSequences.put(Style.NONE, "0"); colorsToAnsiSequences.put(Style.SUCCESSFUL, "32"); colorsToAnsiSequences.put(Style.ABORTED, "33"); @@ -56,7 +56,7 @@ private static Map defaultPalette() { } private static Map singleColorPalette() { - Map colorsToAnsiSequences = new EnumMap<>(Style.class); + var colorsToAnsiSequences = new EnumMap(Style.class); colorsToAnsiSequences.put(Style.NONE, "0"); colorsToAnsiSequences.put(Style.SUCCESSFUL, "1"); colorsToAnsiSequences.put(Style.ABORTED, "4"); diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/output/TestFeedPrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/output/TestFeedPrintingListener.java index 68092135a300..6951815f8d94 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/output/TestFeedPrintingListener.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/output/TestFeedPrintingListener.java @@ -96,9 +96,9 @@ private void println(Style style, String message) { } private List collectDisplayNames(UniqueId uniqueId) { - int size = uniqueId.getSegments().size(); - List displayNames = new ArrayList<>(size); - for (int i = 0; i < size; i++) { + var size = uniqueId.getSegments().size(); + var displayNames = new ArrayList(size); + for (var i = 0; i < size; i++) { displayNames.add(0, requireNonNull(testPlan).getTestIdentifier(uniqueId).getDisplayName()); if (i < size - 1) { uniqueId = uniqueId.removeLastSegment(); diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/output/TreeNode.java b/junit-platform-console/src/main/java/org/junit/platform/console/output/TreeNode.java index 8fa9732cd48a..06ad4b185d21 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/output/TreeNode.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/output/TreeNode.java @@ -97,7 +97,7 @@ Optional identifier() { @SuppressWarnings("DataFlowIssue") static String createCaption(String displayName) { - boolean normal = displayName.length() <= 80; + var normal = displayName.length() <= 80; String caption = normal ? displayName : displayName.substring(0, 80) + "..."; String whites = StringUtils.replaceWhitespaceCharacters(caption, " "); return StringUtils.replaceIsoControlCharacters(whites, "."); diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/output/TreePrinter.java b/junit-platform-console/src/main/java/org/junit/platform/console/output/TreePrinter.java index d7eaa9b73015..516b9db38a26 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/output/TreePrinter.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/output/TreePrinter.java @@ -79,7 +79,7 @@ private void printVisible(TreeNode node, String indent, boolean continuous) { out.print(" "); out.print(duration); } - boolean nodeIsBeingListed = node.duration == 0 && node.result().isEmpty() && node.reason().isEmpty(); + var nodeIsBeingListed = node.duration == 0 && node.result().isEmpty() && node.reason().isEmpty(); if (!nodeIsBeingListed) { out.print(" "); out.print(icon); @@ -166,7 +166,7 @@ private void printMessage(Style style, String indent, String message) { out.print(" "); out.print(color(style, lines[0])); if (lines.length > 1) { - for (int i = 1; i < lines.length; i++) { + for (var i = 1; i < lines.length; i++) { out.println(); out.print(indent); if (StringUtils.isNotBlank(lines[i])) { diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/output/VerboseTreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/output/VerboseTreePrintingListener.java index 2eb71bb284aa..34e578b06d1c 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/output/VerboseTreePrintingListener.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/output/VerboseTreePrintingListener.java @@ -54,7 +54,7 @@ public VerboseTreePrintingListener(PrintWriter out, ColorPalette colorPalette, i this.verticals[1] = ""; // synthetic root "/" level this.verticals[2] = ""; // "engine" level - for (int i = 3; i < verticals.length; i++) { + for (var i = 3; i < verticals.length; i++) { verticals[i] = verticals[i - 1] + theme.vertical(); } } @@ -76,7 +76,7 @@ public void testPlanExecutionFinished(TestPlan testPlan) { } private void printNumberOfTests(TestPlan testPlan, String prefix) { - long tests = testPlan.countTestIdentifiers(TestIdentifier::isTest); + var tests = testPlan.countTestIdentifiers(TestIdentifier::isTest); printf(NONE, "%s", prefix); printf(Style.TEST, "%d%n", tests); } @@ -189,7 +189,7 @@ private void printDetail(Style style, String detail, String format, Object... ar printf(style, "%s", lines[0]); if (lines.length > 1) { String delimiter = System.lineSeparator() + verticals + (detailFormat + " ").formatted(""); - for (int i = 1; i < lines.length; i++) { + for (var i = 1; i < lines.length; i++) { printf(NONE, "%s", delimiter); printf(style, "%s", lines[i]); } diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java index 0dc47bca49cc..754e36c69801 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java @@ -138,7 +138,7 @@ default Set getAncestors() { return Collections.emptySet(); } TestDescriptor parent = getParent().get(); - Set ancestors = new LinkedHashSet<>(); + var ancestors = new LinkedHashSet(); ancestors.add(parent); // Need to recurse? if (parent.getParent().isPresent()) { @@ -159,7 +159,7 @@ default Set getAncestors() { * @see #getChildren() */ default Set getDescendants() { - Set descendants = new LinkedHashSet<>(); + var descendants = new LinkedHashSet(); descendants.addAll(getChildren()); for (TestDescriptor child : getChildren()) { descendants.addAll(child.getDescendants()); @@ -213,7 +213,7 @@ default void orderChildren(UnaryOperator> orderer) { Preconditions.notNull(suggestedOrder, "orderer may not return null"); Set orderedChildren = new LinkedHashSet<>(suggestedOrder); - boolean unmodified = originalChildren.equals(orderedChildren); + var unmodified = originalChildren.equals(orderedChildren); Preconditions.condition(unmodified && originalChildren.size() == suggestedOrder.size(), "orderer may not add or remove test descriptors"); diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java index e735b61f9e8e..a5e6b5d34118 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java @@ -161,7 +161,7 @@ public UniqueId append(String segmentType, String value) { @API(status = STABLE, since = "1.1") public UniqueId append(Segment segment) { Preconditions.notNull(segment, "segment must not be null"); - List baseSegments = new ArrayList<>(this.segments.size() + 1); + var baseSegments = new ArrayList(this.segments.size() + 1); baseSegments.addAll(this.segments); baseSegments.add(segment); return new UniqueId(this.uniqueIdFormat, baseSegments); @@ -196,8 +196,8 @@ public UniqueId appendEngine(String engineId) { @API(status = STABLE, since = "1.1") public boolean hasPrefix(UniqueId potentialPrefix) { Preconditions.notNull(potentialPrefix, "potentialPrefix must not be null"); - int size = this.segments.size(); - int prefixSize = potentialPrefix.segments.size(); + var size = this.segments.size(); + var prefixSize = potentialPrefix.segments.size(); return size >= prefixSize && this.segments.subList(0, prefixSize).equals(potentialPrefix.segments); } @@ -249,7 +249,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - int value = this.hashCode; + var value = this.hashCode; if (value == 0) { value = this.segments.hashCode(); if (value == 0) { diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java index 87275e54ba4d..fae74d7e9777 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java @@ -132,8 +132,8 @@ private String describe(Segment segment) { private String encode(String s) { StringBuilder builder = new StringBuilder(s.length()); - for (int i = 0; i < s.length(); i++) { - char c = s.charAt(i); + for (var i = 0; i < s.length(); i++) { + var c = s.charAt(i); String value = encodedCharacterMap.get(c); if (value == null) { builder.append(c); diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java index 54a8aa42bbb5..60047dd84e68 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java @@ -65,7 +65,7 @@ public final class ClasspathResourceSelector implements DiscoverySelector { private @Nullable Set resources; ClasspathResourceSelector(String classpathResourceName, @Nullable FilePosition position) { - boolean startsWithSlash = classpathResourceName.startsWith("/"); + var startsWithSlash = classpathResourceName.startsWith("/"); this.classpathResourceName = (startsWithSlash ? classpathResourceName.substring(1) : classpathResourceName); Preconditions.notBlank(this.classpathResourceName, "classpath resource name must not be blank after removing leading slash"); diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectorIdentifierParsers.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectorIdentifierParsers.java index 07d467c32ae0..67682e6abf93 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectorIdentifierParsers.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectorIdentifierParsers.java @@ -68,7 +68,7 @@ private enum Singleton { private final Map parsersByPrefix; Singleton() { - Map parsersByPrefix = new HashMap<>(); + var parsersByPrefix = new HashMap(); Iterable loadedParsers = ServiceLoader.load( DiscoverySelectorIdentifierParser.class, ClassLoaderUtils.getDefaultClassLoader()); for (DiscoverySelectorIdentifierParser parser : loadedParsers) { diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java index 0d06e7c3a264..2263cab258c9 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.SortedSet; @@ -122,7 +121,7 @@ class Range { } } - List ranges = new ArrayList<>(); + var ranges = new ArrayList(); Range current = new Range(this.iterationIndices.first()); ranges.add(current); for (int n : this.iterationIndices.tailSet(current.start + 1)) { diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java index a00fc3e92af9..2bde3027c8a6 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java @@ -183,7 +183,7 @@ public void orderChildren(UnaryOperator> orderer) { Preconditions.notNull(suggestedOrder, "orderer may not return null"); Set orderedChildren = new LinkedHashSet<>(suggestedOrder); - boolean unmodified = this.children.equals(orderedChildren); + var unmodified = this.children.equals(orderedChildren); Preconditions.condition(unmodified && this.children.size() == suggestedOrder.size(), "orderer may not add or remove test descriptors"); @@ -231,7 +231,7 @@ public String toString() { private static String replaceControlCharacters(String text) { StringBuilder builder = new StringBuilder(); - for (int i = 0; i < text.length(); i++) { + for (var i = 0; i < text.length(); i++) { builder.append(replaceControlCharacter(text.charAt(i))); } return builder.toString(); diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java index 692355c37cc9..9b40c75a2c9b 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java @@ -123,7 +123,7 @@ public static ClassSource from(URI uri) { String className = uri.getSchemeSpecificPart(); FilePosition filePosition = null; - int indexOfQuery = className.indexOf('?'); + var indexOfQuery = className.indexOf('?'); if (indexOfQuery >= 0) { filePosition = FilePosition.fromQuery(className.substring(indexOfQuery + 1)).orElse(null); className = className.substring(0, indexOfQuery); diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java index 6f4a476bc4b6..1364ca340156 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java @@ -122,7 +122,7 @@ private ClasspathResourceSource(String classpathResourceName) { private ClasspathResourceSource(String classpathResourceName, @Nullable FilePosition filePosition) { Preconditions.notBlank(classpathResourceName, "Classpath resource name must not be null or blank"); - boolean startsWithSlash = classpathResourceName.startsWith("/"); + var startsWithSlash = classpathResourceName.startsWith("/"); this.classpathResourceName = (startsWithSlash ? classpathResourceName.substring(1) : classpathResourceName); this.filePosition = filePosition; } diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/DiscoveryIssueReporter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/DiscoveryIssueReporter.java index ffebf29bd580..685631f478d1 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/DiscoveryIssueReporter.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/DiscoveryIssueReporter.java @@ -14,7 +14,6 @@ import java.util.Collection; import java.util.HashSet; -import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; @@ -83,9 +82,9 @@ static DiscoveryIssueReporter consuming(Consumer consume */ static DiscoveryIssueReporter deduplicating(DiscoveryIssueReporter delegate) { Preconditions.notNull(delegate, "delegate must not be null"); - Set seen = new HashSet<>(); + var seen = new HashSet(); return issue -> { - boolean notSeen = seen.add(issue); + var notSeen = seen.add(issue); if (notSeen) { delegate.reportIssue(issue); } diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ResourceUtils.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ResourceUtils.java index ce550caff7f0..ae4f4e713794 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ResourceUtils.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ResourceUtils.java @@ -37,7 +37,7 @@ static Predicate packageName(Predicate packageFilter) { } private static String packageName(String classpathResourceName) { - int lastIndexOf = classpathResourceName.lastIndexOf(CLASSPATH_RESOURCE_PATH_SEPARATOR); + var lastIndexOf = classpathResourceName.lastIndexOf(CLASSPATH_RESOURCE_PATH_SEPARATOR); if (lastIndexOf < 0) { return DEFAULT_PACKAGE_NAME; } diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java index 3fdca310b5eb..80c151422bad 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java @@ -47,7 +47,7 @@ List getLocks() { @Override public boolean tryAcquire() { - List acquiredLocks = new ArrayList<>(this.locks.size()); + var acquiredLocks = new ArrayList(this.locks.size()); for (Lock lock : this.locks) { if (lock.tryLock()) { acquiredLocks.add(lock); @@ -72,7 +72,7 @@ public ResourceLock acquire() throws InterruptedException { } private void acquireAllLocks() throws InterruptedException { - List acquiredLocks = new ArrayList<>(this.locks.size()); + var acquiredLocks = new ArrayList(this.locks.size()); try { for (Lock lock : this.locks) { lock.lockInterruptibly(); @@ -91,7 +91,7 @@ public void release() { } private void release(List acquiredLocks) { - for (int i = acquiredLocks.size() - 1; i >= 0; i--) { + for (var i = acquiredLocks.size() - 1; i >= 0; i--) { acquiredLocks.get(i).unlock(); } } diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java index c3bbd0d15bf7..6291589e45da 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java @@ -39,16 +39,16 @@ public enum DefaultParallelExecutionConfigurationStrategy implements ParallelExe FIXED { @Override public ParallelExecutionConfiguration createConfiguration(ConfigurationParameters configurationParameters) { - int parallelism = configurationParameters.get(CONFIG_FIXED_PARALLELISM_PROPERTY_NAME, + var parallelism = configurationParameters.get(CONFIG_FIXED_PARALLELISM_PROPERTY_NAME, Integer::valueOf).orElseThrow( () -> new JUnitException( "Configuration parameter '%s' must be set".formatted(CONFIG_FIXED_PARALLELISM_PROPERTY_NAME))); - int maxPoolSize = configurationParameters.get(CONFIG_FIXED_MAX_POOL_SIZE_PROPERTY_NAME, + var maxPoolSize = configurationParameters.get(CONFIG_FIXED_MAX_POOL_SIZE_PROPERTY_NAME, Integer::valueOf).orElse(parallelism + 256); - boolean saturate = configurationParameters.get(CONFIG_FIXED_SATURATE_PROPERTY_NAME, - Boolean::valueOf).orElse(true); + var saturate = configurationParameters.get(CONFIG_FIXED_SATURATE_PROPERTY_NAME, Boolean::valueOf).orElse( + true); return new DefaultParallelExecutionConfiguration(parallelism, parallelism, maxPoolSize, parallelism, KEEP_ALIVE_SECONDS, __ -> saturate); @@ -70,10 +70,10 @@ public ParallelExecutionConfiguration createConfiguration(ConfigurationParameter () -> "Factor '%s' specified via configuration parameter '%s' must be greater than 0".formatted(factor, CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME)); - int parallelism = Math.max(1, + var parallelism = Math.max(1, factor.multiply(BigDecimal.valueOf(Runtime.getRuntime().availableProcessors())).intValue()); - int maxPoolSize = configurationParameters.get(CONFIG_DYNAMIC_MAX_POOL_SIZE_FACTOR_PROPERTY_NAME, + var maxPoolSize = configurationParameters.get(CONFIG_DYNAMIC_MAX_POOL_SIZE_FACTOR_PROPERTY_NAME, BigDecimal::new).map(maxPoolSizeFactor -> { Preconditions.condition(maxPoolSizeFactor.compareTo(BigDecimal.ONE) >= 0, () -> "Factor '%s' specified via configuration parameter '%s' must be greater than or equal to 1".formatted( @@ -81,8 +81,8 @@ public ParallelExecutionConfiguration createConfiguration(ConfigurationParameter return maxPoolSizeFactor.multiply(BigDecimal.valueOf(parallelism)).intValue(); }).orElseGet(() -> 256 + parallelism); - boolean saturate = configurationParameters.get(CONFIG_DYNAMIC_SATURATE_PROPERTY_NAME, - Boolean::valueOf).orElse(true); + var saturate = configurationParameters.get(CONFIG_DYNAMIC_SATURATE_PROPERTY_NAME, Boolean::valueOf).orElse( + true); return new DefaultParallelExecutionConfiguration(parallelism, parallelism, maxPoolSize, parallelism, KEEP_ALIVE_SECONDS, __ -> saturate); diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java index fdb0361862b9..13ac734dad51 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java @@ -106,7 +106,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - int h = hash; + var h = hash; if (h == 0) { h = hash = Objects.hash(key, lockMode); } diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java index f0b72fd99777..908e0347f6c1 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java @@ -146,9 +146,9 @@ public void invokeAll(List tasks) { new ExclusiveTask(tasks.get(0)).execSync(); return; } - Deque isolatedTasks = new ArrayDeque<>(); - Deque sameThreadTasks = new ArrayDeque<>(); - Deque concurrentTasksInReverseOrder = new ArrayDeque<>(); + var isolatedTasks = new ArrayDeque(); + var sameThreadTasks = new ArrayDeque(); + var concurrentTasksInReverseOrder = new ArrayDeque(); forkConcurrentTasks(tasks, isolatedTasks, sameThreadTasks, concurrentTasksInReverseOrder); executeSync(sameThreadTasks); joinConcurrentTasksInReverseOrderToEnableWorkStealing(concurrentTasksInReverseOrder); @@ -236,7 +236,7 @@ protected final void setRawResult(Void mustBeNull) { } void execSync() { - boolean completed = exec(); + var completed = exec(); if (!completed) { throw new IllegalStateException( "Task was deferred but should have been executed synchronously: " + testTask); diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java index 38dd1e0ea42b..d42529f4823f 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java @@ -74,7 +74,7 @@ private void walk(@Nullable TestDescriptor globalLockDescriptor, TestDescriptor Preconditions.notNull(globalLockDescriptor, () -> "Node requiring exclusive resources must also require global read lock: " + testDescriptor); - Set allResources = new HashSet<>(exclusiveResources); + var allResources = new HashSet(exclusiveResources); if (isReadOnly(allResources)) { doForChildrenRecursively(testDescriptor, child -> allResources.addAll(getExclusiveResources(child))); if (!isReadOnly(allResources)) { diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/WorkerThreadPoolHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/WorkerThreadPoolHierarchicalTestExecutorService.java index a59f3ec5740b..bb4d4da75f75 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/WorkerThreadPoolHierarchicalTestExecutorService.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/WorkerThreadPoolHierarchicalTestExecutorService.java @@ -195,7 +195,7 @@ private void forkAll(Collection entries) { } workQueue.addAll(entries); // start at most (parallelism - 1) new workers as this method is called from a worker thread holding a lease - for (int i = 0; i < Math.min(parallelism - 1, entries.size()); i++) { + for (var i = 0; i < Math.min(parallelism - 1, entries.size()); i++) { maybeStartWorker(); } } @@ -351,8 +351,8 @@ void invokeAll(List testTasks) { return; } - List isolatedTasks = new ArrayList<>(testTasks.size()); - List sameThreadTasks = new ArrayList<>(testTasks.size()); + var isolatedTasks = new ArrayList(testTasks.size()); + var sameThreadTasks = new ArrayList(testTasks.size()); var queueEntries = forkConcurrentChildren(testTasks, isolatedTasks::add, sameThreadTasks); executeAll(sameThreadTasks); var queueEntriesByResult = tryToStealWorkWithoutBlocking(queueEntries); @@ -364,7 +364,7 @@ void invokeAll(List testTasks) { private List forkConcurrentChildren(List children, Consumer isolatedTaskCollector, List sameThreadTasks) { - List queueEntries = new ArrayList<>(children.size()); + var queueEntries = new ArrayList(children.size()); for (TestTask child : children) { if (requiresGlobalReadWriteLock(child)) { isolatedTaskCollector.accept(child); @@ -392,7 +392,7 @@ else if (child.getExecutionMode() == SAME_THREAD) { private Map> tryToStealWorkWithoutBlocking( Iterable queueEntries) { - Map> queueEntriesByResult = new EnumMap<>(WorkStealResult.class); + var queueEntriesByResult = new EnumMap>(WorkStealResult.class); tryToStealWork(queueEntries, BlockingMode.NON_BLOCKING, queueEntriesByResult); return queueEntriesByResult; } @@ -796,7 +796,7 @@ public int compare(UniqueId a, UniqueId b) { while (aIterator.hasNext()) { var aCurrent = aIterator.next(); var bCurrent = bIterator.next(); - int result = compareBy(aCurrent, bCurrent); + var result = compareBy(aCurrent, bCurrent); if (result != 0) { return result; } @@ -805,7 +805,7 @@ public int compare(UniqueId a, UniqueId b) { } private static int compareBy(UniqueId.Segment a, UniqueId.Segment b) { - int result = a.getType().compareTo(b.getType()); + var result = a.getType().compareTo(b.getType()); if (result != 0) { return result; } @@ -830,7 +830,7 @@ static class WorkerLeaseManager { @Nullable WorkerLease tryAcquire() { - boolean acquired = semaphore.tryAcquire(); + var acquired = semaphore.tryAcquire(); if (acquired) { LOGGER.trace(() -> "acquired worker lease for new worker (available: %d)".formatted( semaphore.availablePermits())); diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/Namespace.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/Namespace.java index 9f5a885c0b2f..926ea33c6ad1 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/Namespace.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/Namespace.java @@ -96,7 +96,7 @@ public int hashCode() { public Namespace append(Object... parts) { Preconditions.notEmpty(parts, "parts array must not be null or empty"); Preconditions.containsNoNullElements(parts, "individual parts must not be null"); - ArrayList newParts = new ArrayList<>(this.parts.size() + parts.length); + var newParts = new ArrayList(this.parts.size() + parts.length); newParts.addAll(this.parts); Collections.addAll(newParts, parts); return new Namespace(newParts); diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java index baeeaed7f122..e204dca1b5f0 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Comparator; -import java.util.List; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -132,7 +131,7 @@ public void close() { if (!this.closed) { try { if (this.closeAction != null) { - List failures = new ArrayList<>(); + var failures = new ArrayList(); this.storedValues.entrySet().stream() // .map(e -> e.getValue().evaluateSafely(e.getKey())) // .filter(it -> it != null && it.value != null) // @@ -210,7 +209,7 @@ public void close() { public @Nullable Object getOrComputeIfAbsent(N namespace, K key, Function defaultCreator) { Preconditions.notNull(defaultCreator, "defaultCreator must not be null"); - CompositeKey compositeKey = new CompositeKey<>(namespace, key); + var compositeKey = new CompositeKey(namespace, key); StoredValue storedValue = getStoredValue(compositeKey); if (storedValue == null) { storedValue = this.storedValues.computeIfAbsent(compositeKey, @@ -240,7 +239,7 @@ public void close() { @API(status = MAINTAINED, since = "6.0") public Object computeIfAbsent(N namespace, K key, Function defaultCreator) { Preconditions.notNull(defaultCreator, "defaultCreator must not be null"); - CompositeKey compositeKey = new CompositeKey<>(namespace, key); + var compositeKey = new CompositeKey(namespace, key); StoredValue storedValue = getStoredValue(compositeKey); var result = StoredValue.evaluateIfNotNull(storedValue); if (result == null) { diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java index 953780d89125..98a60d43f3e5 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java @@ -133,7 +133,7 @@ private static PostDiscoveryFilter includeMatching(List tagExpressions) List parsedTagExpressions = parseAll(tagExpressions); return descriptor -> { Set tags = descriptor.getTags(); - boolean included = parsedTagExpressions.stream().anyMatch(expression -> expression.evaluate(tags)); + var included = parsedTagExpressions.stream().anyMatch(expression -> expression.evaluate(tags)); return FilterResult.includedIf(included, inclusionReason, exclusionReason); }; @@ -153,7 +153,7 @@ private static PostDiscoveryFilter excludeMatching(List tagExpressions) List parsedTagExpressions = parseAll(tagExpressions); return descriptor -> { Set tags = descriptor.getTags(); - boolean included = parsedTagExpressions.stream().noneMatch(expression -> expression.evaluate(tags)); + var included = parsedTagExpressions.stream().noneMatch(expression -> expression.evaluate(tags)); return FilterResult.includedIf(included, inclusionReason, exclusionReason); }; diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java index 0b86b47af10f..a2a7650f5b4e 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java @@ -227,7 +227,7 @@ public long countTestIdentifiers(Predicate predicate) { */ public Set getDescendants(TestIdentifier parent) { Preconditions.notNull(parent, "parent must not be null"); - Set result = new LinkedHashSet<>(16); + var result = new LinkedHashSet(16); Set children = getChildren(parent); result.addAll(children); for (TestIdentifier child : children) { diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ClasspathAlignmentChecker.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ClasspathAlignmentChecker.java index 9f3fabe91689..b220177bfe37 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ClasspathAlignmentChecker.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ClasspathAlignmentChecker.java @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.function.Function; @@ -53,7 +52,7 @@ static Optional check(LinkageError error) { // VisibleForTesting static Optional check(LinkageError error, Function packageLookup) { - Map> packagesByVersions = new HashMap<>(); + var packagesByVersions = new HashMap>(); WELL_KNOWN_PACKAGES.stream() // .map(packageLookup) // .filter(Objects::nonNull) // diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DiscoveryIssueNotifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DiscoveryIssueNotifier.java index 1e515657ce9b..388234441be2 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DiscoveryIssueNotifier.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DiscoveryIssueNotifier.java @@ -119,7 +119,7 @@ private static String formatMessage(TestEngine testEngine, List message.append(issues.size()).append(' ').append(adjective).append(" issues"); } message.append(" during test discovery:"); - for (int i = 0; i < issues.size(); i++) { + for (var i = 0; i < issues.size(); i++) { DiscoveryIssue issue = issues.get(i); message.append("\n\n(").append(i + 1).append(") [").append(issue.severity()).append("] ").append( issue.message()); diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java index d6d9b8e53658..12e98461627c 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java @@ -156,11 +156,11 @@ private static void reportDiscoveryIssues(LauncherDiscoveryResult discoveryResul private Map discoverSafely(LauncherDiscoveryRequest request, Optional phase, DiscoveryIssueCollector issueCollector, Function uniqueIdCreator) { - Map testEngineDescriptors = new LinkedHashMap<>(); + var testEngineDescriptors = new LinkedHashMap(); EngineFilterer engineFilterer = new EngineFilterer(request.getEngineFilters()); for (TestEngine testEngine : this.testEngines) { - boolean engineIsExcluded = engineFilterer.isExcluded(testEngine); + var engineIsExcluded = engineFilterer.isExcluded(testEngine); if (engineIsExcluded) { logger.debug(() -> "Test discovery for engine '%s' was skipped due to an EngineFilter%s.".formatted( @@ -177,7 +177,7 @@ private Map discoverSafely(LauncherDiscoveryReques engineFilterer.performSanityChecks(); - List filters = new ArrayList<>(postDiscoveryFilters); + var filters = new ArrayList(postDiscoveryFilters); filters.addAll(request.getPostDiscoveryFilters()); applyPostDiscoveryFilters(testEngineDescriptors, filters); @@ -224,7 +224,7 @@ LauncherDiscoveryListener getLauncherDiscoveryListener(LauncherDiscoveryRequest private void applyPostDiscoveryFilters(Map testEngineDescriptors, List filters) { Filter postDiscoveryFilter = composeFilters(filters); - Map> excludedTestDescriptorsByReason = new LinkedHashMap<>(); + var excludedTestDescriptorsByReason = new LinkedHashMap>(); TestDescriptor.Visitor removeExcludedTestDescriptors = descriptor -> { FilterResult filterResult = postDiscoveryFilter.apply(descriptor); if (!descriptor.isRoot() && isExcluded(descriptor, filterResult)) { @@ -245,8 +245,8 @@ private void populateExclusionReasonInMap(Optional reason, TestDescripto private void logTestDescriptorExclusionReasons(Map> excludedTestDescriptorsByReason) { excludedTestDescriptorsByReason.forEach((exclusionReason, testDescriptors) -> { String displayNames = testDescriptors.stream().map(TestDescriptor::getDisplayName).collect(joining(", ")); - long containerCount = testDescriptors.stream().filter(TestDescriptor::isContainer).count(); - long methodCount = testDescriptors.stream().filter(TestDescriptor::isTest).count(); + var containerCount = testDescriptors.stream().filter(TestDescriptor::isContainer).count(); + var methodCount = testDescriptors.stream().filter(TestDescriptor::isTest).count(); logger.config( () -> "%d containers and %d tests were %s".formatted(containerCount, methodCount, exclusionReason)); logger.debug( diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java index 85d417df85e0..5323b5b09f95 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.Queue; import org.junit.platform.commons.util.Preconditions; import org.junit.platform.engine.TestDescriptor; @@ -52,10 +51,10 @@ void validate(TestEngine testEngine, TestDescriptor root) { */ private Optional getCyclicGraphInfo(TestDescriptor root) { - Map> visited = new HashMap<>(); + var visited = new HashMap>(); visited.put(root.getUniqueId(), Optional.empty()); - Queue queue = new ArrayDeque<>(); + var queue = new ArrayDeque(); queue.add(root); while (!queue.isEmpty()) { @@ -87,7 +86,7 @@ private String formatted(List path) { } private static List findPath(Map> visited, UniqueId target) { - List path = new ArrayList<>(); + var path = new ArrayList(); path.add(target); UniqueId current = target; diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java index 34db0d796685..9f5a4fadc9ba 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java @@ -182,7 +182,7 @@ public void execute(LauncherDiscoveryResult discoveryResult, EngineExecutionList private static EngineExecutionListener selectExecutionListener(EngineExecutionListener engineExecutionListener, ConfigurationParameters configurationParameters) { - boolean stackTracePruningEnabled = configurationParameters.getBoolean(STACKTRACE_PRUNING_ENABLED_PROPERTY_NAME) // + var stackTracePruningEnabled = configurationParameters.getBoolean(STACKTRACE_PRUNING_ENABLED_PROPERTY_NAME) // .orElse(true); if (stackTracePruningEnabled) { return new StackTracePruningEngineExecutionListener(engineExecutionListener); diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java index 529524a637ea..a93c341c8bac 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java @@ -43,7 +43,7 @@ class EngineFilterer { } boolean isExcluded(TestEngine testEngine) { - boolean excluded = engineFilters.stream() // + var excluded = engineFilters.stream() // .map(engineFilter -> engineFilter.apply(testEngine)) // .anyMatch(FilterResult::excluded); checkedTestEngines.put(testEngine, excluded); diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java index bc7944be4fd2..daa3173fb7ab 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java @@ -11,7 +11,6 @@ package org.junit.platform.launcher.core; import java.util.HashSet; -import java.util.Set; import org.junit.platform.commons.JUnitException; import org.junit.platform.commons.logging.Logger; @@ -28,7 +27,7 @@ private EngineIdValidator() { } static Iterable validate(Iterable testEngines) { - Set ids = new HashSet<>(); + var ids = new HashSet(); for (TestEngine testEngine : testEngines) { // check usage of reserved ID prefix if (!validateReservedIds(testEngine)) { diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java index 7d105169d7c0..5fc383e82dfe 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java @@ -133,7 +133,7 @@ Builder parentConfigurationParameters(ConfigurationParameters parameters) { } LauncherConfigurationParameters build() { - List parameterProviders = new ArrayList<>(); + var parameterProviders = new ArrayList(); if (!explicitParameters.isEmpty()) { parameterProviders.add(ParameterProvider.explicit(explicitParameters)); } diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java index b7d25c39ff37..4075fec51cb7 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java @@ -427,7 +427,7 @@ private LauncherDiscoveryListener getLauncherDiscoveryListener(ConfigurationPara if (this.discoveryListeners.contains(defaultDiscoveryListener)) { return LauncherDiscoveryListeners.composite(this.discoveryListeners); } - List allDiscoveryListeners = new ArrayList<>(this.discoveryListeners.size() + 1); + var allDiscoveryListeners = new ArrayList(this.discoveryListeners.size() + 1); allDiscoveryListeners.addAll(this.discoveryListeners); allDiscoveryListeners.add(defaultDiscoveryListener); return LauncherDiscoveryListeners.composite(allDiscoveryListeners); diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java index 719319efc946..8b60841bdd04 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java @@ -149,7 +149,7 @@ private static DefaultLauncher createDefaultLauncher(LauncherConfig config, private static List collectLauncherInterceptors( LauncherConfigurationParameters configurationParameters) { - List interceptors = new ArrayList<>(); + var interceptors = new ArrayList(); if (configurationParameters.getBoolean(ENABLE_LAUNCHER_INTERCEPTORS).orElse(false)) { ServiceLoaderRegistry.load(LauncherInterceptor.class).forEach(interceptors::add); } @@ -158,7 +158,7 @@ private static List collectLauncherInterceptors( } private static Set collectTestEngines(LauncherConfig config) { - Set engines = new LinkedHashSet<>(); + var engines = new LinkedHashSet(); if (config.isTestEngineAutoRegistrationEnabled()) { new ServiceLoaderTestEngineRegistry().loadTestEngines().forEach(engines::add); } @@ -176,7 +176,7 @@ private static LauncherSessionListener createLauncherSessionListener(LauncherCon } private static List collectPostDiscoveryFilters(LauncherConfig config) { - List filters = new ArrayList<>(); + var filters = new ArrayList(); if (config.isPostDiscoveryFilterAutoRegistrationEnabled()) { ServiceLoaderRegistry.load(PostDiscoveryFilter.class).forEach(filters::add); } diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java index 4a535c6bd99e..c79c97457398 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java @@ -50,7 +50,7 @@ static ListenerRegistry create(Function, T> compositeListenerFact } static ListenerRegistry copyOf(ListenerRegistry source) { - ListenerRegistry registry = new ListenerRegistry<>(source.compositeListenerFactory); + var registry = new ListenerRegistry(source.compositeListenerFactory); if (!source.listeners.isEmpty()) { registry.addAll(source.listeners); } diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java index 2e7355f90816..8b4755a01578 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java @@ -33,9 +33,9 @@ static Iterable load(Class type) { static Iterable load(@SuppressWarnings("SameParameterValue") Class type, Predicate classNameFilter) { - List exclusions = new ArrayList<>(); + var exclusions = new ArrayList(); Predicate collectingClassNameFilter = className -> { - boolean included = classNameFilter.test(className); + var included = classNameFilter.test(className); if (!included) { exclusions.add(className); } diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java index 1a337082620e..e5cb45ecc1c3 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java @@ -18,7 +18,6 @@ import static org.junit.platform.launcher.LauncherConstants.STDOUT_REPORT_ENTRY_KEY; import java.util.HashMap; -import java.util.Map; import java.util.Optional; import java.util.function.BiConsumer; @@ -41,13 +40,13 @@ class StreamInterceptingTestExecutionListener implements EagerTestExecutionListe static Optional create(ConfigurationParameters configurationParameters, BiConsumer reporter) { - boolean captureStdout = configurationParameters.getBoolean(CAPTURE_STDOUT_PROPERTY_NAME).orElse(false); - boolean captureStderr = configurationParameters.getBoolean(CAPTURE_STDERR_PROPERTY_NAME).orElse(false); + var captureStdout = configurationParameters.getBoolean(CAPTURE_STDOUT_PROPERTY_NAME).orElse(false); + var captureStderr = configurationParameters.getBoolean(CAPTURE_STDERR_PROPERTY_NAME).orElse(false); if (!captureStdout && !captureStderr) { return Optional.empty(); } - int maxSize = configurationParameters.get(CAPTURE_MAX_BUFFER_PROPERTY_NAME, Integer::valueOf) // + var maxSize = configurationParameters.get(CAPTURE_MAX_BUFFER_PROPERTY_NAME, Integer::valueOf) // .orElse(CAPTURE_MAX_BUFFER_DEFAULT); Optional stdoutInterceptor = captureStdout ? StreamInterceptor.registerStdout(maxSize) @@ -83,7 +82,7 @@ public void executionJustStarted(TestIdentifier testIdentifier) { @Override public void executionJustFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) { - Map map = new HashMap<>(); + var map = new HashMap(); String out = stdoutInterceptor.map(StreamInterceptor::consume).orElse(""); if (StringUtils.isNotBlank(out)) { map.put(STDOUT_REPORT_ENTRY_KEY, out); diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java index d10db3855648..a328a08d93b1 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java @@ -99,7 +99,7 @@ public void write(byte[] b) { public void write(byte[] buf, int off, int len) { RewindableByteArrayOutputStream out = getOutput(); if (out != null) { - int actualLength = Math.max(0, Math.min(len, maxNumberOfBytesPerThread - out.size())); + var actualLength = Math.max(0, Math.min(len, maxNumberOfBytesPerThread - out.size())); if (actualLength > 0) { pushToTop(out); out.write(buf, off, actualLength); @@ -137,7 +137,7 @@ String rewind() { if (position == null || position == count) { return ""; } - int length = count - position; + var length = count - position; count -= length; return new String(buf, position, length, Charset.defaultCharset()); } diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java index 3ebd9f109783..e1f5dc6003c5 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java @@ -39,7 +39,7 @@ private static String format(String title, Stream testEngines) { } private static List computeAttributes(TestEngine engine) { - List attributes = new ArrayList<>(4); + var attributes = new ArrayList(4); engine.getGroupId().ifPresent(groupId -> attributes.add("group ID: " + groupId)); engine.getArtifactId().ifPresent(artifactId -> attributes.add("artifact ID: " + artifactId)); engine.getVersion().ifPresent(version -> attributes.add("version: " + version)); diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java index 483e67293da9..46c4815ff429 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java @@ -219,7 +219,7 @@ public List getFailures() { } private String describeTest(TestIdentifier testIdentifier) { - List descriptionParts = new ArrayList<>(); + var descriptionParts = new ArrayList(); collectTestDescription(testIdentifier, descriptionParts); return join(":", descriptionParts); } @@ -254,10 +254,10 @@ private void printStackTrace(PrintWriter writer, StackTraceElement[] parentTrace if (parentTrace.length > 0) { writer.printf("%s%s%s%n", indentation, caption, throwable); } - int duplicates = numberOfCommonFrames(trace, parentTrace); - int numDistinctFrames = trace.length - duplicates; - int numDisplayLines = Math.min(numDistinctFrames, max); - for (int i = 0; i < numDisplayLines; i++) { + var duplicates = numberOfCommonFrames(trace, parentTrace); + var numDistinctFrames = trace.length - duplicates; + var numDisplayLines = Math.min(numDistinctFrames, max); + for (var i = 0; i < numDisplayLines; i++) { writer.printf("%s%s%s%n", indentation, TAB, trace[i]); } if (trace.length > max || duplicates != 0) { @@ -273,8 +273,8 @@ private void printStackTrace(PrintWriter writer, StackTraceElement[] parentTrace } private int numberOfCommonFrames(StackTraceElement[] currentTrace, StackTraceElement[] parentTrace) { - int currentIndex = currentTrace.length - 1; - for (int parentIndex = parentTrace.length - 1; currentIndex >= 0 + var currentIndex = currentTrace.length - 1; + for (var parentIndex = parentTrace.length - 1; currentIndex >= 0 && parentIndex >= 0; currentIndex--, parentIndex--) { if (!currentTrace[currentIndex].equals(parentTrace[parentIndex])) { break; diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java index e404a7457c1a..083beb61e362 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java @@ -82,10 +82,10 @@ public void dynamicTestRegistered(TestIdentifier testIdentifier) { public void executionSkipped(TestIdentifier testIdentifier, String reason) { var testPlan = requireNonNull(this.testPlan); // @formatter:off - long skippedContainers = concat(Stream.of(testIdentifier), testPlan.getDescendants(testIdentifier).stream()) + var skippedContainers = concat(Stream.of(testIdentifier), testPlan.getDescendants(testIdentifier).stream()) .filter(TestIdentifier::isContainer) .count(); - long skippedTests = concat(Stream.of(testIdentifier), testPlan.getDescendants(testIdentifier).stream()) + var skippedTests = concat(Stream.of(testIdentifier), testPlan.getDescendants(testIdentifier).stream()) .filter(TestIdentifier::isTest) .count(); // @formatter:on diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java index 802168bb5267..6462516e5701 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java @@ -166,7 +166,7 @@ public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult } private void trackTestUidRecursively(TestIdentifier testIdentifier) { - boolean tracked = trackTestUid(testIdentifier); + var tracked = trackTestUid(testIdentifier); if (!tracked) { requireNonNull(this.testPlan).getChildren(testIdentifier).forEach(this::trackTestUidRecursively); } diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java index 4f09bb92c59b..bc4b1d4619cc 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java @@ -129,7 +129,7 @@ private String createMissingOperandMessage(Stack> expre } if (2 == arity) { - int mismatch = arity - expressions.size(); + var mismatch = arity - expressions.size(); if (2 == mismatch) { return "missing lhs and rhs operand"; } diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java index 34a236838dcc..1498e3fed247 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java @@ -31,7 +31,7 @@ List tokenize(@Nullable String infixTagExpression) { if (infixTagExpression == null) { return List.of(); } - List parts = new ArrayList<>(); + var parts = new ArrayList(); Matcher matcher = PATTERN.matcher(infixTagExpression); while (matcher.find()) { parts.add(new Token(matcher.start(), matcher.group())); diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java index cf78931aca0d..11086d0acc40 100644 --- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java +++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java @@ -133,7 +133,7 @@ private Optional findAncestor(TestIdentifier testIdentifier, Pre private List getAncestors(TestIdentifier testIdentifier) { TestIdentifier current = testIdentifier; - List ancestors = new ArrayList<>(); + var ancestors = new ArrayList(); while (current != null) { ancestors.add(current); current = this.testPlan.getParent(current).orElse(null); diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java index 9b0d216a2d59..ec39ba586fdd 100644 --- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java +++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java @@ -172,7 +172,7 @@ private void writeSuiteAttributes(TestIdentifier testIdentifier, Collection testResults) throws XMLStreamException { Map counts = testResults.stream().map(it -> it.type).collect( groupingBy(identity(), counting())); - long total = counts.values().stream().mapToLong(Long::longValue).sum(); + var total = counts.values().stream().mapToLong(Long::longValue).sum(); writeAttributeSafely("tests", String.valueOf(total)); writeAttributeSafely("skipped", counts.getOrDefault(SKIPPED, 0L).toString()); writeAttributeSafely("failures", counts.getOrDefault(FAILURE, 0L).toString()); @@ -205,8 +205,8 @@ private void writeTestcase(TestIdentifier testIdentifier, AggregatedTestResult t writeSkippedOrErrorOrFailureElement(testIdentifier, testResult); - List systemOutElements = new ArrayList<>(); - List systemErrElements = new ArrayList<>(); + var systemOutElements = new ArrayList(); + var systemErrElements = new ArrayList(); systemOutElements.add(formatNonStandardAttributesAsString(testIdentifier)); collectReportEntries(testIdentifier, systemOutElements, systemErrElements); writeOutputElements("system-out", systemOutElements); @@ -280,11 +280,11 @@ private void collectReportEntries(TestIdentifier testIdentifier, List sy List systemErrElements) { List entries = reportData.getReportEntries(testIdentifier); if (!entries.isEmpty()) { - List systemOutElementsForCapturedOutput = new ArrayList<>(); + var systemOutElementsForCapturedOutput = new ArrayList(); StringBuilder formattedReportEntries = new StringBuilder(); - for (int i = 0; i < entries.size(); i++) { + for (var i = 0; i < entries.size(); i++) { ReportEntry reportEntry = entries.get(i); - Map keyValuePairs = new LinkedHashMap<>(reportEntry.getKeyValuePairs()); + var keyValuePairs = new LinkedHashMap(reportEntry.getKeyValuePairs()); removeIfPresentAndAddAsSeparateElement(keyValuePairs, STDOUT_REPORT_ENTRY_KEY, systemOutElementsForCapturedOutput); removeIfPresentAndAddAsSeparateElement(keyValuePairs, STDERR_REPORT_ENTRY_KEY, systemErrElements); @@ -468,8 +468,8 @@ public void write(char[] cbuf, int off, int len) throws IOException { return; } StringBuilder stringBuilder = new StringBuilder(len * 2); - for (int i = off; i < off + len; i++) { - char c = cbuf[i]; + for (var i = off; i < off + len; i++) { + var c = cbuf[i]; String replacement = REPLACEMENTS_IN_ATTRIBUTE_VALUES.get(c); if (replacement != null) { stringBuilder.append(replacement); diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/GitInfoCollector.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/GitInfoCollector.java index 72120b9aa0c7..29140efc222a 100644 --- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/GitInfoCollector.java +++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/GitInfoCollector.java @@ -34,7 +34,7 @@ interface GitInfoCollector { static Optional get(Path workingDir) { ProcessExecutor executor = new ProcessExecutor(workingDir); - boolean gitInstalled = executor.exec("git", "--version").isPresent(); + var gitInstalled = executor.exec("git", "--version").isPresent(); return gitInstalled ? Optional.of(new CliGitInfoCollector(executor)) : Optional.empty(); } @@ -144,7 +144,7 @@ Optional exec(String... args) { // ignore }); - boolean terminated = process.waitFor(10, TimeUnit.SECONDS); + var terminated = process.waitFor(10, TimeUnit.SECONDS); return terminated && process.exitValue() == 0 ? Optional.of(trimAtEnd(output)) : Optional.empty(); } catch (InterruptedException e) { @@ -182,8 +182,8 @@ private static void readAllChars(Reader reader, BiConsumer cons } private static String trimAtEnd(StringBuilder value) { - int endIndex = value.length(); - for (int i = value.length() - 1; i >= 0; i--) { + var endIndex = value.length(); + for (var i = value.length() - 1; i >= 0; i--) { if (Character.isWhitespace(value.charAt(i))) { endIndex--; break; diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitContributor.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitContributor.java index f99d41ccd345..088b695bbbfc 100644 --- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitContributor.java +++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitContributor.java @@ -15,7 +15,6 @@ import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; import java.util.Optional; import org.apiguardian.api.API; @@ -43,7 +42,7 @@ public JUnitContributor() { public List
contributeSectionsForTestNode(Context context) { return findChild(context.element(), Namespace.REPORTING_CORE, "metadata") // .map(metadata -> { - Map table = new LinkedHashMap<>(); + var table = new LinkedHashMap(); findChild(metadata, JUnitFactory.NAMESPACE, "type") // .map(Node::getTextContent) // .ifPresent(value -> table.put("Type", value)); @@ -66,7 +65,7 @@ public List
contributeSectionsForTestNode(Context context) { private static Optional findChild(Node parent, Namespace namespace, String localName) { NodeList children = parent.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) { + for (var i = 0; i < children.getLength(); i++) { Node child = children.item(i); if (localName.equals(child.getLocalName()) && namespace.getUri().equals(child.getNamespaceURI())) { return Optional.of(child); diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java index dd4074a66361..584cf2af048e 100644 --- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java +++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java @@ -123,7 +123,7 @@ private static boolean containsCycle(UniqueId id) { List segments = id.getSegments(); List engineAndSuiteSegment = segments.subList(segments.size() - 2, segments.size()); List ancestorSegments = segments.subList(0, segments.size() - 2); - for (int i = 0; i < ancestorSegments.size() - 1; i++) { + for (var i = 0; i < ancestorSegments.size() - 1; i++) { List candidate = ancestorSegments.subList(i, i + 2); if (engineAndSuiteSegment.equals(candidate)) { return true; diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java index f468c70ec799..b1e46259576f 100644 --- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java +++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java @@ -39,7 +39,7 @@ class SuiteLauncher { private final EngineDiscoveryOrchestrator discoveryOrchestrator; static SuiteLauncher create() { - Set engines = new LinkedHashSet<>(); + var engines = new LinkedHashSet(); new ServiceLoaderTestEngineRegistry().loadTestEngines().forEach(engines::add); return new SuiteLauncher(engines); } diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java index 923a25c57996..aef3df1c1f57 100644 --- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java +++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java @@ -253,7 +253,7 @@ private record DiscoveryIssueForwardingListener(EngineDiscoveryListener discover private static final Predicate SUITE_SEGMENTS = where(Segment::getType, isEqual(SEGMENT_TYPE)); static DiscoveryIssueForwardingListener create(UniqueId id, EngineDiscoveryListener discoveryListener) { - boolean isNestedSuite = id.getSegments().stream().filter(SUITE_SEGMENTS).count() > 1; + var isNestedSuite = id.getSegments().stream().filter(SUITE_SEGMENTS).count() > 1; if (isNestedSuite) { return new DiscoveryIssueForwardingListener(discoveryListener, (__, issue) -> issue); } diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java index e99f92ff8d56..5e95b3ab46e3 100644 --- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java +++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java @@ -219,7 +219,7 @@ public static Condition nestedContainer(Class clazz) { Preconditions.notNull(clazz, "Class must not be null"); Preconditions.notNull(clazz.getEnclosingClass(), () -> clazz.getName() + " must be a nested class"); - List classNames = new ArrayList<>(); + var classNames = new ArrayList(); for (Class current = clazz; current != null; current = current.getEnclosingClass()) { classNames.add(0, current.getSimpleName()); } diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java index 5755925f4234..6a5c261afd67 100644 --- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java +++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java @@ -419,7 +419,7 @@ private static void assertEventsMatchExactly(List events, Condition events, Conditio } private static boolean isNotInIncreasingOrder(List indices) { - List copy = new ArrayList<>(indices); + var copy = new ArrayList(indices); sort(copy); return !indices.equals(copy); diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java index 2e7c3dd3ff32..76ba144a9b58 100644 --- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java +++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Stream; @@ -251,8 +250,8 @@ private Stream executionsByTerminationInfo(Predicate * Create executions from the supplied list of events. */ private static List createExecutions(List events) { - List executions = new ArrayList<>(); - Map executionStarts = new HashMap<>(); + var executions = new ArrayList(); + var executionStarts = new HashMap(); for (Event event : events) { switch (event.getType()) { diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java index 8c7a03a54472..1709cb742b7e 100644 --- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java +++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java @@ -66,7 +66,7 @@ public static TerminationInfo executed(TestExecutionResult testExecutionResult) private TerminationInfo(boolean skipped, @Nullable String skipReason, @Nullable TestExecutionResult testExecutionResult) { - boolean executed = (testExecutionResult != null); + var executed = (testExecutionResult != null); Preconditions.condition((skipped ^ executed), "TerminationInfo must represent either a skipped execution or a TestExecutionResult but not both"); diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java index 915e3c18d713..5a86f6960a2f 100644 --- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java +++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java @@ -22,11 +22,11 @@ private DescriptionUtils() { public static @Nullable String getMethodName(Description description) { String displayName = description.getDisplayName(); - int i = displayName.indexOf('('); + var i = displayName.indexOf('('); if (i >= 0) { - int j = displayName.lastIndexOf('('); + var j = displayName.lastIndexOf('('); if (i == j) { - char lastChar = displayName.charAt(displayName.length() - 1); + var lastChar = displayName.charAt(displayName.length() - 1); if (lastChar == ')') { return displayName.substring(0, i); } diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java index 4eec2ddd33e1..6262a1f2448f 100644 --- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java +++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java @@ -79,7 +79,7 @@ public Runner getRunner() { @Override protected boolean tryToExcludeFromRunner(Description description) { - boolean excluded = tryToFilterRunner(description); + var excluded = tryToFilterRunner(description); if (excluded) { wasFiltered = true; } diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java index 638eb2f0761a..ce26c8d43cb1 100644 --- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java +++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java @@ -83,7 +83,7 @@ public Type getType() { @Override public Set getTags() { - Set tags = new LinkedHashSet<>(); + var tags = new LinkedHashSet(); addTagsFromParent(tags); addCategoriesAsTags(tags); return tags; diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java index 8c98ea114e84..000bff7ed787 100644 --- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java +++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java @@ -54,7 +54,7 @@ private void addChildrenRecursively(VintageTestDescriptor parent) { String uniqueId = entry.getKey(); List childrenWithSameUniqueId = entry.getValue(); IntFunction uniqueIdGenerator = determineUniqueIdGenerator(uniqueId, childrenWithSameUniqueId); - for (int index = 0; index < childrenWithSameUniqueId.size(); index++) { + for (var index = 0; index < childrenWithSameUniqueId.size(); index++) { String reallyUniqueId = uniqueIdGenerator.apply(index); Description description = childrenWithSameUniqueId.get(index); UniqueId id = parent.getUniqueId().append(VintageTestDescriptor.SEGMENT_TYPE_TEST, reallyUniqueId); diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java index 14ec702d97fd..30ae87457e83 100644 --- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java +++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java @@ -55,7 +55,7 @@ private void ensureInitialized() { private Deque determinePath(RunnerTestDescriptor runnerTestDescriptor, Optional identifiedTestDescriptor) { - Deque path = new ArrayDeque<>(); + var path = new ArrayDeque(); Optional current = identifiedTestDescriptor; while (current.isPresent() && !current.get().equals(runnerTestDescriptor)) { path.addFirst(((VintageTestDescriptor) current.get()).getDescription()); diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java index e60f77928b08..5b88e683a903 100644 --- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java +++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java @@ -88,7 +88,7 @@ Collection getInProgressTestDescriptorsWithSyntheticStartEvents( } Collection getInProgressTestDescriptors() { - List result = new ArrayList<>(inProgressDescriptors.keySet()); + var result = new ArrayList(inProgressDescriptors.keySet()); Collections.reverse(result); return result; } @@ -218,8 +218,7 @@ private static class VintageDescriptors { private int skippedOrStartedCount; static VintageDescriptors merge(VintageDescriptors a, VintageDescriptors b) { - List mergedDescriptors = new ArrayList<>( - a.descriptors.size() + b.descriptors.size()); + var mergedDescriptors = new ArrayList(a.descriptors.size() + b.descriptors.size()); mergedDescriptors.addAll(a.descriptors); mergedDescriptors.addAll(b.descriptors); return new VintageDescriptors(mergedDescriptors); diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/VintageExecutor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/VintageExecutor.java index e8c1cfef0dc4..3379dd08e6dc 100644 --- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/VintageExecutor.java +++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/VintageExecutor.java @@ -80,7 +80,7 @@ public void executeAllChildren(CancellationToken cancellationToken) { return; } - boolean wasInterrupted = executeInParallel(cancellationToken); + var wasInterrupted = executeInParallel(cancellationToken); if (wasInterrupted) { Thread.currentThread().interrupt(); } @@ -112,7 +112,7 @@ private int getThreadPoolSize() { Optional optionalPoolSize = configurationParameters.get(Constants.PARALLEL_POOL_SIZE); if (optionalPoolSize.isPresent()) { try { - int poolSize = Integer.parseInt(optionalPoolSize.get()); + var poolSize = Integer.parseInt(optionalPoolSize.get()); if (poolSize > 0) { return poolSize; } @@ -147,7 +147,7 @@ private void executeClassesSequentially(List runnerTestDes private boolean executeClassesInParallel(List runnerTestDescriptors, RunnerExecutor runnerExecutor, ExecutorService executorService) { - List> futures = new ArrayList<>(); + var futures = new ArrayList>(); for (RunnerTestDescriptor runnerTestDescriptor : runnerTestDescriptors) { CompletableFuture future = CompletableFuture.runAsync( () -> runnerExecutor.execute(runnerTestDescriptor), executorService); @@ -155,7 +155,7 @@ private boolean executeClassesInParallel(List runnerTestDe } CompletableFuture allOf = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])); - boolean wasInterrupted = false; + var wasInterrupted = false; try { allOf.get(); } diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java index 37f5c115637c..17053e9878c4 100644 --- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java +++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java @@ -40,7 +40,7 @@ class JUnit4ParameterizedTests { void selectingWholeParameterizedClassRunsTestsWithAllValues() { executeTests(selectClass(JUnit4ParameterizedTestCase.class)); - Map expectedCallCounts = new HashMap<>(); + var expectedCallCounts = new HashMap(); expectedCallCounts.put(SUCCESSFUL, 3); expectedCallCounts.put(FAILED, 9); diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java index 4ae6d522dfc3..5b64e7d8b14b 100644 --- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java +++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java @@ -266,7 +266,7 @@ private TestPlan discover(LauncherDiscoveryRequestBuilder requestBuilder) { } private Map execute(LauncherDiscoveryRequestBuilder requestBuilder) { - Map results = new LinkedHashMap<>(); + var results = new LinkedHashMap(); var launcher = LauncherFactory.create(); var listener = new TestExecutionListener() { @Override diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java index bf35843dbfcf..78a573e8bdff 100644 --- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java +++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java @@ -209,7 +209,7 @@ void resolvesJUnit4TestCaseWithIndistinguishableOverloadedMethod() { var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); assertRunnerTestDescriptor(runnerDescriptor, testClass); - List testMethodDescriptors = new ArrayList<>(runnerDescriptor.getChildren()); + var testMethodDescriptors = new ArrayList(runnerDescriptor.getChildren()); assertThat(testMethodDescriptors).hasSize(2); var testMethodDescriptor = testMethodDescriptors.getFirst(); @@ -235,7 +235,7 @@ void resolvesJUnit4TestCaseWithDistinguishableOverloadedMethod() throws Exceptio var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); assertRunnerTestDescriptor(runnerDescriptor, testClass); - List testMethodDescriptors = new ArrayList<>(runnerDescriptor.getChildren()); + var testMethodDescriptors = new ArrayList(runnerDescriptor.getChildren()); var testMethodDescriptor = getOnlyElement(testMethodDescriptors); assertEquals("test", testMethodDescriptor.getDisplayName()); @@ -442,7 +442,7 @@ void resolvesMethodSelectorForTwoMethodsOfSameClass() throws Exception { var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); assertRunnerTestDescriptor(runnerDescriptor, testClass); - List testMethodDescriptors = new ArrayList<>(runnerDescriptor.getChildren()); + var testMethodDescriptors = new ArrayList(runnerDescriptor.getChildren()); assertThat(testMethodDescriptors).hasSize(2); var failingTest = testMethodDescriptors.get(0); @@ -536,7 +536,7 @@ void resolvesMultipleUniqueIdSelectorsForMethodsOfSameClass() throws Exception { var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); assertRunnerTestDescriptor(runnerDescriptor, testClass); - List testMethodDescriptors = new ArrayList<>(runnerDescriptor.getChildren()); + var testMethodDescriptors = new ArrayList(runnerDescriptor.getChildren()); assertThat(testMethodDescriptors).hasSize(2); assertTestMethodDescriptor(testMethodDescriptors.get(0), testClass, "failingTest", VintageUniqueIdBuilder.uniqueIdForClass(testClass)); @@ -588,7 +588,7 @@ void resolvesCombinationOfMethodAndUniqueIdSelector() throws Exception { var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren()); assertRunnerTestDescriptor(runnerDescriptor, testClass); - List testMethodDescriptors = new ArrayList<>(runnerDescriptor.getChildren()); + var testMethodDescriptors = new ArrayList(runnerDescriptor.getChildren()); assertThat(testMethodDescriptors).hasSize(2); assertTestMethodDescriptor(testMethodDescriptors.get(0), testClass, "abortedTest", VintageUniqueIdBuilder.uniqueIdForClass(testClass)); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java index 90eafaf27f87..71600e19f9e5 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java @@ -36,7 +36,7 @@ class AssertDoesNotThrowAssertionsTests { @Test void assertDoesNotThrowWithMethodReferenceForNonVoidReturnType() { - FutureTask future = new FutureTask<>(() -> "foo"); + var future = new FutureTask(() -> "foo"); future.run(); String result; diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java index ec30168e7605..598c3158bcaf 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java @@ -654,7 +654,7 @@ void shorts() { @Test void integers() { - int primitive = 42; + var primitive = 42; Integer wrapper = Integer.valueOf("42"); assertEquals(primitive, wrapper); @@ -668,7 +668,7 @@ void integers() { @Test void longs() { - long primitive = 42L; + var primitive = 42L; Long wrapper = Long.valueOf("42"); assertEquals(primitive, wrapper); @@ -682,7 +682,7 @@ void longs() { @Test void floats() { - float primitive = 42.0f; + var primitive = 42.0f; Float wrapper = Float.valueOf("42.0"); assertEquals(primitive, wrapper); @@ -702,7 +702,7 @@ void floats() { @Test void doubles() { - double primitive = 42.0d; + var primitive = 42.0d; Double wrapper = Double.valueOf("42.0"); assertEquals(primitive, wrapper); @@ -722,7 +722,7 @@ void doubles() { @Test void booleans() { - boolean primitive = true; + var primitive = true; Boolean wrapper = Boolean.valueOf("true"); assertEquals(primitive, wrapper); @@ -736,7 +736,7 @@ void booleans() { @Test void chars() { - char primitive = 'a'; + var primitive = 'a'; Character wrapper = Character.valueOf('a'); assertEquals(primitive, wrapper); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java index 842e7f463a8f..b052bda48584 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java @@ -141,8 +141,8 @@ class AssertNotEqualsChar { @Test void assertNotEqualsChar() { - char unexpected = 'a'; - char actual = 'b'; + var unexpected = 'a'; + var actual = 'b'; assertNotEquals(unexpected, actual); assertNotEquals(unexpected, actual, "message"); assertNotEquals(unexpected, actual, () -> "message"); @@ -150,8 +150,8 @@ void assertNotEqualsChar() { @Test void withEqualValues() { - char unexpected = 'a'; - char actual = 'a'; + var unexpected = 'a'; + var actual = 'a'; try { assertNotEquals(unexpected, actual); expectAssertionFailedError(); @@ -163,8 +163,8 @@ void withEqualValues() { @Test void withEqualValuesWithMessage() { - char unexpected = 'a'; - char actual = 'a'; + var unexpected = 'a'; + var actual = 'a'; try { assertNotEquals(unexpected, actual, "custom message"); expectAssertionFailedError(); @@ -177,8 +177,8 @@ void withEqualValuesWithMessage() { @Test void withEqualValuesWithMessageSupplier() { - char unexpected = 'a'; - char actual = 'a'; + var unexpected = 'a'; + var actual = 'a'; try { assertNotEquals(unexpected, actual, () -> "custom message from supplier"); expectAssertionFailedError(); @@ -196,8 +196,8 @@ class AssertNotEqualsInt { @Test void assertNotEqualsInt() { - int unexpected = 1; - int actual = 2; + var unexpected = 1; + var actual = 2; assertNotEquals(unexpected, actual); assertNotEquals(unexpected, actual, "message"); assertNotEquals(unexpected, actual, () -> "message"); @@ -205,8 +205,8 @@ void assertNotEqualsInt() { @Test void withEqualValues() { - int unexpected = 1; - int actual = 1; + var unexpected = 1; + var actual = 1; try { assertNotEquals(unexpected, actual); expectAssertionFailedError(); @@ -218,8 +218,8 @@ void withEqualValues() { @Test void withEqualValuesWithMessage() { - int unexpected = 1; - int actual = 1; + var unexpected = 1; + var actual = 1; try { assertNotEquals(unexpected, actual, "custom message"); expectAssertionFailedError(); @@ -232,8 +232,8 @@ void withEqualValuesWithMessage() { @Test void withEqualValuesWithMessageSupplier() { - int unexpected = 1; - int actual = 1; + var unexpected = 1; + var actual = 1; try { assertNotEquals(unexpected, actual, () -> "custom message from supplier"); expectAssertionFailedError(); @@ -251,8 +251,8 @@ class AssertNotEqualsLong { @Test void assertNotEqualsLong() { - long unexpected = 1L; - long actual = 2L; + var unexpected = 1L; + var actual = 2L; assertNotEquals(unexpected, actual); assertNotEquals(unexpected, actual, "message"); assertNotEquals(unexpected, actual, () -> "message"); @@ -260,8 +260,8 @@ void assertNotEqualsLong() { @Test void withEqualValues() { - long unexpected = 1L; - long actual = 1L; + var unexpected = 1L; + var actual = 1L; try { assertNotEquals(unexpected, actual); expectAssertionFailedError(); @@ -273,8 +273,8 @@ void withEqualValues() { @Test void withEqualValuesWithMessage() { - long unexpected = 1L; - long actual = 1L; + var unexpected = 1L; + var actual = 1L; try { assertNotEquals(unexpected, actual, "custom message"); expectAssertionFailedError(); @@ -287,8 +287,8 @@ void withEqualValuesWithMessage() { @Test void withEqualValuesWithMessageSupplier() { - long unexpected = 1L; - long actual = 1L; + var unexpected = 1L; + var actual = 1L; try { assertNotEquals(unexpected, actual, () -> "custom message from supplier"); expectAssertionFailedError(); @@ -306,8 +306,8 @@ class AssertNotEqualsFloatWithoutDelta { @Test void assertNotEqualsFloat() { - float unexpected = 1.0f; - float actual = 2.0f; + var unexpected = 1.0f; + var actual = 2.0f; assertNotEquals(unexpected, actual); assertNotEquals(unexpected, actual, "message"); assertNotEquals(unexpected, actual, () -> "message"); @@ -348,8 +348,8 @@ void assertNotEqualsForNegativeInfinityFloat() { @Test void withEqualValues() { - float unexpected = 1.0f; - float actual = 1.0f; + var unexpected = 1.0f; + var actual = 1.0f; try { assertNotEquals(unexpected, actual); expectAssertionFailedError(); @@ -361,8 +361,8 @@ void withEqualValues() { @Test void withEqualValuesWithMessage() { - float unexpected = 1.0f; - float actual = 1.0f; + var unexpected = 1.0f; + var actual = 1.0f; try { assertNotEquals(unexpected, actual, "custom message"); expectAssertionFailedError(); @@ -375,8 +375,8 @@ void withEqualValuesWithMessage() { @Test void withEqualValuesWithMessageSupplier() { - float unexpected = 1.0f; - float actual = 1.0f; + var unexpected = 1.0f; + var actual = 1.0f; try { assertNotEquals(unexpected, actual, () -> "custom message from supplier"); expectAssertionFailedError(); @@ -401,9 +401,9 @@ void assertNotEqualsFloat() { @Test void withEqualValues() { - float unexpected = 1.0f; - float actual = 1.5f; - float delta = 0.5f; + var unexpected = 1.0f; + var actual = 1.5f; + var delta = 0.5f; try { assertNotEquals(unexpected, actual, delta); expectAssertionFailedError(); @@ -415,9 +415,9 @@ void withEqualValues() { @Test void withEqualValuesWithMessage() { - float unexpected = 1.0f; - float actual = 1.5f; - float delta = 0.5f; + var unexpected = 1.0f; + var actual = 1.5f; + var delta = 0.5f; try { assertNotEquals(unexpected, actual, delta, "custom message"); expectAssertionFailedError(); @@ -430,9 +430,9 @@ void withEqualValuesWithMessage() { @Test void withEqualValuesWithMessageSupplier() { - float unexpected = 1.0f; - float actual = 1.5f; - float delta = 0.5f; + var unexpected = 1.0f; + var actual = 1.5f; + var delta = 0.5f; try { assertNotEquals(unexpected, actual, delta, () -> "custom message from supplier"); expectAssertionFailedError(); @@ -450,8 +450,8 @@ class AssertNotEqualsDoubleWithoutDelta { @Test void assertNotEqualsDouble() { - double unexpected = 1.0d; - double actual = 2.0d; + var unexpected = 1.0d; + var actual = 2.0d; assertNotEquals(unexpected, actual); assertNotEquals(unexpected, actual, "message"); assertNotEquals(unexpected, actual, () -> "message"); @@ -470,8 +470,8 @@ void assertNotEqualsForTwoNaNDouble() { @Test void withEqualValues() { - double unexpected = 1.0d; - double actual = 1.0d; + var unexpected = 1.0d; + var actual = 1.0d; try { assertNotEquals(unexpected, actual); expectAssertionFailedError(); @@ -483,8 +483,8 @@ void withEqualValues() { @Test void withEqualValuesWithMessage() { - double unexpected = 1.0d; - double actual = 1.0d; + var unexpected = 1.0d; + var actual = 1.0d; try { assertNotEquals(unexpected, actual, "custom message"); expectAssertionFailedError(); @@ -497,8 +497,8 @@ void withEqualValuesWithMessage() { @Test void withEqualValuesWithMessageSupplier() { - double unexpected = 1.0d; - double actual = 1.0d; + var unexpected = 1.0d; + var actual = 1.0d; try { assertNotEquals(unexpected, actual, () -> "custom message from supplier"); expectAssertionFailedError(); @@ -523,9 +523,9 @@ void assertNotEqualsDouble() { @Test void withEqualValues() { - double unexpected = 1.0d; - double actual = 1.5d; - double delta = 0.5d; + var unexpected = 1.0d; + var actual = 1.5d; + var delta = 0.5d; try { assertNotEquals(unexpected, actual, delta); expectAssertionFailedError(); @@ -537,9 +537,9 @@ void withEqualValues() { @Test void withEqualValuesWithMessage() { - double unexpected = 1.0d; - double actual = 1.5d; - double delta = 0.5d; + var unexpected = 1.0d; + var actual = 1.5d; + var delta = 0.5d; try { assertNotEquals(unexpected, actual, delta, "custom message"); expectAssertionFailedError(); @@ -552,9 +552,9 @@ void withEqualValuesWithMessage() { @Test void withEqualValuesWithMessageSupplier() { - double unexpected = 1.0d; - double actual = 1.5d; - double delta = 0.5d; + var unexpected = 1.0d; + var actual = 1.5d; + var delta = 0.5d; try { assertNotEquals(unexpected, actual, delta, () -> "custom message from supplier"); expectAssertionFailedError(); @@ -659,7 +659,7 @@ void shorts() { @Test void integers() { - int primitive = 42; + var primitive = 42; Integer wrapper = Integer.valueOf("99"); assertNotEquals(primitive, wrapper); @@ -673,7 +673,7 @@ void integers() { @Test void longs() { - long primitive = 42L; + var primitive = 42L; Long wrapper = Long.valueOf("99"); assertNotEquals(primitive, wrapper); @@ -687,7 +687,7 @@ void longs() { @Test void floats() { - float primitive = 42.0f; + var primitive = 42.0f; Float wrapper = Float.valueOf("99.0"); assertNotEquals(primitive, wrapper); @@ -707,7 +707,7 @@ void floats() { @Test void doubles() { - double primitive = 42.0d; + var primitive = 42.0d; Double wrapper = Double.valueOf("99.0"); assertNotEquals(primitive, wrapper); @@ -727,7 +727,7 @@ void doubles() { @Test void booleans() { - boolean primitive = true; + var primitive = true; Boolean wrapper = Boolean.valueOf("false"); assertNotEquals(primitive, wrapper); @@ -741,7 +741,7 @@ void booleans() { @Test void chars() { - char primitive = 'a'; + var primitive = 'a'; Character wrapper = Character.valueOf('z'); assertNotEquals(primitive, wrapper); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java index 1ee81d533990..c8ef857b02ae 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java @@ -86,7 +86,7 @@ void assertSameWithDifferentObjects() { @Test void assertSameWithEqualPrimitivesAutoboxedToDifferentWrappers() { try { - int i = 999; + var i = 999; assertSame(i, i); expectAssertionFailedError(); } diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java index 9f9e3edf4131..7def611d29f1 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java @@ -41,7 +41,7 @@ class AssertThrowsAssertionsTests { @Test void assertThrowsWithMethodReferenceForNonVoidReturnType() { - FutureTask future = new FutureTask<>(() -> { + var future = new FutureTask(() -> { throw new RuntimeException("boom"); }); future.run(); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java index ea683191e03e..d335456fbd0b 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java @@ -81,7 +81,7 @@ void assertThrowsExactlyWithTheExpectedParentException() { @Test void assertThrowsWithMethodReferenceForNonVoidReturnType() { - FutureTask future = new FutureTask<>(() -> { + var future = new FutureTask(() -> { throw new RuntimeException("boom"); }); future.run(); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java index 932598229940..e761121ca5b7 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java @@ -153,7 +153,7 @@ void assertTimeoutWithMessageSupplierForSupplierThatCompletesAfterTheTimeout() { * Take a nap for 100 milliseconds. */ private void nap() throws InterruptedException { - long start = System.nanoTime(); + var start = System.nanoTime(); // workaround for imprecise clocks (yes, Windows, I'm talking about you) do { Thread.sleep(100); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java index 5a7dc972c8a8..fd993c929595 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java @@ -188,7 +188,7 @@ void assertTimeoutPreemptivelyWithMessageSupplierForSupplierThatCompletesAfterTh @Test void assertTimeoutPreemptivelyUsesThreadsWithSpecificNamePrefix() { - AtomicReference threadName = new AtomicReference<>(""); + var threadName = new AtomicReference(""); assertTimeoutPreemptively(ofMillis(1000), () -> threadName.set(Thread.currentThread().getName())); assertThat(threadName.get()) // .withFailMessage("Thread name does not match the expected prefix") // diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssumptionsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssumptionsTests.java index 499704bf6604..fd286e67192e 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/api/AssumptionsTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/api/AssumptionsTests.java @@ -20,7 +20,6 @@ import static org.junit.jupiter.api.Assumptions.assumingThat; import java.util.ArrayList; -import java.util.List; import java.util.Objects; import org.jspecify.annotations.Nullable; @@ -163,7 +162,7 @@ void assumeFalseWithBooleanTrueAndMessageSupplier() { @Test void assumingThatWithBooleanTrue() { - List list = new ArrayList<>(); + var list = new ArrayList(); assumingThat(true, () -> list.add("test")); assertEquals(1, list.size()); assertEquals("test", list.getFirst()); @@ -171,7 +170,7 @@ void assumingThatWithBooleanTrue() { @Test void assumingThatWithBooleanSupplierTrue() { - List list = new ArrayList<>(); + var list = new ArrayList(); assumingThat(() -> true, () -> list.add("test")); assertEquals(1, list.size()); assertEquals("test", list.getFirst()); @@ -179,14 +178,14 @@ void assumingThatWithBooleanSupplierTrue() { @Test void assumingThatWithBooleanFalse() { - List list = new ArrayList<>(); + var list = new ArrayList(); assumingThat(false, () -> list.add("test")); assertEquals(0, list.size()); } @Test void assumingThatWithBooleanSupplierFalse() { - List list = new ArrayList<>(); + var list = new ArrayList(); assumingThat(() -> false, () -> list.add("test")); assertEquals(0, list.size()); } diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java index 2a9c56d7307a..a4fa22da757a 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java @@ -142,7 +142,7 @@ void failWithNullStringAndThrowable() { @Test void failUsableAsAnExpression() { // @formatter:off - long count = Stream.empty() + var count = Stream.empty() .peek(element -> fail("peek should never be called")) .filter(element -> fail("filter should never be called", new Throwable("cause"))) .map(element -> Assertions. fail(new Throwable("map should never be called"))) diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/ReportingTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/ReportingTests.java index 26cc221c09e8..9998066412e7 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/ReportingTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/ReportingTests.java @@ -119,7 +119,7 @@ void succeedingTest(TestReporter reporter) { void invalidReportData(TestReporter reporter) { // Maps - Map map = new HashMap<>(); + var map = new HashMap(); map.put("key", null); assertPreconditionViolationFor(() -> reporter.publishEntry(map)); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java index 7db63a5e3021..ff0669a266d6 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java @@ -116,21 +116,21 @@ void beforeAndAfterMethodsInTestClassHierarchy() { // @formatter:on // @formatter:off - assertEquals(asList( - "beforeAll1", + assertEquals(callSequence, asList( + "beforeAll1", "beforeAll2", - "beforeAll3", - "beforeEach1", - "beforeEach2", - "beforeEach3", - "test3", - "afterEach3", - "afterEach2", - "afterEach1", - "afterAll3", + "beforeAll3", + "beforeEach1", + "beforeEach2", + "beforeEach3", + "test3", + "afterEach3", + "afterEach2", + "afterEach1", + "afterAll3", "afterAll2", - "afterAll1" - ), callSequence, "wrong call sequence"); + "afterAll1" + ), "wrong call sequence"); // @formatter:on } diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java index 1269a9735cbd..3bf6c0b07103 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java @@ -138,7 +138,7 @@ private void performAssertions(Class testClass, Map configPar executionResults.testEvents().assertStatistics(// stats -> stats.started(numTests).finished(numTests)); - assertEquals(Arrays.asList(methods), methodsInvoked); + assertEquals(methodsInvoked, Arrays.asList(methods)); } // ------------------------------------------------------------------------- diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java index c4fd1d8087c3..07d757543316 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java @@ -14,7 +14,6 @@ import static org.junit.platform.commons.util.CollectionUtils.getOnlyElement; import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; @@ -57,7 +56,7 @@ void instancePerMethodIsDefaultForKotlinTestClasses() { EngineExecutionResults executionResults = executeTestsForClass(testClass); assertThat(executionResults.testEvents().finished().count()).isEqualTo(2); - List instances = new ArrayList<>(InstancePerMethodKotlinTestCase.TEST_INSTANCES.keySet()); + var instances = new ArrayList(InstancePerMethodKotlinTestCase.TEST_INSTANCES.keySet()); assertThat(instances) // .hasSize(3) // .extracting(o -> (Object) o.getClass()) // diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java index c07035f457ef..5682b2b57aeb 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java @@ -101,11 +101,11 @@ void init() { @Test void instancePerMethod() { Class testClass = InstancePerMethodTestCase.class; - int containers = 3; - int tests = 3; + var containers = 3; + var tests = 3; Map.Entry, Integer>[] instances = instanceCounts(entry(InstancePerMethodTestCase.class, 3)); - int allMethods = 1; - int eachMethods = 3; + var allMethods = 1; + var eachMethods = 3; performAssertions(testClass, containers, tests, instances, allMethods, eachMethods); @@ -185,10 +185,10 @@ void instancePerClassWithInheritedLifecycleMode() { @SuppressWarnings("NullAway") private void instancePerClass(Class testClass, Map.Entry, Integer>[] instances) { - int containers = 3; - int tests = 3; - int allMethods = 2; - int eachMethods = 3; + var containers = 3; + var tests = 3; + var allMethods = 2; + var eachMethods = 3; performAssertions(testClass, containers, tests, instances, allMethods, eachMethods); @@ -256,11 +256,11 @@ private void instancePerClass(Class testClass, Map.Entry, Integer>[] void instancePerMethodWithNestedTestClass() { Class testClass = InstancePerMethodOuterTestCase.class; Class nestedTestClass = InstancePerMethodOuterTestCase.NestedInstancePerMethodTestCase.class; - int containers = 4; - int tests = 4; + var containers = 4; + var tests = 4; Map.Entry, Integer>[] instances = instanceCounts(entry(testClass, 4), entry(nestedTestClass, 3)); - int allMethods = 1; - int eachMethods = 3; + var allMethods = 1; + var eachMethods = 3; performAssertions(testClass, containers, tests, instances, allMethods, eachMethods); @@ -379,11 +379,11 @@ void instancePerMethodWithNestedTestClass() { void instancePerClassWithNestedTestClass() { Class testClass = InstancePerClassOuterTestCase.class; Class nestedTestClass = InstancePerClassOuterTestCase.NestedInstancePerClassTestCase.class; - int containers = 4; - int tests = 4; + var containers = 4; + var tests = 4; Map.Entry, Integer>[] instances = instanceCounts(entry(testClass, 1), entry(nestedTestClass, 1)); - int allMethods = 2; - int eachMethods = 3; + var allMethods = 2; + var eachMethods = 3; performAssertions(testClass, containers, tests, instances, allMethods, eachMethods); @@ -500,11 +500,11 @@ void instancePerClassWithNestedTestClass() { void instancePerMethodOnOuterTestClassWithInstancePerClassOnNestedTestClass() { Class testClass = MixedLifecyclesOuterTestCase.class; Class nestedTestClass = MixedLifecyclesOuterTestCase.NestedInstancePerClassTestCase.class; - int containers = 4; - int tests = 4; + var containers = 4; + var tests = 4; Map.Entry, Integer>[] instances = instanceCounts(entry(testClass, 2), entry(nestedTestClass, 1)); - int allMethods = 1; - int eachMethods = 7; + var allMethods = 1; + var eachMethods = 7; performAssertions(testClass, containers, tests, instances, allMethods, eachMethods); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java index df79d780076f..d45c3dd93ae3 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java @@ -23,7 +23,6 @@ import java.nio.file.Path; import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.Optional; import java.util.function.Supplier; @@ -154,7 +153,7 @@ void shouldGetStandardAsDefaultTempDirFactorySupplierWithoutConfigParamSet() { @Test void doesNotReportAnyIssuesIfConfigurationParametersAreEmpty() { - List issues = new ArrayList<>(); + var issues = new ArrayList(); new DefaultJupiterConfiguration(configurationParameters(Map.of()), dummyOutputDirectoryCreator(), DiscoveryIssueReporter.collecting(issues)).getDefaultTestInstanceLifecycle(); @@ -168,7 +167,7 @@ void doesNotReportAnyIssuesIfParallelExecutionIsEnabledAndConfigurationParameter ParallelExecutorServiceType executorServiceType) { var parameters = Map.of(JupiterConfiguration.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, true, // JupiterConfiguration.PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME, executorServiceType); - List issues = new ArrayList<>(); + var issues = new ArrayList(); new DefaultJupiterConfiguration(ConfigurationParametersFactoryForTests.create(parameters), dummyOutputDirectoryCreator(), DiscoveryIssueReporter.collecting(issues)).getDefaultTestInstanceLifecycle(); @@ -179,7 +178,7 @@ void doesNotReportAnyIssuesIfParallelExecutionIsEnabledAndConfigurationParameter @Test void asksUsersToTryWorkerThreadPoolHierarchicalExecutorServiceIfParallelExecutionIsEnabled() { var parameters = Map.of(JupiterConfiguration.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, true); - List issues = new ArrayList<>(); + var issues = new ArrayList(); new DefaultJupiterConfiguration(configurationParameters(parameters), dummyOutputDirectoryCreator(), DiscoveryIssueReporter.collecting(issues)).getDefaultTestInstanceLifecycle(); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java index 0f8f6b630c38..4f2c601eaedf 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java @@ -41,7 +41,7 @@ void shouldInstantiateConfiguredClass(LogRecordListener listener) { ConfigurationParameters configurationParameters = mock(); when(configurationParameters.get(KEY)).thenReturn(Optional.of(CustomDisplayNameGenerator.class.getName())); - InstantiatingConfigurationParameterConverter converter = new InstantiatingConfigurationParameterConverter<>( + var converter = new InstantiatingConfigurationParameterConverter( DisplayNameGenerator.class, "display name generator"); DisplayNameGenerator displayNameGenerator = converter.get(configurationParameters, KEY).orElseThrow(); @@ -57,7 +57,7 @@ void shouldReturnEmptyOptionalIfNoConfigurationFound() { ConfigurationParameters configurationParameters = mock(); when(configurationParameters.get(KEY)).thenReturn(Optional.empty()); - InstantiatingConfigurationParameterConverter converter = new InstantiatingConfigurationParameterConverter<>( + var converter = new InstantiatingConfigurationParameterConverter( DisplayNameGenerator.class, "display name generator"); Optional displayNameGenerator = converter.get(configurationParameters, KEY); @@ -69,7 +69,7 @@ void shouldReturnEmptyOptionalIfConfigurationIsBlank() { ConfigurationParameters configurationParameters = mock(); when(configurationParameters.get(KEY)).thenReturn(Optional.of("")); - InstantiatingConfigurationParameterConverter converter = new InstantiatingConfigurationParameterConverter<>( + var converter = new InstantiatingConfigurationParameterConverter( DisplayNameGenerator.class, "display name generator"); Optional displayNameGenerator = converter.get(configurationParameters, KEY); @@ -82,7 +82,7 @@ void shouldTrimAndInstantiateConfiguredClass(LogRecordListener listener) { String classNameWithSpaces = " " + CustomDisplayNameGenerator.class.getName() + " "; when(configurationParameters.get(KEY)).thenReturn(Optional.of(classNameWithSpaces)); - InstantiatingConfigurationParameterConverter converter = new InstantiatingConfigurationParameterConverter<>( + var converter = new InstantiatingConfigurationParameterConverter( DisplayNameGenerator.class, "display name generator"); DisplayNameGenerator displayNameGenerator = converter.get(configurationParameters, KEY).orElseThrow(); @@ -98,7 +98,7 @@ void shouldReturnEmptyOptionalIfNoClassFound(LogRecordListener listener) { ConfigurationParameters configurationParameters = mock(); when(configurationParameters.get(KEY)).thenReturn(Optional.of("random-string")); - InstantiatingConfigurationParameterConverter converter = new InstantiatingConfigurationParameterConverter<>( + var converter = new InstantiatingConfigurationParameterConverter( DisplayNameGenerator.class, "display name generator"); Optional displayNameGenerator = converter.get(configurationParameters, KEY); @@ -114,7 +114,7 @@ void shouldReturnEmptyOptionalIfClassFoundIsNotATypeOfExpectedType(LogRecordList ConfigurationParameters configurationParameters = mock(); when(configurationParameters.get(KEY)).thenReturn(Optional.of(Object.class.getName())); - InstantiatingConfigurationParameterConverter converter = new InstantiatingConfigurationParameterConverter<>( + var converter = new InstantiatingConfigurationParameterConverter( DisplayNameGenerator.class, "display name generator"); Optional displayNameGenerator = converter.get(configurationParameters, KEY); @@ -131,7 +131,7 @@ void shouldReturnEmptyOptionalIfClassNameIsNotFullyQualified(LogRecordListener l when(configurationParameters.get(KEY)).thenReturn( Optional.of(CustomDisplayNameGenerator.class.getSimpleName())); - InstantiatingConfigurationParameterConverter converter = new InstantiatingConfigurationParameterConverter<>( + var converter = new InstantiatingConfigurationParameterConverter( DisplayNameGenerator.class, "display name generator"); Optional displayNameGenerator = converter.get(configurationParameters, KEY); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java index 661ee3178b49..3666e170a03e 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java @@ -41,8 +41,8 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon // Type variables in parameterized class for (TypeVariable typeVariable : parameterContext.getDeclaringExecutable().getDeclaringClass().getTypeParameters()) { - boolean namesMatch = typeInMethod.getTypeName().equals(typeVariable.getName()); - boolean typesAreCompatible = typeVariable.getBounds().length == 1 && // + var namesMatch = typeInMethod.getTypeName().equals(typeVariable.getName()); + var typesAreCompatible = typeVariable.getBounds().length == 1 && // typeVariable.getBounds()[0] instanceof Class clazz && // clazz.isAssignableFrom(Long.class); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java index d0e2ddf96462..43277b39a099 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java @@ -12,7 +12,6 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.util.Map; import java.util.TreeMap; import org.junit.jupiter.api.extension.ExtensionContext; @@ -41,7 +40,7 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon @Override public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { - Map map = new TreeMap<>(); + var map = new TreeMap(); map.put("key", "value"); return map; } diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java index 04ae42dd6afd..71b894c7f233 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java @@ -182,7 +182,7 @@ private void assertBeforeAllAndAfterAllCallbacks(Class testClass, int testsSt executeTestsForClass(testClass).testEvents()// .assertStatistics(stats -> stats.started(testsStarted).succeeded(testsSuccessful)); - assertEquals(asList(expectedCalls), callSequence, () -> "wrong call sequence for " + testClass.getName()); + assertEquals(callSequence, asList(expectedCalls), () -> "wrong call sequence for " + testClass.getName()); } // ------------------------------------------------------------------------- diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java index a5e6b501e1ea..623a0a18c3c3 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java @@ -64,31 +64,31 @@ void beforeEachAndAfterEachCallbacks() { assertEquals(0, testEvents.failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( + assertEquals(callSequence, asList( - // OuterTestCase - "fooBeforeEachCallback", - "barBeforeEachCallback", + // OuterTestCase + "fooBeforeEachCallback", + "barBeforeEachCallback", "beforeEachMethod", - "testOuter", + "testOuter", "afterEachMethod", - "barAfterEachCallback", - "fooAfterEachCallback", + "barAfterEachCallback", + "fooAfterEachCallback", - // InnerTestCase - "fooBeforeEachCallback", - "barBeforeEachCallback", - "fizzBeforeEachCallback", + // InnerTestCase + "fooBeforeEachCallback", + "barBeforeEachCallback", + "fizzBeforeEachCallback", "beforeEachMethod", - "beforeEachInnerMethod", - "testInner", - "afterEachInnerMethod", + "beforeEachInnerMethod", + "testInner", + "afterEachInnerMethod", "afterEachMethod", - "fizzAfterEachCallback", - "barAfterEachCallback", - "fooAfterEachCallback" + "fizzAfterEachCallback", + "barAfterEachCallback", + "fooAfterEachCallback" - ), callSequence, "wrong call sequence"); + ), "wrong call sequence"); // @formatter:on } @@ -103,13 +103,13 @@ void beforeEachAndAfterEachCallbacksDeclaredOnSuperclassAndSubclass() { assertEquals(0, testEvents.failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( - "fooBeforeEachCallback", - "barBeforeEachCallback", + assertEquals(callSequence, asList( + "fooBeforeEachCallback", + "barBeforeEachCallback", "testChild", - "barAfterEachCallback", - "fooAfterEachCallback" - ), callSequence, "wrong call sequence"); + "barAfterEachCallback", + "fooAfterEachCallback" + ), "wrong call sequence"); // @formatter:on } @@ -124,23 +124,23 @@ void beforeEachAndAfterEachCallbacksDeclaredOnInterfaceAndClass() { assertEquals(0, testEvents.failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( + assertEquals(callSequence, asList( - // Test Interface - "fooBeforeEachCallback", - "barBeforeEachCallback", + // Test Interface + "fooBeforeEachCallback", + "barBeforeEachCallback", "defaultTestMethod", - "barAfterEachCallback", - "fooAfterEachCallback", + "barAfterEachCallback", + "fooAfterEachCallback", - // Test Class - "fooBeforeEachCallback", - "barBeforeEachCallback", + // Test Class + "fooBeforeEachCallback", + "barBeforeEachCallback", "localTestMethod", - "barAfterEachCallback", - "fooAfterEachCallback" + "barAfterEachCallback", + "fooAfterEachCallback" - ), callSequence, "wrong call sequence"); + ), "wrong call sequence"); // @formatter:on } @@ -155,16 +155,16 @@ void beforeEachCallbackThrowsAnException() { assertEquals(1, testEvents.failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( - "fooBeforeEachCallback", - "exceptionThrowingBeforeEachCallback", // throws an exception. - // barBeforeEachCallback should not get invoked. + assertEquals(callSequence, asList( + "fooBeforeEachCallback", + "exceptionThrowingBeforeEachCallback", // throws an exception. + // barBeforeEachCallback should not get invoked. // beforeEachMethod should not get invoked. - // test should not get invoked. + // test should not get invoked. // afterEachMethod should not get invoked. - "barAfterEachCallback", - "fooAfterEachCallback" - ), callSequence, "wrong call sequence"); + "barAfterEachCallback", + "fooAfterEachCallback" + ), "wrong call sequence"); // @formatter:on assertThat(actualExceptionInAfterEachCallback).containsInstanceOf(EnigmaException.class); @@ -181,16 +181,16 @@ void afterEachCallbackThrowsAnException() { assertEquals(1, testEvents.failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( - "fooBeforeEachCallback", - "barBeforeEachCallback", + assertEquals(callSequence, asList( + "fooBeforeEachCallback", + "barBeforeEachCallback", "beforeEachMethod", - "test", + "test", "afterEachMethod", - "barAfterEachCallback", - "exceptionThrowingAfterEachCallback", // throws an exception. - "fooAfterEachCallback" - ), callSequence, "wrong call sequence"); + "barAfterEachCallback", + "exceptionThrowingAfterEachCallback", // throws an exception. + "fooAfterEachCallback" + ), "wrong call sequence"); // @formatter:on assertThat(actualExceptionInAfterEachCallback).containsInstanceOf(EnigmaException.class); @@ -233,7 +233,7 @@ void beforeEachMethodThrowsAnException() { List expected = beforeEachMethodCallSequence.getFirst().equals("beforeEachMethod1") ? list1 : list2; - assertEquals(expected, callSequence, "wrong call sequence"); + assertEquals(callSequence, expected, "wrong call sequence"); assertThat(actualExceptionInAfterEachCallback).containsInstanceOf(EnigmaException.class); } @@ -249,13 +249,13 @@ void afterEachMethodThrowsAnException() { assertEquals(1, testEvents.failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( - "fooBeforeEachCallback", + assertEquals(callSequence, asList( + "fooBeforeEachCallback", "beforeEachMethod", - "test", + "test", "afterEachMethod", // throws an exception. - "fooAfterEachCallback" - ), callSequence, "wrong call sequence"); + "fooAfterEachCallback" + ), "wrong call sequence"); // @formatter:on assertThat(actualExceptionInAfterEachCallback).containsInstanceOf(EnigmaException.class); @@ -272,13 +272,13 @@ void testMethodThrowsAnException() { assertEquals(1, testEvents.failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( - "fooBeforeEachCallback", + assertEquals(callSequence, asList( + "fooBeforeEachCallback", "beforeEachMethod", - "test", // throws an exception. + "test", // throws an exception. "afterEachMethod", - "fooAfterEachCallback" - ), callSequence, "wrong call sequence"); + "fooAfterEachCallback" + ), "wrong call sequence"); // @formatter:on assertThat(actualExceptionInAfterEachCallback).containsInstanceOf(EnigmaException.class); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java index 18a981e7dc96..2f559270e8ed 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java @@ -65,31 +65,31 @@ void beforeAndAfterTestExecutionCallbacks() { assertEquals(0, executionResults.testEvents().failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( + assertEquals(callSequence, asList( - // OuterTestCase - "beforeEachMethodOuter", + // OuterTestCase + "beforeEachMethodOuter", "fooBeforeTestExecutionCallback", "barBeforeTestExecutionCallback", - "testOuter", + "testOuter", "barAfterTestExecutionCallback", "fooAfterTestExecutionCallback", - "afterEachMethodOuter", + "afterEachMethodOuter", - // InnerTestCase - "beforeEachMethodOuter", + // InnerTestCase + "beforeEachMethodOuter", "beforeEachMethodInner", - "fooBeforeTestExecutionCallback", - "barBeforeTestExecutionCallback", - "fizzBeforeTestExecutionCallback", - "testInner", - "fizzAfterTestExecutionCallback", - "barAfterTestExecutionCallback", - "fooAfterTestExecutionCallback", + "fooBeforeTestExecutionCallback", + "barBeforeTestExecutionCallback", + "fizzBeforeTestExecutionCallback", + "testInner", + "fizzAfterTestExecutionCallback", + "barAfterTestExecutionCallback", + "fooAfterTestExecutionCallback", "afterEachMethodInner", - "afterEachMethodOuter" + "afterEachMethodOuter" - ), callSequence, "wrong call sequence"); + ), "wrong call sequence"); // @formatter:on } @@ -104,13 +104,13 @@ void beforeAndAfterTestExecutionCallbacksDeclaredOnSuperclassAndSubclass() { assertEquals(0, executionResults.testEvents().failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( - "fooBeforeTestExecutionCallback", - "barBeforeTestExecutionCallback", + assertEquals(callSequence, asList( + "fooBeforeTestExecutionCallback", + "barBeforeTestExecutionCallback", "testChild", - "barAfterTestExecutionCallback", - "fooAfterTestExecutionCallback" - ), callSequence, "wrong call sequence"); + "barAfterTestExecutionCallback", + "fooAfterTestExecutionCallback" + ), "wrong call sequence"); // @formatter:on } @@ -125,23 +125,23 @@ void beforeAndAfterTestExecutionCallbacksDeclaredOnInterfaceAndClass() { assertEquals(0, executionResults.testEvents().failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( + assertEquals(callSequence, asList( - // Test Interface - "fooBeforeTestExecutionCallback", + // Test Interface + "fooBeforeTestExecutionCallback", "barBeforeTestExecutionCallback", - "defaultTestMethod", + "defaultTestMethod", "barAfterTestExecutionCallback", - "fooAfterTestExecutionCallback", + "fooAfterTestExecutionCallback", - // Test Class - "fooBeforeTestExecutionCallback", + // Test Class + "fooBeforeTestExecutionCallback", "barBeforeTestExecutionCallback", - "localTestMethod", + "localTestMethod", "barAfterTestExecutionCallback", - "fooAfterTestExecutionCallback" + "fooAfterTestExecutionCallback" - ), callSequence, "wrong call sequence"); + ), "wrong call sequence"); // @formatter:on } @@ -156,13 +156,13 @@ void beforeEachMethodThrowsAnException() { assertEquals(1, executionResults.testEvents().failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( - "beforeEachMethod", // throws an exception. + assertEquals(callSequence, asList( + "beforeEachMethod", // throws an exception. // fooBeforeTestExecutionCallback should not get invoked. - // test should not get invoked. + // test should not get invoked. // fooAfterTestExecutionCallback should not get invoked. - "afterEachMethod" - ), callSequence, "wrong call sequence"); + "afterEachMethod" + ), "wrong call sequence"); // @formatter:on assertNull(actualExceptionInAfterTestExecution, @@ -181,16 +181,16 @@ void beforeTestExecutionCallbackThrowsAnException() { assertEquals(1, executionResults.testEvents().failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( - "beforeEachMethod", + assertEquals(callSequence, asList( + "beforeEachMethod", "fooBeforeTestExecutionCallback", "exceptionThrowingBeforeTestExecutionCallback", // throws an exception. // barBeforeTestExecutionCallback should not get invoked. - // test() should not get invoked. + // test() should not get invoked. "barAfterTestExecutionCallback", "fooAfterTestExecutionCallback", - "afterEachMethod" - ), callSequence, "wrong call sequence"); + "afterEachMethod" + ), "wrong call sequence"); // @formatter:on assertNotNull(actualExceptionInAfterTestExecution, "test exception"); @@ -210,16 +210,16 @@ void afterTestExecutionCallbackThrowsAnException() { assertEquals(1, executionResults.testEvents().failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( - "beforeEachMethod", + assertEquals(callSequence, asList( + "beforeEachMethod", "fooBeforeTestExecutionCallback", "barBeforeTestExecutionCallback", - "test", + "test", "barAfterTestExecutionCallback", "exceptionThrowingAfterTestExecutionCallback", // throws an exception. "fooAfterTestExecutionCallback", - "afterEachMethod" - ), callSequence, "wrong call sequence"); + "afterEachMethod" + ), "wrong call sequence"); // @formatter:on assertNotNull(actualExceptionInAfterTestExecution, "test exception"); @@ -238,13 +238,13 @@ void testMethodThrowsAnException() { assertEquals(1, executionResults.testEvents().failed().count(), "# tests failed"); // @formatter:off - assertEquals(asList( - "beforeEachMethod", + assertEquals(callSequence, asList( + "beforeEachMethod", "fooBeforeTestExecutionCallback", - "test", // throws an exception. + "test", // throws an exception. "fooAfterTestExecutionCallback", - "afterEachMethod" - ), callSequence, "wrong call sequence"); + "afterEachMethod" + ), "wrong call sequence"); // @formatter:on assertNotNull(actualExceptionInAfterTestExecution, "test exception"); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java index 64691d61a7cd..6a3e4b23f15a 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java @@ -227,13 +227,13 @@ private List getRegisteredLocalExtensions(LogRecordListener listener) { .filter(message -> message.contains("local extension")) // .map(message -> { message = message.replaceAll(" from source .+", ""); - int beginIndex = message.lastIndexOf('.') + 1; + var beginIndex = message.lastIndexOf('.') + 1; if (message.contains("late-init")) { return message.substring(beginIndex, message.indexOf("]")); } else { - int indexOfDollarSign = message.indexOf("$"); - int indexOfAtSign = message.indexOf("@"); + var indexOfDollarSign = message.indexOf("$"); + var indexOfAtSign = message.indexOf("@"); int endIndex = (indexOfDollarSign > 1 ? indexOfDollarSign : indexOfAtSign); return message.substring(beginIndex, endIndex); } diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java index f15ed3227c23..f6be2f03c1f7 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java @@ -230,7 +230,7 @@ void unrecoverableExceptionsAreNotPropagatedInBeforeAll() { throwExceptionAfterEach = false; throwExceptionAfterAll = false; - boolean unrecoverableExceptionThrown = executeThrowingOutOfMemoryException(); + var unrecoverableExceptionThrown = executeThrowingOutOfMemoryException(); assertTrue(unrecoverableExceptionThrown, "Unrecoverable Exception should be thrown"); assertEquals(1, UnrecoverableExceptionHandler.callCounter.beforeAllCalls, "Exception should be handled in @BeforeAll"); @@ -245,7 +245,7 @@ void unrecoverableExceptionsAreNotPropagatedInBeforeEach() { throwExceptionAfterEach = false; throwExceptionAfterAll = false; - boolean unrecoverableExceptionThrown = executeThrowingOutOfMemoryException(); + var unrecoverableExceptionThrown = executeThrowingOutOfMemoryException(); assertTrue(unrecoverableExceptionThrown, "Unrecoverable Exception should be thrown"); assertEquals(1, UnrecoverableExceptionHandler.callCounter.beforeEachCalls, "Exception should be handled in @BeforeEach"); @@ -260,7 +260,7 @@ void unrecoverableExceptionsAreNotPropagatedInAfterEach() { throwExceptionAfterEach = true; throwExceptionAfterAll = false; - boolean unrecoverableExceptionThrown = executeThrowingOutOfMemoryException(); + var unrecoverableExceptionThrown = executeThrowingOutOfMemoryException(); assertTrue(unrecoverableExceptionThrown, "Unrecoverable Exception should be thrown"); assertEquals(1, UnrecoverableExceptionHandler.callCounter.afterEachCalls, "Exception should be handled in @AfterEach"); @@ -275,7 +275,7 @@ void unrecoverableExceptionsAreNotPropagatedInAfterAll() { throwExceptionAfterEach = false; throwExceptionAfterAll = true; - boolean unrecoverableExceptionThrown = executeThrowingOutOfMemoryException(); + var unrecoverableExceptionThrown = executeThrowingOutOfMemoryException(); assertTrue(unrecoverableExceptionThrown, "Unrecoverable Exception should be thrown"); assertEquals(1, UnrecoverableExceptionHandler.callCounter.afterAllCalls, "Exception should be handled in @AfterAll"); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java index a464c896aee0..7e3fdf626396 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java @@ -188,7 +188,7 @@ void randomWithBogusSeedRepeatedly(@TrackLogRecords LogRecordListener listener) "Failed to convert configuration parameter \\[" + Pattern.quote(Random.RANDOM_SEED_PROPERTY_NAME) + "] with value \\[" + seed + "] to a long\\. Using default seed \\[\\d+] as fallback\\."); - Set uniqueSequences = new HashSet<>(); + var uniqueSequences = new HashSet(); for (var i = 0; i < 10; i++) { callSequence.clear(); @@ -212,7 +212,7 @@ void randomWithBogusSeedRepeatedly(@TrackLogRecords LogRecordListener listener) @Test void randomWithDifferentSeedConsecutively(@TrackLogRecords LogRecordListener listener) { - Set uniqueSequences = new HashSet<>(); + var uniqueSequences = new HashSet(); for (var i = 0; i < 10; i++) { var seed = String.valueOf(i); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java index bfb48e235ba0..465070391e55 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java @@ -384,7 +384,7 @@ void failureThresholdEqualToRepetitionCountMinusOne() { @RepeatedTest(value = 3, failureThreshold = 1) void failureThreshold1() { - int count = counter.incrementAndGet(); + var count = counter.incrementAndGet(); if (count > 1) { fail("Boom!"); } @@ -392,7 +392,7 @@ void failureThreshold1() { @RepeatedTest(value = 4, failureThreshold = 2) void failureThreshold2() { - int count = counter.incrementAndGet(); + var count = counter.incrementAndGet(); if (count > 1) { fail("Boom!"); } @@ -400,7 +400,7 @@ void failureThreshold2() { @RepeatedTest(value = 8, failureThreshold = 3) void failureThreshold3() { - int count = counter.incrementAndGet(); + var count = counter.incrementAndGet(); if ((count > 1) && (count % 2 == 0)) { fail("Boom!"); } @@ -408,7 +408,7 @@ void failureThreshold3() { @RepeatedTest(value = 20, failureThreshold = 3) void failureThresholdWithConcurrentExecution() { - int count = counter.incrementAndGet(); + var count = counter.incrementAndGet(); if ((count > 1) && (count % 2 == 0)) { fail("Boom!"); } diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTests.java index 7414362b790b..5a691864b2fb 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTests.java @@ -40,7 +40,7 @@ class SeparateThreadTimeoutInvocationTests { @Test @DisplayName("throws timeout exception when timeout duration is exceeded") void throwsTimeoutException() { - AtomicReference threadName = new AtomicReference<>(); + var threadName = new AtomicReference(); var invocation = aSeparateThreadInvocation(() -> { threadName.set(Thread.currentThread().getName()); Thread.sleep(PREEMPTIVE_TIMEOUT_MILLIS * 2); diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java index 974d82af7679..0035741dcbbe 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java @@ -114,7 +114,7 @@ private void assertPostProcessorAndPreDestroyCallbacks(Class testClass, int t executeTestsForClass(testClass).testEvents()// .assertStatistics(stats -> stats.started(1).succeeded(testsSuccessful)); - assertEquals(asList(expectedCalls), callSequence, () -> "wrong call sequence for " + testClass.getName()); + assertEquals(callSequence, asList(expectedCalls), () -> "wrong call sequence for " + testClass.getName()); } // ------------------------------------------------------------------------- diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java index 8bd2c557e8d6..dc9d5148ef0d 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java @@ -117,7 +117,7 @@ void testWatcherExceptionsAreLoggedAndSwallowed(@TrackLogRecords LogRecordListen assertCommonStatistics(executeTestsForClass(ExceptionThrowingTestWatcherTestCase.class)); // @formatter:off - long exceptionCount = logRecordListener.stream(MethodBasedTestDescriptor.class, Level.WARNING) + var exceptionCount = logRecordListener.stream(MethodBasedTestDescriptor.class, Level.WARNING) .map(LogRecord::getThrown) .filter(JUnitException.class::isInstance) .map(throwable -> throwable.getStackTrace()[0].getMethodName()) diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java index 0f3c98e30a11..323898da5cb5 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java @@ -54,7 +54,7 @@ public void before() { JUnitException exception = assertThrows(JUnitException.class, adapter::before); - assertEquals(exception.getMessage(), "Failed to find method foo() in class org.junit.rules.ErrorCollector"); + assertEquals("Failed to find method foo() in class org.junit.rules.ErrorCollector", exception.getMessage()); } private static class TestableTestRuleAdapter extends AbstractTestRuleAdapter { diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedClassIntegrationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedClassIntegrationTests.java index 85844d87f54a..c4a233e8b0b4 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedClassIntegrationTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedClassIntegrationTests.java @@ -286,7 +286,7 @@ void failsWhenNoArgumentsSourceIsDeclared() { void annotationsAreInherited() { var results = executeTestsForClass(ConcreteInheritanceTestCase.class); - int numArgumentSets = 13; + var numArgumentSets = 13; var numContainers = numArgumentSets * 3; // once for outer invocation, once for nested class, once for inner invocation var numTests = numArgumentSets * 2; // once for outer test, once for inner test results.containerEvents() // diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java index bec61ba12bab..8382bf68d608 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java @@ -444,7 +444,7 @@ void executesLifecycleMethods() { .haveExactly(1, event(test("test1"), displayName("[2] argument = bar"), finishedWithFailure(message("bar")))); - List testMethods = new ArrayList<>(LifecycleTestCase.testMethods); + var testMethods = new ArrayList(LifecycleTestCase.testMethods); // @formatter:off assertThat(LifecycleTestCase.lifecycleEvents).containsExactly( diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java index 1d57fbf27f51..c62bf870724d 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java @@ -279,7 +279,7 @@ static class PersonAggregator extends SimpleArgumentsAggregator { @Override protected Person aggregateArguments(ArgumentsAccessor accessor, Class targetType, AnnotatedElementContext context, int parameterIndex) { - int startIndex = context.findAnnotation(StartIndex.class).map(StartIndex::value).orElse(0); + var startIndex = context.findAnnotation(StartIndex.class).map(StartIndex::value).orElse(0); // @formatter:off return new Person( @@ -297,7 +297,7 @@ static class AddressAggregator extends SimpleArgumentsAggregator { @Override public Address aggregateArguments(ArgumentsAccessor arguments, Class targetType, AnnotatedElementContext context, int parameterIndex) { - int startIndex = context.findAnnotation(StartIndex.class).map(StartIndex::value).orElse(0); + var startIndex = context.findAnnotation(StartIndex.class).map(StartIndex::value).orElse(0); // @formatter:off return new Address( diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java index b11102889352..c85be85dc15f 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java @@ -506,7 +506,7 @@ private Stream headersToValues(CsvSource csvSource) { var arguments = provideArguments(csvSource); return arguments.map(array -> { String[] strings = new String[array.length]; - for (int i = 0; i < array.length; i++) { + for (var i = 0; i < array.length; i++) { if (array[i] instanceof ParameterNameAndArgument parameterNameAndArgument) { strings[i] = parameterNameAndArgument.getName() + " = " + parameterNameAndArgument.getPayload(); } diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java index aadfa6d0f3d6..bbe96c62c8ed 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java @@ -334,7 +334,7 @@ void supportsCsvHeadersInDisplayNames() { Stream argumentsAsStrings = arguments.map(array -> { String[] strings = new String[array.length]; - for (int i = 0; i < array.length; i++) { + for (var i = 0; i < array.length; i++) { if (array[i] instanceof ParameterNameAndArgument parameterNameAndArgument) { strings[i] = parameterNameAndArgument.getName() + " = " + parameterNameAndArgument.getPayload(); } @@ -477,7 +477,7 @@ void readsLineFromExceedsMaxCharsFileWithCustomUnlimitedConfig(@TempDir Path tem try (var out = Files.newBufferedWriter(csvFile)) { var chunks = 10; var chunk = "a".repeat(8192); - for (long i = 0; i < chunks; i++) { + for (var i = 0L; i < chunks; i++) { out.write(chunk); } } diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/FieldArgumentsProviderTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/FieldArgumentsProviderTests.java index 5f4de082012f..a9a0d03c8a8a 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/FieldArgumentsProviderTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/FieldArgumentsProviderTests.java @@ -340,7 +340,7 @@ void throwsExceptionWhenNonStaticExternalFieldIsReferencedWithLifecyclePerMethod void throwsExceptionWhenNonStaticExternalFieldIsReferencedWithLifecyclePerClassSemantics() { var factoryClass = NonStaticTestCase.class.getName(); var field = factoryClass + "#nonStaticStringStreamSupplier"; - boolean lifecyclePerClass = true; + var lifecyclePerClass = true; assertPreconditionViolationFor(() -> provideArguments(TestCase.class, lifecyclePerClass, field).toArray())// .withMessageContainingAll("Field '", "' must be static: local @FieldSource fields must be static ", "unless the PER_CLASS @TestInstance lifecycle mode is used; ", diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java index d094d5e0a881..82b6fdb27439 100644 --- a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java +++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java @@ -98,8 +98,8 @@ void tryToLoadClassWithExplicitClassLoaderPreconditions() { @TestFactory List findAllClassesInClasspathRootDelegates() throws Throwable { - List tests = new ArrayList<>(); - List paths = new ArrayList<>(); + var tests = new ArrayList(); + var paths = new ArrayList(); paths.add(Path.of(".").toRealPath()); paths.addAll(ReflectionUtils.getAllClasspathRootDirectories()); for (var path : paths) { @@ -159,8 +159,8 @@ void findAllClassesInClasspathRootPreconditions() { @SuppressWarnings("removal") @TestFactory List findAllResourcesInClasspathRootDelegates() throws Throwable { - List tests = new ArrayList<>(); - List paths = new ArrayList<>(); + var tests = new ArrayList(); + var paths = new ArrayList(); paths.add(Path.of(".").toRealPath()); paths.addAll(ReflectionUtils.getAllClasspathRootDirectories()); for (var path : paths) { @@ -192,8 +192,8 @@ void findAllResourcesInClasspathRootPreconditions() { @SuppressWarnings("removal") @TestFactory List streamAllResourcesInClasspathRootDelegates() throws Throwable { - List tests = new ArrayList<>(); - List paths = new ArrayList<>(); + var tests = new ArrayList(); + var paths = new ArrayList(); paths.add(Path.of(".").toRealPath()); paths.addAll(ReflectionUtils.getAllClasspathRootDirectories()); for (var path : paths) { diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ResourceSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ResourceSupportTests.java index 35d5648c66b8..70b2328c6a16 100644 --- a/platform-tests/src/test/java/org/junit/platform/commons/support/ResourceSupportTests.java +++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ResourceSupportTests.java @@ -64,8 +64,8 @@ void tryToGetResources() { */ @TestFactory List findAllResourcesInClasspathRootDelegates() throws Throwable { - List tests = new ArrayList<>(); - List paths = new ArrayList<>(); + var tests = new ArrayList(); + var paths = new ArrayList(); paths.add(Path.of(".").toRealPath()); paths.addAll(ReflectionUtils.getAllClasspathRootDirectories()); for (var path : paths) { @@ -96,8 +96,8 @@ void findAllResourcesInClasspathRootPreconditions() { */ @TestFactory List streamAllResourcesInClasspathRootDelegates() throws Throwable { - List tests = new ArrayList<>(); - List paths = new ArrayList<>(); + var tests = new ArrayList(); + var paths = new ArrayList(); paths.add(Path.of(".").toRealPath()); paths.addAll(ReflectionUtils.getAllClasspathRootDirectories()); for (var path : paths) { diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/DefaultClasspathScannerTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/DefaultClasspathScannerTests.java index 4879a5db2d72..6bc31ba9f00e 100644 --- a/platform-tests/src/test/java/org/junit/platform/commons/util/DefaultClasspathScannerTests.java +++ b/platform-tests/src/test/java/org/junit/platform/commons/util/DefaultClasspathScannerTests.java @@ -278,7 +278,7 @@ void scanForResourcesInPackageWithDuplicateResources() throws Exception { private static String jarFileAndEntry(URI uri) { var uriString = uri.toString(); - int lastJarUriSeparator = uriString.lastIndexOf("!/"); + var lastJarUriSeparator = uriString.lastIndexOf("!/"); var jarUri = uriString.substring(0, lastJarUriSeparator); var jarEntry = uriString.substring(lastJarUriSeparator + 1); var fileName = jarUri.substring(jarUri.lastIndexOf("/") + 1); diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java index fdbfd076e641..382447cf3950 100644 --- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java +++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java @@ -1945,7 +1945,7 @@ void findFieldsDoesNotAllowInstanceFieldToHideStaticField() throws Exception { @SuppressWarnings("DataFlowIssue") @Test void readFieldValuesPreconditions() { - List fields = new ArrayList<>(); + var fields = new ArrayList(); assertPreconditionViolationFor(() -> readFieldValues(null, new Object())); assertPreconditionViolationFor(() -> readFieldValues(fields, null, null)); assertPreconditionViolationFor(() -> readFieldValues(fields, new Object(), null)); diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java index 35fe1e6dbf96..9eaa8bb2d7a4 100644 --- a/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java +++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java @@ -14,7 +14,6 @@ import static org.junit.platform.commons.test.PreconditionAssertions.assertPreconditionViolationFor; import java.util.LinkedHashMap; -import java.util.Map; import org.jspecify.annotations.NullUnmarked; import org.junit.jupiter.api.Test; @@ -129,10 +128,9 @@ void withPrimitiveDoubleArrayField() { @SuppressWarnings("serial") void withMapField() { // @formatter:off - Map map = new LinkedHashMap<>() {{ - put("foo", 42); - put("bar", "enigma"); - }}; + var map = new LinkedHashMap(); + map.put("foo", 42); + map.put("bar", "enigma"); // @formatter:on assertEquals("RoleModel [mystery map = {foo=42, bar=enigma}]", new ToStringBuilder(new RoleModel()).append("mystery map", map).toString()); diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java index 082819088b5c..ca15c3e4bceb 100644 --- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java +++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java @@ -29,7 +29,6 @@ import java.util.EnumMap; import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; import java.util.Optional; import org.junit.jupiter.api.Disabled; @@ -76,8 +75,8 @@ List reports() { private List scanContainerClassAndCreateDynamicTests(Class containerClass) { var containerName = containerClass.getSimpleName().replace("TestCase", ""); // String containerName = containerClass.getSimpleName(); - List nodes = new ArrayList<>(); - Map> map = new EnumMap<>(Details.class); + var nodes = new ArrayList(); + var map = new EnumMap>(Details.class); for (var method : findMethods(containerClass, m -> m.isAnnotationPresent(Test.class), TOP_DOWN)) { var methodName = method.getName(); var types = method.getParameterTypes(); @@ -184,12 +183,12 @@ void reportMultiEntriesWithSingleMapping(TestReporter reporter) { @Test void reportMultiEntriesWithMultiMappings(TestReporter reporter) { - Map values = new LinkedHashMap<>(); + var values = new LinkedHashMap(); values.put("user name", "dk38"); values.put("award year", "1974"); reporter.publishEntry(values); reporter.publishEntry("single", "mapping"); - Map more = new LinkedHashMap<>(); + var more = new LinkedHashMap(); more.put("user name", "st77"); more.put("award year", "1977"); more.put("last seen", "2001"); diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java index 5d6e3d827322..6582c7ed79e1 100644 --- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java +++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java @@ -53,7 +53,7 @@ public ConsoleLauncherWrapperResult execute(Optional expectedCode, Stri var outText = out.toString(); var errText = err.toString(); if (expectedCode.isPresent()) { - int expectedValue = expectedCode.get(); + var expectedValue = expectedCode.get(); assertEquals(expectedValue, code, "ConsoleLauncher execute code mismatch!"); if (expectedValue != 0 && expectedValue != 1) { assertThat(errText).isNotBlank(); diff --git a/platform-tests/src/test/java/org/junit/platform/console/command/CustomContextClassLoaderExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/command/CustomContextClassLoaderExecutorTests.java index f8010ca5e1e6..076582d01bdf 100644 --- a/platform-tests/src/test/java/org/junit/platform/console/command/CustomContextClassLoaderExecutorTests.java +++ b/platform-tests/src/test/java/org/junit/platform/console/command/CustomContextClassLoaderExecutorTests.java @@ -33,7 +33,7 @@ void invokeWithoutCustomClassLoaderDoesNotSetClassLoader() { var originalClassLoader = Thread.currentThread().getContextClassLoader(); var executor = new CustomContextClassLoaderExecutor(Optional.empty()); - int result = executor.invoke(() -> { + var result = executor.invoke(() -> { assertSame(originalClassLoader, Thread.currentThread().getContextClassLoader()); return 42; }); @@ -48,7 +48,7 @@ void invokeWithCustomClassLoaderSetsCustomAndResetsToOriginal() { ClassLoader customClassLoader = URLClassLoader.newInstance(new URL[0]); var executor = new CustomContextClassLoaderExecutor(Optional.of(customClassLoader)); - int result = executor.invoke(() -> { + var result = executor.invoke(() -> { assertSame(customClassLoader, Thread.currentThread().getContextClassLoader()); return 23; }); @@ -69,7 +69,7 @@ public void close() throws IOException { }; var executor = new CustomContextClassLoaderExecutor(Optional.of(localClassLoader)); - int result = executor.invoke(() -> 4711); + var result = executor.invoke(() -> 4711); assertEquals(4711, result); assertTrue(closed.get()); @@ -88,7 +88,7 @@ public void close() throws IOException { var executor = new CustomContextClassLoaderExecutor(Optional.of(localClassLoader), CustomClassLoaderCloseStrategy.KEEP_OPEN); - int result = executor.invoke(() -> 4711); + var result = executor.invoke(() -> 4711); assertEquals(4711, result); assertFalse(closed.get()); diff --git a/platform-tests/src/test/java/org/junit/platform/console/output/TreeNodeTests.java b/platform-tests/src/test/java/org/junit/platform/console/output/TreeNodeTests.java index 56910200e5b6..603311e3e07e 100644 --- a/platform-tests/src/test/java/org/junit/platform/console/output/TreeNodeTests.java +++ b/platform-tests/src/test/java/org/junit/platform/console/output/TreeNodeTests.java @@ -46,7 +46,7 @@ void childrenCanBeAddedConcurrently() throws Exception { var treeNode = new TreeNode("root"); runConcurrently(() -> { - for (long i = 0; i < ITEMS_PER_THREAD; i++) { + for (var i = 0L; i < ITEMS_PER_THREAD; i++) { treeNode.addChild(new TreeNode(String.valueOf(i))); } }); @@ -59,7 +59,7 @@ void reportEntriesCanBeAddedConcurrently() throws Exception { var treeNode = new TreeNode("root"); runConcurrently(() -> { - for (long i = 0; i < ITEMS_PER_THREAD; i++) { + for (var i = 0L; i < ITEMS_PER_THREAD; i++) { treeNode.addReportEntry(ReportEntry.from("index", String.valueOf(i))); } }); @@ -73,7 +73,7 @@ private void runConcurrently(Runnable action) throws InterruptedException { new ArrayBlockingQueue<>(NUM_THREADS)); try { var barrier = new CyclicBarrier(NUM_THREADS); - for (long i = 0; i < NUM_THREADS; i++) { + for (var i = 0L; i < NUM_THREADS; i++) { executor.submit(() -> { await(barrier); action.run(); diff --git a/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java index e1679ac20b12..b723288b1dd9 100644 --- a/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java +++ b/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java @@ -62,8 +62,8 @@ void composingMultipleFiltersIsAConjunctionOfFilters() { @Test void aFilterComposedOfMultipleFiltersHasReadableDescription() { - Filter firstFilter = new FilterStub<>(o -> excluded("wrong"), () -> "1st"); - Filter secondFilter = new FilterStub<>(o -> included("right"), () -> "2nd"); + var firstFilter = new FilterStub(o -> excluded("wrong"), () -> "1st"); + var secondFilter = new FilterStub(o -> included("right"), () -> "2nd"); var composed = Filter.composeFilters(firstFilter, secondFilter); diff --git a/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java b/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java index ca3efb2fb09e..9fdc2c957342 100644 --- a/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java +++ b/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java @@ -80,7 +80,7 @@ void tagEqualsOtherTagWithSameName() { assertEquals(TestTag.create("fast"), TestTag.create("fast")); assertEquals(TestTag.create("fast").hashCode(), TestTag.create("fast").hashCode()); assertNotEquals(null, TestTag.create("fast")); - assertNotEquals(TestTag.create("fast"), null); + assertNotEquals(null, TestTag.create("fast")); } @Test diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java index 6bc5b550f217..2de61bb409b5 100644 --- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java +++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java @@ -160,7 +160,7 @@ void ensureDefaultUniqueIdFormatDecodingEncodesSegmentParts() { @Test void ensureDefaultUniqueIdFormatCanHandleAllCharacters() { - for (char c = 0; c < Character.MAX_VALUE; c++) { + for (var c = 0; c < Character.MAX_VALUE; c++) { var value = "foo " + c + " bar"; var uniqueId = UniqueId.parse(UniqueId.root("type", value).toString()); var segment = uniqueId.getSegments().getFirst(); diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java index 456781ed4646..02980676c29d 100644 --- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java +++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java @@ -105,7 +105,7 @@ void setParentToNull() { @Test void visitAllNodes() { - List visited = new ArrayList<>(); + var visited = new ArrayList(); engineDescriptor.accept(visited::add); assertEquals(8, visited.size()); @@ -120,7 +120,7 @@ void pruneLeaf() { }; engineDescriptor.accept(visitor); - List visited = new ArrayList<>(); + var visited = new ArrayList(); engineDescriptor.accept(descriptor -> visited.add(descriptor.getUniqueId())); assertEquals(7, visited.size()); @@ -141,7 +141,7 @@ void pruneGroup() { assertEquals(4, countVisited.get(), "Children of pruned element are not visited"); - List visited = new ArrayList<>(); + var visited = new ArrayList(); engineDescriptor.accept(descriptor -> visited.add(descriptor.getUniqueId())); assertEquals(3, visited.size()); diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/TestDescriptorOrderChildrenTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/TestDescriptorOrderChildrenTests.java index 5c8af3089b8b..c62e3bb9f664 100644 --- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/TestDescriptorOrderChildrenTests.java +++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/TestDescriptorOrderChildrenTests.java @@ -47,7 +47,7 @@ default void orderChildrenInReverseOrder() { children.sort(comparing((TestDescriptor o) -> childrenInOriginalOrder.indexOf(o)).reversed()); return children; }); - List children = new ArrayList<>(testDescriptor.getChildren()); + var children = new ArrayList(testDescriptor.getChildren()); assertThat(children).isEqualTo(childrenInOriginalOrder.reversed()); } @@ -66,7 +66,7 @@ default void orderChildrenInSameOrder() { children.sort(comparing(childrenInOriginalOrder::indexOf)); return children; }); - List children = new ArrayList<>(testDescriptor.getChildren()); + var children = new ArrayList(testDescriptor.getChildren()); assertThat(children).isEqualTo(childrenInOriginalOrder); } @@ -125,7 +125,7 @@ default void orderChildrenOrdererReturnsNull() { @Test default void orderChildrenProvidedChildrenAreModifiable() { var testDescriptor = createTestDescriptorWithChildren(); - AtomicReference> childrenRef = new AtomicReference<>(); + var childrenRef = new AtomicReference>(); testDescriptor.orderChildren(children -> { childrenRef.set(children); return children; diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreTests.java index a239db0cae2e..0bd2b6491c31 100644 --- a/platform-tests/src/test/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreTests.java +++ b/platform-tests/src/test/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreTests.java @@ -211,11 +211,11 @@ void getWithTypeSafety() { @Test void getWithTypeSafetyAndPrimitiveValueType() { String key = "enigma"; - int value = 42; + var value = 42; store.put(namespace, key, value); // The fact that we can declare this as an int/Integer suffices for testing the required type. - int requiredInt = store.get(namespace, key, int.class); + var requiredInt = store.get(namespace, key, int.class); Integer requiredInteger = store.get(namespace, key, Integer.class); assertEquals(value, requiredInt); assertEquals(value, requiredInteger.intValue()); @@ -292,10 +292,10 @@ void computeIfAbsentWithTypeSafety() { @Test void getOrComputeIfAbsentWithTypeSafetyAndPrimitiveValueType() { String key = "enigma"; - int value = 42; + var value = 42; // The fact that we can declare this as an int/Integer suffices for testing the required type. - int computedInt = store.getOrComputeIfAbsent(namespace, key, k -> value, int.class); + var computedInt = store.getOrComputeIfAbsent(namespace, key, k -> value, int.class); Integer computedInteger = store.getOrComputeIfAbsent(namespace, key, k -> value, Integer.class); assertEquals(value, computedInt); assertEquals(value, computedInteger.intValue()); @@ -304,10 +304,10 @@ void getOrComputeIfAbsentWithTypeSafetyAndPrimitiveValueType() { @Test void computeIfAbsentWithTypeSafetyAndPrimitiveValueType() { String key = "enigma"; - int value = 42; + var value = 42; // The fact that we can declare this as an int/Integer suffices for testing the required type. - int computedInt = store.computeIfAbsent(namespace, key, k -> value, int.class); + var computedInt = store.computeIfAbsent(namespace, key, k -> value, int.class); Integer computedInteger = store.computeIfAbsent(namespace, key, k -> value, Integer.class); assertEquals(value, computedInt); assertEquals(value, computedInteger.intValue()); @@ -361,11 +361,11 @@ void removeWithTypeSafety() { @Test void removeWithTypeSafetyAndPrimitiveValueType() { String key = "enigma"; - int value = 42; + var value = 42; store.put(namespace, key, value); // The fact that we can declare this as an int suffices for testing the required type. - int requiredInt = store.remove(namespace, key, int.class); + var requiredInt = store.remove(namespace, key, int.class); assertEquals(value, requiredInt); store.put(namespace, key, value); @@ -388,7 +388,7 @@ void removeNullValueWithTypeSafety() { @SuppressWarnings("deprecation") @Test void simulateRaceConditionInGetOrComputeIfAbsent() throws Exception { - int threads = 10; + var threads = 10; AtomicInteger counter = new AtomicInteger(); List values; @@ -404,7 +404,7 @@ void simulateRaceConditionInGetOrComputeIfAbsent() throws Exception { @Test void simulateRaceConditionInComputeIfAbsent() throws Exception { - int threads = 10; + var threads = 10; AtomicInteger counter = new AtomicInteger(); List values; diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java index 784b362178ac..3e1c9b2866bd 100644 --- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java +++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java @@ -1046,13 +1046,13 @@ private static ReportedData execute(TestEngine engine, UnaryOperator executionConfigurer) { var executionListener = mock(TestExecutionListener.class); - AtomicReference startTime = new AtomicReference<>(); + var startTime = new AtomicReference(); doAnswer(invocation -> { startTime.set(Instant.now()); return null; }).when(executionListener).executionStarted(any()); - AtomicReference finishTime = new AtomicReference<>(); + var finishTime = new AtomicReference(); doAnswer(invocation -> { finishTime.set(Instant.now()); return null; diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java index 941544065e77..e77bf8f2b043 100644 --- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java +++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java @@ -295,7 +295,7 @@ void configurationParameterAddedByMap_isStoredInDiscoveryRequest() { @Test void multipleConfigurationParametersAddedByMap_areStoredInDiscoveryRequest() { - Map configurationParams = new HashMap<>(); + var configurationParams = new HashMap(); configurationParams.put("key1", "value1"); configurationParams.put("key2", "value2"); diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryResultTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryResultTests.java index 8ebee102a60f..bc073facbcaa 100644 --- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryResultTests.java +++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryResultTests.java @@ -15,7 +15,6 @@ import static org.mockito.Mockito.when; import java.util.LinkedHashMap; -import java.util.Map; import org.junit.jupiter.api.Test; import org.junit.platform.engine.EngineDiscoveryRequest; @@ -41,14 +40,11 @@ void withRetainedEnginesMaintainsOriginalTestEngineRegistrationOrder() { var engine4 = new DemoEngine("Engine 4"); @SuppressWarnings("serial") - Map engineResults = new LinkedHashMap<>() { - { - put(engine1, new DemoEngineResultInfo(true)); - put(engine2, new DemoEngineResultInfo(false)); - put(engine3, new DemoEngineResultInfo(false)); - put(engine4, new DemoEngineResultInfo(true)); - } - }; + var engineResults = new LinkedHashMap(); + engineResults.put(engine1, new DemoEngineResultInfo(true)); + engineResults.put(engine2, new DemoEngineResultInfo(false)); + engineResults.put(engine3, new DemoEngineResultInfo(false)); + engineResults.put(engine4, new DemoEngineResultInfo(true)); assertThat(engineResults.keySet()).containsExactly(engine1, engine2, engine3, engine4); LauncherDiscoveryResult discoveryResult = new LauncherDiscoveryResult(engineResults, mock(), mock()); diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java index 113fca43f945..6db4d3759218 100644 --- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java +++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java @@ -319,7 +319,7 @@ public void execute(ExecutionRequest request) { .addTestEngines(engine) // .build(); - AtomicReference result = new AtomicReference<>(); + var result = new AtomicReference(); var listener = new TestExecutionListener() { @Override public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) { @@ -354,7 +354,7 @@ void extensionCanReadValueFromSessionStoreAndReadByLauncherSessionListenerOnOpen try (LauncherSession session = LauncherFactory.openSession(config)) { - AtomicReference errorRef = new AtomicReference<>(); + var errorRef = new AtomicReference(); var listener = new TestExecutionListener() { @Override public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) { @@ -382,7 +382,7 @@ void extensionCanReadValueFromSessionStoreAndReadByLauncherSessionListenerOnClos try (LauncherSession session = LauncherFactory.openSession(config)) { - AtomicReference errorRef = new AtomicReference<>(); + var errorRef = new AtomicReference(); var listener = new TestExecutionListener() { @Override public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) { diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java index 7eee9a519e05..a150ad7a55f6 100644 --- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java +++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java @@ -189,7 +189,7 @@ void verifyUniqueIdsAreTrackedWithConcurrentlyExecutingTestPlans() throws Except var customDir = workingDir.resolve("build/UniqueIdTrackingListenerIntegrationTests"); var prefix = DEFAULT_OUTPUT_FILE_PREFIX; - Map configurationParameters = new HashMap<>(); + var configurationParameters = new HashMap(); configurationParameters.put(LISTENER_ENABLED_PROPERTY_NAME, "true"); configurationParameters.put(OUTPUT_DIR_PROPERTY_NAME, customDir.toAbsolutePath().toString()); @@ -212,7 +212,7 @@ private List executeTests(Map configurationParameters, C } private List executeTests(Map configurationParameters, List classSelectors) { - List uniqueIds = new ArrayList<>(); + var uniqueIds = new ArrayList(); var listener = new TestExecutionListener() { @Nullable diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java index d675d7683e27..debe47624486 100644 --- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java +++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java @@ -37,7 +37,6 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.LinkedHashMap; -import java.util.Map; import java.util.Set; import org.joox.Match; @@ -408,7 +407,7 @@ void writesReportEntriesToSystemOutElement() throws Exception { var testIdentifier = testPlan.getTestIdentifier(childUniqueId); listener.executionStarted(testIdentifier); listener.reportingEntryPublished(testIdentifier, ReportEntry.from("foo", "bar")); - Map map = new LinkedHashMap<>(); + var map = new LinkedHashMap(); map.put("bar", "baz"); map.put("qux", "foo"); listener.reportingEntryPublished(testIdentifier, ReportEntry.from(map)); diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java index 5db92bbd1aa5..654ffea8dff5 100644 --- a/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java +++ b/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java @@ -284,7 +284,7 @@ void writesXmlReportToSocket(@TempDir Path tempDirectory) throws Exception { var builder = new StringBuilder(); try (var serverSocket = new ServerSocket(0, 50, InetAddress.getLoopbackAddress())) { // Use any available port - int port = serverSocket.getLocalPort(); + var port = serverSocket.getLocalPort(); // Start a daemon thread to accept the connection and read the XML Thread serverThread = new Thread(() -> {