From 509921aea677bb4c6a571d4a00df3d3282df144f Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 13 Oct 2025 11:51:22 +0200 Subject: [PATCH] Enable `LexicographicalAnnotationListing` --- .../junitbuild.java-nullability-conventions.gradle.kts | 2 +- .../src/main/java/org/junit/jupiter/api/AfterAll.java | 6 +++--- .../src/main/java/org/junit/jupiter/api/AfterEach.java | 6 +++--- .../main/java/org/junit/jupiter/api/Assertions.java | 2 +- .../main/java/org/junit/jupiter/api/Assumptions.java | 6 +++--- .../src/main/java/org/junit/jupiter/api/AutoClose.java | 6 +++--- .../src/main/java/org/junit/jupiter/api/BeforeAll.java | 6 +++--- .../main/java/org/junit/jupiter/api/BeforeEach.java | 6 +++--- .../main/java/org/junit/jupiter/api/ClassTemplate.java | 6 +++--- .../src/main/java/org/junit/jupiter/api/Disabled.java | 6 +++--- .../main/java/org/junit/jupiter/api/DisplayName.java | 6 +++--- .../org/junit/jupiter/api/DisplayNameGeneration.java | 6 +++--- .../org/junit/jupiter/api/DisplayNameGenerator.java | 4 ++-- .../jupiter/api/IndicativeSentencesGeneration.java | 6 +++--- .../src/main/java/org/junit/jupiter/api/MediaType.java | 2 +- .../java/org/junit/jupiter/api/NamedExecutable.java | 2 +- .../src/main/java/org/junit/jupiter/api/Nested.java | 6 +++--- .../src/main/java/org/junit/jupiter/api/Order.java | 6 +++--- .../main/java/org/junit/jupiter/api/RepeatedTest.java | 6 +++--- .../src/main/java/org/junit/jupiter/api/Tag.java | 6 +++--- .../src/main/java/org/junit/jupiter/api/Tags.java | 6 +++--- .../src/main/java/org/junit/jupiter/api/Test.java | 6 +++--- .../java/org/junit/jupiter/api/TestClassOrder.java | 6 +++--- .../main/java/org/junit/jupiter/api/TestFactory.java | 6 +++--- .../main/java/org/junit/jupiter/api/TestInstance.java | 8 ++++---- .../java/org/junit/jupiter/api/TestMethodOrder.java | 6 +++--- .../main/java/org/junit/jupiter/api/TestReporter.java | 6 +++--- .../main/java/org/junit/jupiter/api/TestTemplate.java | 6 +++--- .../src/main/java/org/junit/jupiter/api/Timeout.java | 6 +++--- .../jupiter/api/condition/DisabledForJreRange.java | 6 +++--- .../org/junit/jupiter/api/condition/DisabledIf.java | 6 +++--- .../api/condition/DisabledIfEnvironmentVariable.java | 8 ++++---- .../api/condition/DisabledIfEnvironmentVariables.java | 6 +++--- .../api/condition/DisabledIfSystemProperties.java | 6 +++--- .../api/condition/DisabledIfSystemProperty.java | 8 ++++---- .../jupiter/api/condition/DisabledInNativeImage.java | 8 ++++---- .../org/junit/jupiter/api/condition/DisabledOnJre.java | 6 +++--- .../org/junit/jupiter/api/condition/DisabledOnOs.java | 6 +++--- .../jupiter/api/condition/EnabledForJreRange.java | 6 +++--- .../org/junit/jupiter/api/condition/EnabledIf.java | 6 +++--- .../api/condition/EnabledIfEnvironmentVariable.java | 8 ++++---- .../api/condition/EnabledIfEnvironmentVariables.java | 6 +++--- .../api/condition/EnabledIfSystemProperties.java | 6 +++--- .../jupiter/api/condition/EnabledIfSystemProperty.java | 8 ++++---- .../jupiter/api/condition/EnabledInNativeImage.java | 6 +++--- .../org/junit/jupiter/api/condition/EnabledOnJre.java | 6 +++--- .../org/junit/jupiter/api/condition/EnabledOnOs.java | 6 +++--- .../junit/jupiter/api/extension/AfterAllCallback.java | 2 +- .../AfterClassTemplateInvocationCallback.java | 2 +- .../junit/jupiter/api/extension/AfterEachCallback.java | 2 +- .../api/extension/AfterTestExecutionCallback.java | 2 +- .../junit/jupiter/api/extension/BeforeAllCallback.java | 2 +- .../BeforeClassTemplateInvocationCallback.java | 2 +- .../jupiter/api/extension/BeforeEachCallback.java | 2 +- .../api/extension/BeforeTestExecutionCallback.java | 2 +- .../jupiter/api/extension/ExecutionCondition.java | 2 +- .../org/junit/jupiter/api/extension/ExtendWith.java | 6 +++--- .../junit/jupiter/api/extension/ExtensionContext.java | 10 +++++----- .../org/junit/jupiter/api/extension/Extensions.java | 6 +++--- .../org/junit/jupiter/api/extension/MediaType.java | 4 ++-- .../junit/jupiter/api/extension/RegisterExtension.java | 6 +++--- .../api/extension/TestExecutionExceptionHandler.java | 2 +- .../jupiter/api/extension/TestInstanceFactory.java | 2 +- .../api/extension/TestInstancePostProcessor.java | 2 +- .../extension/TestInstancePreConstructCallback.java | 2 +- .../api/extension/TestInstancePreDestroyCallback.java | 2 +- .../api/extension/TestInstantiationAwareExtension.java | 4 ++-- .../org/junit/jupiter/api/function/Executable.java | 2 +- .../junit/jupiter/api/function/ThrowingConsumer.java | 2 +- .../junit/jupiter/api/function/ThrowingSupplier.java | 2 +- .../main/java/org/junit/jupiter/api/io/TempDir.java | 6 +++--- .../java/org/junit/jupiter/api/io/TempDirFactory.java | 2 +- .../java/org/junit/jupiter/api/parallel/Execution.java | 2 +- .../java/org/junit/jupiter/api/parallel/Isolated.java | 4 ++-- .../org/junit/jupiter/api/parallel/ResourceLock.java | 4 ++-- .../org/junit/jupiter/api/parallel/ResourceLocks.java | 2 +- .../engine/config/CachingJupiterConfiguration.java | 8 ++++---- .../engine/config/DefaultJupiterConfiguration.java | 2 +- .../engine/execution/AfterEachMethodAdapter.java | 2 +- .../engine/execution/BeforeEachMethodAdapter.java | 2 +- .../engine/execution/ExtensionContextSupplier.java | 2 +- .../jupiter/engine/execution/NamespaceAwareStore.java | 4 ++-- .../engine/execution/TestInstancesProvider.java | 2 +- .../engine/extension/SameThreadTimeoutInvocation.java | 2 +- .../migrationsupport/EnableJUnit4MigrationSupport.java | 6 +++--- .../rules/EnableRuleMigrationSupport.java | 8 ++++---- .../rules/ExpectedExceptionSupport.java | 2 +- .../rules/ExternalResourceSupport.java | 2 +- .../migrationsupport/rules/VerifierSupport.java | 2 +- .../params/AfterParameterizedClassInvocation.java | 6 +++--- .../params/BeforeParameterizedClassInvocation.java | 6 +++--- .../main/java/org/junit/jupiter/params/Parameter.java | 4 ++-- .../org/junit/jupiter/params/ParameterizedClass.java | 8 ++++---- .../org/junit/jupiter/params/ParameterizedTest.java | 8 ++++---- .../junit/jupiter/params/aggregator/AggregateWith.java | 4 ++-- .../junit/jupiter/params/converter/ConvertWith.java | 6 +++--- .../params/converter/JavaTimeConversionPattern.java | 6 +++--- .../provider/AnnotationBasedArgumentsProvider.java | 2 +- .../org/junit/jupiter/params/provider/Arguments.java | 2 +- .../jupiter/params/provider/ArgumentsProvider.java | 2 +- .../junit/jupiter/params/provider/ArgumentsSource.java | 6 +++--- .../jupiter/params/provider/ArgumentsSources.java | 6 +++--- .../junit/jupiter/params/provider/CsvFileSource.java | 8 ++++---- .../junit/jupiter/params/provider/CsvFileSources.java | 6 +++--- .../org/junit/jupiter/params/provider/CsvSource.java | 10 +++++----- .../org/junit/jupiter/params/provider/CsvSources.java | 6 +++--- .../org/junit/jupiter/params/provider/EmptySource.java | 8 ++++---- .../org/junit/jupiter/params/provider/EnumSource.java | 8 ++++---- .../org/junit/jupiter/params/provider/EnumSources.java | 6 +++--- .../org/junit/jupiter/params/provider/FieldSource.java | 8 ++++---- .../junit/jupiter/params/provider/FieldSources.java | 6 +++--- .../junit/jupiter/params/provider/MethodSource.java | 8 ++++---- .../junit/jupiter/params/provider/MethodSources.java | 6 +++--- .../jupiter/params/provider/NullAndEmptySource.java | 8 ++++---- .../org/junit/jupiter/params/provider/NullSource.java | 8 ++++---- .../org/junit/jupiter/params/provider/ValueSource.java | 8 ++++---- .../junit/jupiter/params/provider/ValueSources.java | 6 +++--- .../jupiter/params/support/AnnotationConsumer.java | 2 +- .../junit/jupiter/params/support/ParameterInfo.java | 8 ++++---- .../junit/platform/console/command/BaseCommand.java | 4 ++-- .../platform/console/command/ExecuteTestsCommand.java | 2 +- .../console/options/TestConsoleOutputOptionsMixin.java | 6 +++--- .../console/options/TestDiscoveryOptionsMixin.java | 2 +- .../platform/reporting/open/xml/JUnitContributor.java | 4 ++-- 124 files changed, 307 insertions(+), 307 deletions(-) diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts index cfbcf4b331c6..52eb78f21877 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts @@ -42,7 +42,6 @@ tasks.withType().configureEach { "FormatStringConcatenation", "IdentityConversion", "LexicographicalAnnotationAttributeListing", // We don`t want to use this: https://github.com/junit-team/junit-framework/pull/5043#pullrequestreview-3330615838 - "LexicographicalAnnotationListing", "MissingTestCall", "NestedOptionals", "NonStaticImport", @@ -52,6 +51,7 @@ tasks.withType().configureEach { "TimeZoneUsage", ) error( + "LexicographicalAnnotationListing", "PackageLocation", "RedundantStringConversion", "RedundantStringEscape", diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java index 7f9834d44aea..2294f2d920fb 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java @@ -91,9 +91,9 @@ * @see TestFactory * @see TestInstance */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.0") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) public @interface AfterAll { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java index b46258fb5ad2..590fa2c5b7f9 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java @@ -84,9 +84,9 @@ * @see TestFactory * @see TestTemplate */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.0") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) public @interface AfterEach { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java index 2a4ac5682840..9f9e61375006 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java @@ -3718,8 +3718,8 @@ public static T assertInstanceOf(Class expectedType, @Nullable Object act * * @since 5.8 */ - @Contract("_, null, _ -> fail") @API(status = STABLE, since = "5.10") + @Contract("_, null, _ -> fail") public static T assertInstanceOf(Class expectedType, @Nullable Object actualValue, Supplier<@Nullable String> messageSupplier) { return AssertInstanceOf.assertInstanceOf(expectedType, actualValue, messageSupplier); diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java index 572f14b9de25..12518ead6f3f 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java @@ -284,8 +284,8 @@ public static void assumingThat(boolean assumption, Executable executable) { * @throws TestAbortedException always * @since 5.9 */ - @Contract(" -> fail") @API(status = STABLE, since = "5.9") + @Contract(" -> fail") @SuppressWarnings("TypeParameterUnusedInFormals") public static V abort() { throw new TestAbortedException(); @@ -309,8 +309,8 @@ public static V abort() { * @throws TestAbortedException always * @since 5.9 */ - @Contract("_ -> fail") @API(status = STABLE, since = "5.9") + @Contract("_ -> fail") @SuppressWarnings("TypeParameterUnusedInFormals") public static V abort(String message) { throw new TestAbortedException(message); @@ -327,8 +327,8 @@ public static V abort(String message) { * @throws TestAbortedException always * @since 5.9 */ - @Contract("_ -> fail") @API(status = STABLE, since = "5.9") + @Contract("_ -> fail") @SuppressWarnings("TypeParameterUnusedInFormals") public static V abort(Supplier messageSupplier) { throw new TestAbortedException(messageSupplier.get()); diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AutoClose.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AutoClose.java index 8288be1e8416..58f43ff415aa 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AutoClose.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AutoClose.java @@ -75,10 +75,10 @@ * * @since 5.11 */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.FIELD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = MAINTAINED, since = "5.13.3") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.FIELD }) public @interface AutoClose { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java index c4fd378193ea..3c4af62891e1 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java @@ -91,9 +91,9 @@ * @see TestFactory * @see TestInstance */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.0") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) public @interface BeforeAll { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java index 0f3058e8b12e..1e6f6f4764ca 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java @@ -84,9 +84,9 @@ * @see TestFactory * @see TestTemplate */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.0") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) public @interface BeforeEach { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassTemplate.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassTemplate.java index 03d40e9dbd11..19b2b2b085e6 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassTemplate.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassTemplate.java @@ -62,11 +62,11 @@ * @see BeforeClassTemplateInvocationCallback * @see AfterClassTemplateInvocationCallback */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = EXPERIMENTAL, since = "6.0") @Documented @Inherited -@API(status = EXPERIMENTAL, since = "6.0") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE }) @Testable public @interface ClassTemplate { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java index e02c23cf030e..51cae9af82a3 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java @@ -58,10 +58,10 @@ * @see org.junit.jupiter.api.condition.DisabledInNativeImage * @see org.junit.jupiter.api.extension.ExecutionCondition */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.0") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface Disabled { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java index c8318e1bfb3b..8649979783c5 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java @@ -34,10 +34,10 @@ * @see DisplayNameGeneration * @see DisplayNameGenerator */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.0") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface DisplayName { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java index 3a23b9a8ea72..bccf932c3dfd 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java @@ -40,11 +40,11 @@ * @see DisplayNameGenerator * @see IndicativeSentencesGeneration */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") @Documented @Inherited -@API(status = STABLE, since = "5.7") +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) public @interface DisplayNameGeneration { /** 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..b762b71a591b 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 @@ -337,9 +337,9 @@ class IndicativeSentences implements DisplayNameGenerator { * * @since 5.13 */ - @Target({ ElementType.TYPE, ElementType.METHOD }) - @Retention(RetentionPolicy.RUNTIME) @API(status = EXPERIMENTAL, since = "6.0") + @Retention(RetentionPolicy.RUNTIME) + @Target({ ElementType.TYPE, ElementType.METHOD }) public @interface SentenceFragment { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java index 722e91bf4d09..ee9ebc3ba32c 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java @@ -42,12 +42,12 @@ * @see DisplayNameGenerator.IndicativeSentences * @see DisplayNameGeneration */ +@API(status = STABLE, since = "5.10") @DisplayNameGeneration(IndicativeSentences.class) -@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) @Documented @Inherited -@API(status = STABLE, since = "5.10") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE }) public @interface IndicativeSentencesGeneration { String DEFAULT_SEPARATOR = ", "; diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MediaType.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MediaType.java index cf0101302bd7..3eacbf6ad208 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MediaType.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MediaType.java @@ -34,8 +34,8 @@ * @see TestReporter#publishFile(String, MediaType, org.junit.jupiter.api.function.ThrowingConsumer) * @see org.junit.jupiter.api.extension.ExtensionContext#publishFile(String, MediaType, org.junit.jupiter.api.function.ThrowingConsumer) */ -@SuppressWarnings("removal") @API(status = MAINTAINED, since = "5.14") +@SuppressWarnings("removal") public sealed class MediaType permits org.junit.jupiter.api.extension.MediaType { private static final Pattern PATTERN; diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/NamedExecutable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/NamedExecutable.java index d96515b05cfe..570e3877eaba 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/NamedExecutable.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/NamedExecutable.java @@ -32,8 +32,8 @@ * @see DynamicTest#stream(Stream) * @see DynamicTest#stream(Iterator) */ -@FunctionalInterface @API(status = MAINTAINED, since = "5.13.3") +@FunctionalInterface public interface NamedExecutable extends Named, Executable { @Override default String getName() { diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java index 2c04fd3badd1..234653be778c 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java @@ -49,9 +49,9 @@ * @see TestInstance * @see TestClassOrder */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.0") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) public @interface Nested { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java index 7ea0fbadbca9..4d73fd651ae5 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java @@ -43,10 +43,10 @@ * @see org.junit.jupiter.api.extension.RegisterExtension @RegisterExtension * @see org.junit.jupiter.api.extension.ExtendWith @ExtendWith */ -@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.9") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE }) public @interface Order { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java index aa04813cab97..704bef7b3307 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java @@ -79,10 +79,10 @@ * @see TestInfo * @see Test */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.0") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) @TestTemplate public @interface RepeatedTest { diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java index 2156882183ae..81eef2b65894 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java @@ -54,12 +54,12 @@ * @see Tags * @see Test */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.0") @Documented @Inherited @Repeatable(Tags.class) -@API(status = STABLE, since = "5.0") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface Tag { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java index 840adf79312e..7c99ec76240d 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java @@ -32,11 +32,11 @@ * @see Tag * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.0") @Documented @Inherited -@API(status = STABLE, since = "5.0") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface Tags { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java index 052508f90a62..a110d3589650 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java @@ -75,10 +75,10 @@ * @see BeforeEach * @see AfterEach */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.0") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) @Testable public @interface Test { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java index 3781188c9f36..fb41cb7e8362 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java @@ -64,11 +64,11 @@ * @see ClassOrderer * @see TestMethodOrder */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.10") @Documented @Inherited -@API(status = STABLE, since = "5.10") +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) public @interface TestClassOrder { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java index b502f382c321..6c429939058a 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java @@ -79,10 +79,10 @@ * @see DynamicTest * @see DynamicContainer */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = MAINTAINED, since = "5.3") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) @Testable public @interface TestFactory { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java index f305634c4baf..80e7ebabfd78 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java @@ -67,11 +67,11 @@ * @see Nested @Nested * @see Execution @Execution */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Inherited -@Documented @API(status = STABLE, since = "5.0") +@Documented +@Inherited +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) public @interface TestInstance { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java index 18c54933de8c..c50864c3243f 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java @@ -74,11 +74,11 @@ * @see MethodOrderer * @see TestClassOrder */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") @Documented @Inherited -@API(status = STABLE, since = "5.7") +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) public @interface TestMethodOrder { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java index bc3f7fa3dd47..01c7776cbc8d 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java @@ -42,8 +42,8 @@ * @see #publishEntry(Map) * @see #publishEntry(String, String) */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface TestReporter { /** @@ -101,8 +101,8 @@ default void publishEntry(String value) { * @since 5.12 * @deprecated Use {@link #publishFile(Path, MediaType)} instead. */ - @Deprecated(since = "5.14", forRemoval = true) @API(status = DEPRECATED, since = "5.14") + @Deprecated(since = "5.14", forRemoval = true) @SuppressWarnings("removal") default void publishFile(Path file, org.junit.jupiter.api.extension.MediaType mediaType) { Preconditions.notNull(mediaType, "mediaType must not be null"); @@ -180,8 +180,8 @@ default void publishDirectory(Path directory) { * @since 5.12 * @deprecated Use {@link #publishFile(String, MediaType, ThrowingConsumer)} instead. */ - @Deprecated(since = "5.14", forRemoval = true) @API(status = DEPRECATED, since = "5.14") + @Deprecated(since = "5.14", forRemoval = true) @SuppressWarnings("removal") default void publishFile(String name, org.junit.jupiter.api.extension.MediaType mediaType, ThrowingConsumer action) { diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java index 5c85bc465e0e..6e16e2dfb3e7 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java @@ -83,10 +83,10 @@ * @see org.junit.jupiter.api.extension.TestTemplateInvocationContext * @see org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.0") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) @Testable public @interface TestTemplate { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java index f9f4c39b3c8f..ae989f3b0682 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java @@ -102,11 +102,11 @@ * * @since 5.5 */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") @Documented @Inherited -@API(status = STABLE, since = "5.7") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface Timeout { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java index 7feffabff6fa..c17ef3805470 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java @@ -78,12 +78,12 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.6") @Documented @ExtendWith(DisabledForJreRangeCondition.class) -@API(status = STABLE, since = "5.6") +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface DisabledForJreRange { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java index 070279b9a461..cc7ef0feba66 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java @@ -72,12 +72,12 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") @Documented @ExtendWith(DisabledIfCondition.class) -@API(status = STABLE, since = "5.7") +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface DisabledIf { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java index bdd4ebb1eeb5..2d89be074c60 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java @@ -73,13 +73,13 @@ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.1") @Documented -@Repeatable(DisabledIfEnvironmentVariables.class) @ExtendWith(DisabledIfEnvironmentVariableCondition.class) -@API(status = STABLE, since = "5.1") +@Repeatable(DisabledIfEnvironmentVariables.class) +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface DisabledIfEnvironmentVariable { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java index 8bedc3fd37ef..8be7b80c8b90 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java @@ -36,10 +36,10 @@ * @see DisabledIfEnvironmentVariable * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.6") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface DisabledIfEnvironmentVariables { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java index 3e22c0f20ebd..582914663391 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java @@ -36,10 +36,10 @@ * @see DisabledIfSystemProperty * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.6") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface DisabledIfSystemProperties { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java index f8f6086dbaab..68b83686e15d 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java @@ -73,13 +73,13 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.1") @Documented -@Repeatable(DisabledIfSystemProperties.class) @ExtendWith(DisabledIfSystemPropertyCondition.class) -@API(status = STABLE, since = "5.1") +@Repeatable(DisabledIfSystemProperties.class) +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface DisabledIfSystemProperty { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java index 330ddb6a8d9b..d91d7a44d1c4 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java @@ -73,11 +73,11 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented +@API(status = STABLE, since = "5.9.1") @DisabledIfSystemProperty(named = "org.graalvm.nativeimage.imagecode", matches = ".+", // disabledReason = "Currently executing within a GraalVM native image") -@API(status = STABLE, since = "5.9.1") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface DisabledInNativeImage { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java index e9e00e7373c1..2c13966ffbd1 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java @@ -77,12 +77,12 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.1") @Documented @ExtendWith(DisabledOnJreCondition.class) -@API(status = STABLE, since = "5.1") +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface DisabledOnJre { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java index 4db5bbe155a9..e4eb1af3bf6a 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java @@ -78,12 +78,12 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.1") @Documented @ExtendWith(DisabledOnOsCondition.class) -@API(status = STABLE, since = "5.1") +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface DisabledOnOs { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java index a161df108e84..0b053b8b698d 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java @@ -78,12 +78,12 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.6") @Documented @ExtendWith(EnabledForJreRangeCondition.class) -@API(status = STABLE, since = "5.6") +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface EnabledForJreRange { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java index 79837a15e7f6..e58a9fbfef21 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java @@ -72,12 +72,12 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") @Documented @ExtendWith(EnabledIfCondition.class) -@API(status = STABLE, since = "5.7") +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface EnabledIf { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java index 1a5a63aff361..3d42598385c1 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java @@ -72,13 +72,13 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.1") @Documented -@Repeatable(EnabledIfEnvironmentVariables.class) @ExtendWith(EnabledIfEnvironmentVariableCondition.class) -@API(status = STABLE, since = "5.1") +@Repeatable(EnabledIfEnvironmentVariables.class) +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface EnabledIfEnvironmentVariable { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java index 32102bd4a95b..3393b71c5a61 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java @@ -36,10 +36,10 @@ * @see EnabledIfEnvironmentVariable * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.6") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface EnabledIfEnvironmentVariables { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java index 640e6a6ea97c..0494a9647534 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java @@ -36,10 +36,10 @@ * @see EnabledIfSystemProperty * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.6") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface EnabledIfSystemProperties { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java index 07651ecc1df0..6fc283bd2b0e 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java @@ -72,13 +72,13 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.1") @Documented -@Repeatable(EnabledIfSystemProperties.class) @ExtendWith(EnabledIfSystemPropertyCondition.class) -@API(status = STABLE, since = "5.1") +@Repeatable(EnabledIfSystemProperties.class) +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface EnabledIfSystemProperty { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java index daafe41ad897..85524b39d35d 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java @@ -73,11 +73,11 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.9.1") @Documented @EnabledIfSystemProperty(named = "org.graalvm.nativeimage.imagecode", matches = ".+", // disabledReason = "Not currently executing within a GraalVM native image") -@API(status = STABLE, since = "5.9.1") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface EnabledInNativeImage { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java index 17da2bf14287..06375e1a5747 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java @@ -77,12 +77,12 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.1") @Documented @ExtendWith(EnabledOnJreCondition.class) -@API(status = STABLE, since = "5.1") +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface EnabledOnJre { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java index 6e58acd4c8fb..89918b0cfd1a 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java @@ -78,12 +78,12 @@ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable * @see org.junit.jupiter.api.Disabled */ -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.1") @Documented @ExtendWith(EnabledOnOsCondition.class) -@API(status = STABLE, since = "5.1") +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface EnabledOnOs { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java index d4b60e65a252..d5f4d7df0c95 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java @@ -59,8 +59,8 @@ * @see BeforeClassTemplateInvocationCallback * @see AfterClassTemplateInvocationCallback */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface AfterAllCallback extends Extension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterClassTemplateInvocationCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterClassTemplateInvocationCallback.java index 103e33b51a20..ab2464402976 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterClassTemplateInvocationCallback.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterClassTemplateInvocationCallback.java @@ -59,8 +59,8 @@ * @see BeforeTestExecutionCallback * @see AfterTestExecutionCallback */ -@FunctionalInterface @API(status = EXPERIMENTAL, since = "6.0") +@FunctionalInterface public interface AfterClassTemplateInvocationCallback extends Extension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java index 7fb99759d7af..2bb5b0bfdb83 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java @@ -62,8 +62,8 @@ * @see BeforeClassTemplateInvocationCallback * @see AfterClassTemplateInvocationCallback */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface AfterEachCallback extends Extension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java index e537eb969713..f6c49d9f7078 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java @@ -63,8 +63,8 @@ * @see BeforeClassTemplateInvocationCallback * @see AfterClassTemplateInvocationCallback */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface AfterTestExecutionCallback extends Extension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java index 9a08dd8fb992..4c638986f872 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java @@ -59,8 +59,8 @@ * @see BeforeClassTemplateInvocationCallback * @see AfterClassTemplateInvocationCallback */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface BeforeAllCallback extends Extension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeClassTemplateInvocationCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeClassTemplateInvocationCallback.java index f4e4eeb31c1d..7efb791cb8b9 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeClassTemplateInvocationCallback.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeClassTemplateInvocationCallback.java @@ -59,8 +59,8 @@ * @see BeforeTestExecutionCallback * @see AfterTestExecutionCallback */ -@FunctionalInterface @API(status = EXPERIMENTAL, since = "6.0") +@FunctionalInterface public interface BeforeClassTemplateInvocationCallback extends Extension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java index 4239d7d37485..d5cbfa1b4fd5 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java @@ -62,8 +62,8 @@ * @see BeforeClassTemplateInvocationCallback * @see AfterClassTemplateInvocationCallback */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface BeforeEachCallback extends Extension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java index bfd856007f36..52acae61d751 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java @@ -63,8 +63,8 @@ * @see BeforeClassTemplateInvocationCallback * @see AfterClassTemplateInvocationCallback */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface BeforeTestExecutionCallback extends Extension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java index 31af5c81a917..9047047923cc 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java @@ -53,8 +53,8 @@ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface ExecutionCondition extends Extension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java index 7bbab30aa8d3..d472c1b85962 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java @@ -89,12 +89,12 @@ * @see RegisterExtension * @see Extension */ -@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.0") @Documented @Inherited @Repeatable(Extensions.class) -@API(status = STABLE, since = "5.0") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) public @interface ExtendWith { /** 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..996a0948aac3 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 @@ -419,8 +419,8 @@ default void publishReportEntry(String value) { * {@link #publishFile(String, MediaType, ThrowingConsumer)} * instead. */ - @Deprecated(since = "5.14", forRemoval = true) @API(status = DEPRECATED, since = "5.14") + @Deprecated(since = "5.14", forRemoval = true) @SuppressWarnings("removal") default void publishFile(String name, org.junit.jupiter.api.extension.MediaType mediaType, ThrowingConsumer action) { @@ -539,8 +539,8 @@ interface Store { * @since 5.1 * @deprecated Please extend {@code AutoCloseable} directly. */ - @Deprecated(since = "5.13") @API(status = DEPRECATED, since = "5.13") + @Deprecated(since = "5.13") interface CloseableResource { /** @@ -649,8 +649,8 @@ default V getOrDefault(Object key, Class requiredType, V defaultValue) { * @see AutoCloseable * @deprecated Please use {@link #computeIfAbsent(Class)} instead. */ - @Deprecated(since = "6.0") @API(status = DEPRECATED, since = "6.0") + @Deprecated(since = "6.0") default V getOrComputeIfAbsent(Class type) { return computeIfAbsent(type); } @@ -725,8 +725,8 @@ default V computeIfAbsent(Class type) { * @see AutoCloseable * @deprecated Please use {@link #computeIfAbsent(Object, Function)} instead. */ - @Deprecated(since = "6.0") @API(status = DEPRECATED, since = "6.0") + @Deprecated(since = "6.0") @Nullable Object getOrComputeIfAbsent(K key, Function defaultCreator); @@ -798,8 +798,8 @@ default V computeIfAbsent(Class type) { * @see AutoCloseable * @deprecated Please use {@link #computeIfAbsent(Object, Function, Class)} instead. */ - @Deprecated(since = "6.0") @API(status = DEPRECATED, since = "6.0") + @Deprecated(since = "6.0") @Nullable V getOrComputeIfAbsent(K key, Function defaultCreator, Class requiredType); diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java index a9817b4866ba..0e35401ab86f 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java @@ -33,11 +33,11 @@ * @see ExtendWith * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.0") @Documented @Inherited -@API(status = STABLE, since = "5.0") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) public @interface Extensions { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/MediaType.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/MediaType.java index 6c9ec23e710c..ebc6827ca00c 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/MediaType.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/MediaType.java @@ -32,8 +32,8 @@ * @see ExtensionContext#publishFile(String, MediaType, org.junit.jupiter.api.function.ThrowingConsumer) * @deprecated Use {@link org.junit.jupiter.api.MediaType} instead. */ -@Deprecated(since = "5.14", forRemoval = true) @API(status = Status.DEPRECATED, since = "5.14") +@Deprecated(since = "5.14", forRemoval = true) public final class MediaType extends org.junit.jupiter.api.MediaType { /** @@ -55,8 +55,8 @@ public final class MediaType extends org.junit.jupiter.api.MediaType { * The {@code application/json; charset=UTF-8} media type. * @deprecated Use {@link #APPLICATION_JSON} instead. */ - @Deprecated(since = "5.14") @API(status = DEPRECATED, since = "5.14") + @Deprecated(since = "5.14") public static final MediaType APPLICATION_JSON_UTF_8 = create("application", "json", UTF_8); /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java index 89121342acb4..fce203057855 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java @@ -138,9 +138,9 @@ * @see Extension * @see org.junit.jupiter.api.Order @Order */ -@Target(ElementType.FIELD) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.1") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) public @interface RegisterExtension { } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java index 29cb10b53d67..51465cd9cab1 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java @@ -33,8 +33,8 @@ * @since 5.0 * @see LifecycleMethodExecutionExceptionHandler */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface TestExecutionExceptionHandler extends Extension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java index e06ca4d75c0c..3e10d8d260f8 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java @@ -50,8 +50,8 @@ * @see TestInstancePreDestroyCallback * @see ParameterResolver */ -@FunctionalInterface @API(status = STABLE, since = "5.7") +@FunctionalInterface public interface TestInstanceFactory extends TestInstantiationAwareExtension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java index ad70edb7cf41..54f882c10dbc 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java @@ -39,8 +39,8 @@ * @see TestInstanceFactory * @see ParameterResolver */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface TestInstancePostProcessor extends TestInstantiationAwareExtension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java index 70a0035c826d..462de0283343 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java @@ -43,8 +43,8 @@ * @see TestInstanceFactory * @see ParameterResolver */ -@FunctionalInterface @API(status = STABLE, since = "5.11") +@FunctionalInterface public interface TestInstancePreConstructCallback extends TestInstantiationAwareExtension { /** 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..c5ca5f08d3d6 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 @@ -55,8 +55,8 @@ * @see TestInstanceFactory * @see ParameterResolver */ -@FunctionalInterface @API(status = STABLE, since = "5.7") +@FunctionalInterface public interface TestInstancePreDestroyCallback extends Extension { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationAwareExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationAwareExtension.java index b55725a7a7ae..efb78f6b3933 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationAwareExtension.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationAwareExtension.java @@ -118,8 +118,8 @@ enum ExtensionContextScope { * * @see #DEFAULT_SCOPE_PROPERTY_NAME */ - @Deprecated(since = "5.12") // - @API(status = DEPRECATED, since = "5.12") + @API(status = DEPRECATED, since = "5.12") // + @Deprecated(since = "5.12") DEFAULT, /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java index e4ad90b7ae2f..cc83a1822090 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java @@ -40,8 +40,8 @@ * @see ThrowingConsumer * @see ThrowingSupplier */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface Executable { void execute() throws Throwable; diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java index f9a897126f2d..c31eb750c156 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java @@ -40,8 +40,8 @@ * @see Executable * @see ThrowingSupplier */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface ThrowingConsumer { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java index bfa2c4d87b55..518557a7c353 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java @@ -41,8 +41,8 @@ * @see Executable * @see ThrowingConsumer */ -@FunctionalInterface @API(status = STABLE, since = "5.0") +@FunctionalInterface public interface ThrowingSupplier { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java index 7d5191bedeb2..8669a7ba81ff 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java @@ -85,10 +85,10 @@ * * @since 5.4 */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.PARAMETER }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.10") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.PARAMETER }) public @interface TempDir { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java index 52b6713fa4a7..775268facd5a 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java @@ -44,8 +44,8 @@ * @since 5.10 * @see TempDir @TempDir */ -@FunctionalInterface @API(status = MAINTAINED, since = "5.13.3") +@FunctionalInterface public interface TempDirFactory extends Closeable { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java index 50354894cb45..d5fa94553184 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java @@ -56,9 +56,9 @@ * @since 5.3 */ @API(status = STABLE, since = "5.10") +@Inherited @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) -@Inherited public @interface Execution { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java index 41eb28dea117..c07eeba643d1 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java @@ -34,10 +34,10 @@ * @see ResourceLock */ @API(status = STABLE, since = "5.10") -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) @Inherited @ResourceLock(Resources.GLOBAL) +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) public @interface Isolated { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java index 17e1a62cfc42..a337646b6693 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java @@ -83,10 +83,10 @@ * @since 5.3 */ @API(status = STABLE, since = "5.10") -@Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.TYPE, ElementType.METHOD }) @Inherited @Repeatable(ResourceLocks.class) +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) public @interface ResourceLock { /** diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java index 34f38c8cfde1..1b2a85b8b6cf 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java @@ -34,9 +34,9 @@ * @since 5.3 */ @API(status = STABLE, since = "5.10") +@Inherited @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) -@Inherited public @interface ResourceLocks { /** diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java index d849bd609c4d..439806a51782 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java @@ -105,8 +105,8 @@ public TestInstance.Lifecycle getDefaultTestInstanceLifecycle() { __ -> delegate.getDefaultTestInstanceLifecycle()); } - @SuppressWarnings("unchecked") @Override + @SuppressWarnings("unchecked") public Predicate getExecutionConditionFilter() { return (Predicate) cache.computeIfAbsent(DEACTIVATE_CONDITIONS_PATTERN_PROPERTY_NAME, __ -> delegate.getExecutionConditionFilter()); @@ -118,15 +118,15 @@ public DisplayNameGenerator getDefaultDisplayNameGenerator() { __ -> delegate.getDefaultDisplayNameGenerator()); } - @SuppressWarnings("unchecked") @Override + @SuppressWarnings("unchecked") public Optional getDefaultTestMethodOrderer() { return (Optional) cache.computeIfAbsent(DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME, __ -> delegate.getDefaultTestMethodOrderer()); } - @SuppressWarnings("unchecked") @Override + @SuppressWarnings("unchecked") public Optional getDefaultTestClassOrderer() { return (Optional) cache.computeIfAbsent(DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME, __ -> delegate.getDefaultTestClassOrderer()); @@ -138,8 +138,8 @@ public CleanupMode getDefaultTempDirCleanupMode() { __ -> delegate.getDefaultTempDirCleanupMode()); } - @SuppressWarnings("unchecked") @Override + @SuppressWarnings("unchecked") public Supplier getDefaultTempDirFactorySupplier() { return (Supplier) cache.computeIfAbsent(DEFAULT_FACTORY_PROPERTY_NAME, __ -> delegate.getDefaultTempDirFactorySupplier()); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java index 50ea9550fe8f..1dfaed49f039 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java @@ -203,8 +203,8 @@ public Supplier getDefaultTempDirFactorySupplier() { return () -> supplier.get().orElse(TempDirFactory.Standard.INSTANCE); } - @SuppressWarnings("deprecation") @Override + @SuppressWarnings("deprecation") public ExtensionContextScope getDefaultTestInstantiationExtensionContextScope() { return extensionContextScopeConverter.getOrDefault(configurationParameters, DEFAULT_TEST_INSTANTIATION_EXTENSION_CONTEXT_SCOPE_PROPERTY_NAME, ExtensionContextScope.DEFAULT); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java index 79443ee7d4be..4cebe91ea1b5 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java @@ -24,8 +24,8 @@ * * @since 5.0 */ -@FunctionalInterface @API(status = INTERNAL, since = "5.0") +@FunctionalInterface public interface AfterEachMethodAdapter extends Extension { void invokeAfterEachMethod(ExtensionContext context, ExtensionRegistry registry) throws Throwable; diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java index 2b4ea8658443..407092e7ab58 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java @@ -24,8 +24,8 @@ * * @since 5.0 */ -@FunctionalInterface @API(status = INTERNAL, since = "5.0") +@FunctionalInterface public interface BeforeEachMethodAdapter extends Extension { void invokeBeforeEachMethod(ExtensionContext context, ExtensionRegistry registry) throws Throwable; diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionContextSupplier.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionContextSupplier.java index c3be76eb148e..c8df5eec3471 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionContextSupplier.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionContextSupplier.java @@ -25,8 +25,8 @@ * @since 5.12 * @see TestInstantiationAwareExtension */ -@FunctionalInterface @API(status = INTERNAL, since = "5.12") +@FunctionalInterface public interface ExtensionContextSupplier { static ExtensionContextSupplier create(ExtensionContext currentExtensionContext, diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java index 464964c9a757..424fd5a45ab0 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java @@ -53,8 +53,8 @@ public NamespaceAwareStore(NamespacedHierarchicalStore valuesStore, N return this.<@Nullable T> accessStore(action); } - @SuppressWarnings("deprecation") @Override + @SuppressWarnings("deprecation") public @Nullable Object getOrComputeIfAbsent(K key, Function defaultCreator) { Preconditions.notNull(key, "key must not be null"); @@ -64,8 +64,8 @@ public NamespaceAwareStore(NamespacedHierarchicalStore valuesStore, N return this.<@Nullable Object> accessStore(action); } - @SuppressWarnings("deprecation") @Override + @SuppressWarnings("deprecation") public @Nullable V getOrComputeIfAbsent(K key, Function defaultCreator, Class requiredType) { Preconditions.notNull(key, "key must not be null"); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java index 723af1b807a1..165908a57f25 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java @@ -19,8 +19,8 @@ /** * @since 5.0 */ -@FunctionalInterface @API(status = INTERNAL, since = "5.0") +@FunctionalInterface public interface TestInstancesProvider { default TestInstances getTestInstances(JupiterEngineExecutionContext context) { 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..45af2b0ceed1 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 @@ -40,8 +40,8 @@ class SameThreadTimeoutInvocation implements Invocat this.preInterruptCallback = preInterruptCallback; } - @SuppressWarnings("NullAway") @Override + @SuppressWarnings("NullAway") public T proceed() throws Throwable { InterruptTask interruptTask = new InterruptTask(Thread.currentThread(), preInterruptCallback); ScheduledFuture future = executor.schedule(interruptTask, timeout.value(), timeout.unit()); diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java index 540b42ad5150..db07e8e9c478 100644 --- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java +++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java @@ -50,12 +50,12 @@ * @deprecated Please migrate to Jupiter extensions and use * {@link org.junit.jupiter.api.Disabled @Disabled} instead. */ -@SuppressWarnings("removal") -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) @API(status = DEPRECATED, since = "6.0") @Deprecated(since = "6.0", forRemoval = true) @EnableRuleMigrationSupport @ExtendWith(IgnoreCondition.class) +@Retention(RetentionPolicy.RUNTIME) +@SuppressWarnings("removal") +@Target(ElementType.TYPE) public @interface EnableJUnit4MigrationSupport { } diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java index 88d713067c3e..90c05ffe7f69 100644 --- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java +++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java @@ -38,13 +38,13 @@ * @see org.junit.jupiter.migrationsupport.EnableJUnit4MigrationSupport * @deprecated Please migrate to Jupiter extensions. */ -@SuppressWarnings("removal") -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) @API(status = DEPRECATED, since = "6.0") @Deprecated(since = "6.0", forRemoval = true) +@ExtendWith(ExpectedExceptionSupport.class) @ExtendWith(ExternalResourceSupport.class) @ExtendWith(VerifierSupport.class) -@ExtendWith(ExpectedExceptionSupport.class) +@Retention(RetentionPolicy.RUNTIME) +@SuppressWarnings("removal") +@Target(ElementType.TYPE) public @interface EnableRuleMigrationSupport { } 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..7542bc45ae10 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 @@ -41,9 +41,9 @@ * {@link org.junit.jupiter.api.Assertions#assertThrows(Class, Executable)} * instead. */ -@SuppressWarnings("removal") @API(status = DEPRECATED, since = "6.0") @Deprecated(since = "6.0", forRemoval = true) +@SuppressWarnings("removal") public class ExpectedExceptionSupport implements AfterEachCallback, TestExecutionExceptionHandler { private static final String EXCEPTION_WAS_HANDLED = "exceptionWasHandled"; diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java index b5d77cfc6a7e..b87917886e70 100644 --- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java +++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java @@ -39,9 +39,9 @@ * @see org.junit.Rule * @deprecated Please use {@link org.junit.jupiter.api.AutoClose @AutoClose} instead. */ -@SuppressWarnings("removal") @API(status = DEPRECATED, since = "6.0") @Deprecated(since = "6.0", forRemoval = true) +@SuppressWarnings("removal") public class ExternalResourceSupport implements BeforeEachCallback, AfterEachCallback { private final TestRuleSupport support = new TestRuleSupport(ExternalResourceAdapter::new, ExternalResource.class); diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java index 1892be971501..44aff4072573 100644 --- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java +++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java @@ -38,9 +38,9 @@ * @see org.junit.Rule * @deprecated Please implement {@link org.junit.jupiter.api.extension.AfterTestExecutionCallback} instead. */ -@SuppressWarnings("removal") @API(status = DEPRECATED, since = "6.0") @Deprecated(since = "6.0", forRemoval = true) +@SuppressWarnings("removal") public class VerifierSupport implements AfterEachCallback { private final TestRuleSupport support = new TestRuleSupport(VerifierAdapter::new, Verifier.class); diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/AfterParameterizedClassInvocation.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/AfterParameterizedClassInvocation.java index a0884e37699e..ec047552b400 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/AfterParameterizedClassInvocation.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/AfterParameterizedClassInvocation.java @@ -148,11 +148,11 @@ * @see BeforeParameterizedClassInvocation * @see org.junit.jupiter.api.TestInstance */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = EXPERIMENTAL, since = "6.0") @ClassTemplateInvocationLifecycleMethod(classTemplateAnnotation = ParameterizedClass.class, lifecycleMethodAnnotation = AfterParameterizedClassInvocation.class) +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) public @interface AfterParameterizedClassInvocation { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/BeforeParameterizedClassInvocation.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/BeforeParameterizedClassInvocation.java index 6a1be1221cb1..42c86d32ec91 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/BeforeParameterizedClassInvocation.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/BeforeParameterizedClassInvocation.java @@ -148,11 +148,11 @@ * @see AfterParameterizedClassInvocation * @see org.junit.jupiter.api.TestInstance */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = EXPERIMENTAL, since = "6.0") @ClassTemplateInvocationLifecycleMethod(classTemplateAnnotation = ParameterizedClass.class, lifecycleMethodAnnotation = BeforeParameterizedClassInvocation.class) +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) public @interface BeforeParameterizedClassInvocation { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/Parameter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/Parameter.java index a68e943e4124..447a284375b0 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/Parameter.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/Parameter.java @@ -38,10 +38,10 @@ * @see org.junit.jupiter.params.converter.ArgumentConverter * @see org.junit.jupiter.params.converter.ConvertWith */ +@API(status = EXPERIMENTAL, since = "6.0") +@Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.ANNOTATION_TYPE, ElementType.FIELD }) -@Documented -@API(status = EXPERIMENTAL, since = "6.0") public @interface Parameter { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedClass.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedClass.java index 4a64a181c713..6fd96cf0e21f 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedClass.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedClass.java @@ -145,14 +145,14 @@ * @see org.junit.jupiter.params.converter.ArgumentConverter * @see org.junit.jupiter.params.converter.ConvertWith */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Inherited @API(status = EXPERIMENTAL, since = "6.0") @ClassTemplate +@Documented @ExtendWith(ParameterizedClassExtension.class) +@Inherited +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE }) public @interface ParameterizedClass { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java index f5af060b5bcf..62056ae0d3bf 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java @@ -129,13 +129,13 @@ * @see org.junit.jupiter.params.converter.ArgumentConverter * @see org.junit.jupiter.params.converter.ConvertWith */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.7") -@TestTemplate +@Documented @ExtendWith(ParameterizedTestExtension.class) +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) +@TestTemplate public @interface ParameterizedTest { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java index 0b30acecbccd..84fa5f04e63d 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java @@ -41,10 +41,10 @@ * @see ArgumentsAggregator * @see org.junit.jupiter.params.ParameterizedTest */ +@API(status = STABLE, since = "5.7") +@Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.ANNOTATION_TYPE, ElementType.PARAMETER, ElementType.FIELD }) -@Documented -@API(status = STABLE, since = "5.7") public @interface AggregateWith { Class value(); diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java index 66bea68bea1d..f3a12ed931da 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java @@ -36,10 +36,10 @@ * @see org.junit.jupiter.params.ParameterizedTest * @see org.junit.jupiter.params.converter.ArgumentConverter */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.PARAMETER, ElementType.FIELD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.7") +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.PARAMETER, ElementType.FIELD }) public @interface ConvertWith { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java index 8559eebab160..d7a9ee49d2de 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java @@ -34,12 +34,12 @@ * @see org.junit.jupiter.params.ParameterizedTest * @see java.time.format.DateTimeFormatterBuilder#appendPattern(String) */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.PARAMETER, ElementType.FIELD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented @API(status = STABLE, since = "5.7") @ConvertWith(JavaTimeArgumentConverter.class) +@Documented +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.ANNOTATION_TYPE, ElementType.PARAMETER, ElementType.FIELD }) public @interface JavaTimeConversionPattern { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java index e14b781b0d1b..ad478f89fb03 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java @@ -69,8 +69,8 @@ public Stream provideArguments(ParameterDeclarations parame * {@link #provideArguments(ParameterDeclarations, ExtensionContext, Annotation)} * instead. */ - @Deprecated(since = "5.13") @API(status = DEPRECATED, since = "5.13") + @Deprecated(since = "5.13") protected Stream provideArguments(ExtensionContext context, A annotation) { throw new JUnitException(""" AnnotationBasedArgumentsProvider does not override the \ diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java index 9b11b7a84f92..05b1a05401ea 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java @@ -50,8 +50,8 @@ * @see org.junit.jupiter.params.provider.ArgumentsProvider * @see org.junit.jupiter.params.converter.ArgumentConverter */ -@FunctionalInterface @API(status = STABLE, since = "5.7") +@FunctionalInterface public interface Arguments { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java index d38595379442..988cec7d2c05 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java @@ -54,8 +54,8 @@ public interface ArgumentsProvider { * @deprecated Please implement * {@link #provideArguments(ParameterDeclarations, ExtensionContext)} instead. */ - @Deprecated(since = "5.13") @API(status = DEPRECATED, since = "5.13") + @Deprecated(since = "5.13") default Stream provideArguments(@SuppressWarnings("unused") ExtensionContext context) throws Exception { throw new UnsupportedOperationException( diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java index 34561ccd3e1f..51f3035169ba 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java @@ -40,12 +40,12 @@ * @see org.junit.jupiter.params.ParameterizedClass * @see org.junit.jupiter.params.ParameterizedTest */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") @Documented @Inherited @Repeatable(ArgumentsSources.class) -@API(status = STABLE, since = "5.7") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface ArgumentsSource { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java index ec85f3a4ba72..c0d23a2d1adb 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java @@ -36,11 +36,11 @@ * @since 5.0 * @see org.junit.jupiter.params.provider.ArgumentsSource */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") @Documented @Inherited -@API(status = STABLE, since = "5.7") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface ArgumentsSources { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java index 28a1bf469c77..18f371cac568 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java @@ -73,14 +73,14 @@ * @see org.junit.jupiter.params.ParameterizedClass * @see org.junit.jupiter.params.ParameterizedTest */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") +@ArgumentsSource(CsvFileArgumentsProvider.class) @Documented @Inherited @Repeatable(CsvFileSources.class) -@API(status = STABLE, since = "5.7") -@ArgumentsSource(CsvFileArgumentsProvider.class) +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface CsvFileSource { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSources.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSources.java index 91decbc80993..0c97bf7bf4f4 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSources.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSources.java @@ -37,11 +37,11 @@ * @see CsvFileSource * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.11") @Documented @Inherited -@API(status = STABLE, since = "5.11") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface CsvFileSources { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java index b8dd46cd5b61..05cb41b57b6d 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java @@ -72,14 +72,14 @@ * @see org.junit.jupiter.params.ParameterizedClass * @see org.junit.jupiter.params.ParameterizedTest */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Repeatable(CsvSources.class) -@Documented -@Inherited @API(status = STABLE, since = "5.7") @ArgumentsSource(CsvArgumentsProvider.class) +@Documented +@Inherited +@Repeatable(CsvSources.class) +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface CsvSource { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSources.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSources.java index 00981aceba84..b8f3d8bceda8 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSources.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSources.java @@ -37,11 +37,11 @@ * @see CsvSource * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.11") @Documented @Inherited -@API(status = STABLE, since = "5.11") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface CsvSources { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java index bd70638ff840..2d664b54bae2 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java @@ -56,12 +56,12 @@ * @see NullSource * @see NullAndEmptySource */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Inherited @API(status = STABLE, since = "5.7") @ArgumentsSource(EmptyArgumentsProvider.class) +@Documented +@Inherited +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface EmptySource { } diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java index 000e3460f211..c41a041936e1 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java @@ -53,14 +53,14 @@ * @see org.junit.jupiter.params.ParameterizedClass * @see org.junit.jupiter.params.ParameterizedTest */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") +@ArgumentsSource(EnumArgumentsProvider.class) @Documented @Inherited @Repeatable(EnumSources.class) -@API(status = STABLE, since = "5.7") -@ArgumentsSource(EnumArgumentsProvider.class) +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface EnumSource { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSources.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSources.java index 8c6ba45bc6e4..0b05cc2e5d0e 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSources.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSources.java @@ -37,11 +37,11 @@ * @see EnumSource * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.11") @Documented @Inherited -@API(status = STABLE, since = "5.11") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface EnumSources { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/FieldSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/FieldSource.java index 1b01d6c4de90..e9cf408f35b7 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/FieldSource.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/FieldSource.java @@ -129,14 +129,14 @@ * @see org.junit.jupiter.params.ParameterizedTest * @see org.junit.jupiter.api.TestInstance */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = MAINTAINED, since = "5.13.3") +@ArgumentsSource(FieldArgumentsProvider.class) @Documented @Inherited @Repeatable(FieldSources.class) -@API(status = MAINTAINED, since = "5.13.3") -@ArgumentsSource(FieldArgumentsProvider.class) +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface FieldSource { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/FieldSources.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/FieldSources.java index 96f6b0f368dc..60fcf4430516 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/FieldSources.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/FieldSources.java @@ -37,11 +37,11 @@ * @see FieldSource * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = MAINTAINED, since = "5.13.3") @Documented @Inherited -@API(status = MAINTAINED, since = "5.13.3") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface FieldSources { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java index d6b4d3599fa3..b5367867361e 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java @@ -119,14 +119,14 @@ * @see org.junit.jupiter.params.ParameterizedTest * @see org.junit.jupiter.api.TestInstance */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") +@ArgumentsSource(MethodArgumentsProvider.class) @Documented @Inherited @Repeatable(MethodSources.class) -@API(status = STABLE, since = "5.7") -@ArgumentsSource(MethodArgumentsProvider.class) +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface MethodSource { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSources.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSources.java index 16460e3700be..426ca7eb54f0 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSources.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSources.java @@ -37,11 +37,11 @@ * @see MethodSource * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.11") @Documented @Inherited -@API(status = STABLE, since = "5.11") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface MethodSources { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java index 727e3eab235e..a3688dc25b76 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java @@ -40,12 +40,12 @@ * @see NullSource * @see EmptySource */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") @Documented +@EmptySource @Inherited -@API(status = STABLE, since = "5.7") @NullSource -@EmptySource +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface NullAndEmptySource { } diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java index 07764760994a..c1443e400c2a 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java @@ -41,12 +41,12 @@ * @see EmptySource * @see NullAndEmptySource */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Inherited @API(status = STABLE, since = "5.7") @ArgumentsSource(NullArgumentsProvider.class) +@Documented +@Inherited +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface NullSource { } diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java index 0dfa6bad1c22..a01d171a673d 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java @@ -44,14 +44,14 @@ * @see org.junit.jupiter.params.ParameterizedClass * @see org.junit.jupiter.params.ParameterizedTest */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.7") +@ArgumentsSource(ValueArgumentsProvider.class) @Documented @Inherited @Repeatable(ValueSources.class) -@API(status = STABLE, since = "5.7") -@ArgumentsSource(ValueArgumentsProvider.class) +@Retention(RetentionPolicy.RUNTIME) @SuppressWarnings("exports") +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface ValueSource { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSources.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSources.java index d870ea3d641d..d0b73ce8eae1 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSources.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSources.java @@ -37,11 +37,11 @@ * @see ValueSource * @see java.lang.annotation.Repeatable */ -@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@API(status = STABLE, since = "5.11") @Documented @Inherited -@API(status = STABLE, since = "5.11") +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.TYPE }) public @interface ValueSources { /** diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java index 7549a1c6450f..0884a6083124 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java @@ -28,7 +28,7 @@ * * @since 5.0 */ -@FunctionalInterface @API(status = STABLE, since = "5.7") +@FunctionalInterface public interface AnnotationConsumer extends Consumer { } diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/ParameterInfo.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/ParameterInfo.java index b0d8e370b057..680334ca4324 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/ParameterInfo.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/ParameterInfo.java @@ -49,8 +49,8 @@ * @see ParameterizedTest * @deprecated Please use {@link org.junit.jupiter.params.ParameterInfo} instead */ -@Deprecated(since = "5.14", forRemoval = true) @API(status = DEPRECATED, since = "5.14") +@Deprecated(since = "5.14", forRemoval = true) public interface ParameterInfo extends org.junit.jupiter.params.ParameterInfo { /** @@ -59,8 +59,8 @@ public interface ParameterInfo extends org.junit.jupiter.params.ParameterInfo { * @deprecated Please use * {@link org.junit.jupiter.params.ParameterInfo#NAMESPACE} instead */ - @Deprecated(since = "5.14", forRemoval = true) @API(status = DEPRECATED, since = "5.14") + @Deprecated(since = "5.14", forRemoval = true) Namespace NAMESPACE = Namespace.create(ParameterInfo.class); /** @@ -69,8 +69,8 @@ public interface ParameterInfo extends org.junit.jupiter.params.ParameterInfo { * @deprecated Please use * {@link org.junit.jupiter.params.ParameterInfo#KEY} instead */ - @Deprecated(since = "5.14", forRemoval = true) @API(status = DEPRECATED, since = "5.14") + @Deprecated(since = "5.14", forRemoval = true) Object KEY = ParameterInfo.class; /** @@ -80,8 +80,8 @@ public interface ParameterInfo extends org.junit.jupiter.params.ParameterInfo { * {@link org.junit.jupiter.params.ParameterInfo#get(ExtensionContext)} * instead */ - @Deprecated(since = "5.14", forRemoval = true) @API(status = DEPRECATED, since = "5.14") + @Deprecated(since = "5.14", forRemoval = true) static @Nullable ParameterInfo get(ExtensionContext context) { return context.getStore(NAMESPACE).get(KEY, ParameterInfo.class); } diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/command/BaseCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/command/BaseCommand.java index 30a53d6e6169..174dd17def16 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/command/BaseCommand.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/command/BaseCommand.java @@ -34,12 +34,12 @@ abstract class BaseCommand implements Callable { @Option(names = "--disable-banner", description = "Disable print out of the welcome message.") private boolean disableBanner; - @SuppressWarnings("unused") @Option(names = { "-h", "--help" }, usageHelp = true, description = "Display help information.") + @SuppressWarnings("unused") private boolean helpRequested; - @SuppressWarnings("unused") @Option(names = "--version", versionHelp = true, description = "Display version information.") + @SuppressWarnings("unused") private boolean versionRequested; void execute(String... args) { 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 79a1207a4790..fa915e57b80b 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 @@ -111,8 +111,8 @@ static class ReportingOptions { @Option(names = "--fail-fast", description = "Stops test execution after the first failed test.") private boolean failFast; - @Nullable @Option(names = "--reports-dir", paramLabel = "DIR", description = "Enable report output into a specified local directory (will be created if it does not exist).") + @Nullable private Path reportsDir; Optional getReportsDir() { diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptionsMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptionsMixin.java index 999778962ccc..72cbe64aea32 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptionsMixin.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptionsMixin.java @@ -32,8 +32,8 @@ public class TestConsoleOutputOptionsMixin { public static class ConsoleOutputOptions { - @Nullable @Option(names = "--color-palette", paramLabel = "FILE", description = "Specify a path to a properties file to customize ANSI style of output (not supported by all terminals).") + @Nullable private Path colorPalette; @Option(names = "--single-color", description = "Style test output using only text attributes, no color (not supported by all terminals).") @@ -48,12 +48,12 @@ public static class ConsoleOutputOptions { + "Use one of: ${COMPLETION-CANDIDATES}. Default is detected based on default character encoding.") private final Theme theme = DEFAULT_THEME; - @Nullable @Option(names = "--redirect-stdout", paramLabel = "FILE", description = "Redirect test output to stdout to a file.") + @Nullable private Path stdout; - @Nullable @Option(names = "--redirect-stderr", paramLabel = "FILE", description = "Redirect test output to stderr to a file.") + @Nullable private Path stderr; private void applyTo(TestConsoleOutputOptions result) { diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptionsMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptionsMixin.java index cce9455d8c98..593f9c0244c6 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptionsMixin.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptionsMixin.java @@ -55,13 +55,13 @@ public class TestDiscoveryOptionsMixin { public static class SelectorOptions { - @Nullable @Option(names = { "--scan-classpath", "--scan-class-path" }, converter = ClasspathEntriesConverter.class, paramLabel = "PATH", arity = "0..1", description = "Scan all directories on the classpath or explicit classpath roots. " // + "Without arguments, only directories on the system classpath as well as additional classpath " // + "entries supplied via -" + CP_OPTION + " (directories and JAR files) are scanned. " // + "Explicit classpath roots that are not on the classpath will be silently ignored. " // + "This option can be repeated.") + @Nullable private List selectedClasspathEntries; @Option(names = "--scan-modules", description = "Scan all resolved modules for test discovery.") 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..06071d5d5cb0 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 @@ -32,8 +32,8 @@ * * @since 1.12 */ -@SuppressWarnings("exports") // we don't want to export 'org.opentest4j.reporting.tooling.spi' transitively -@API(status = INTERNAL, since = "1.12") +@API(status = INTERNAL, since = "1.12") // we don't want to export 'org.opentest4j.reporting.tooling.spi' transitively +@SuppressWarnings("exports") public class JUnitContributor implements Contributor { public JUnitContributor() {