diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java b/hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java index 009efa7e17..42e83d4581 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java @@ -17,8 +17,18 @@ import java.lang.annotation.Target; * except this annotation need not be attached to a static method * * @author Steve Ebersole + * @deprecated Use JUnit 5 along with one of the Hibernate ORM's class-level test annotations + * ({@link org.hibernate.testing.orm.junit.BaseUnitTest}, + * {@link org.hibernate.testing.orm.junit.SessionFactory}, + * {@link org.hibernate.testing.orm.junit.Jpa}, + * {@link org.hibernate.testing.orm.junit.SessionFactoryFunctionalTesting}, + * {@link org.hibernate.testing.orm.junit.ServiceRegistryFunctionalTesting}, ...) + * and {@link org.junit.jupiter.api.AfterAll}. + * Alternatively to the Hibernate ORM test annotations, + * you can use {@code @TestInstance(TestInstance.Lifecycle.PER_CLASS)} directly on your test. */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE }) +@Deprecated(forRemoval = true) public @interface AfterClassOnce { } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java b/hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java index 3e5264924e..af5978d3c9 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java @@ -17,8 +17,18 @@ import java.lang.annotation.Target; * except this annotation need not be attached to a static method * * @author Steve Ebersole + * @deprecated Use JUnit 5 along with one of the Hibernate ORM's class-level test annotations + * ({@link org.hibernate.testing.orm.junit.BaseUnitTest}, + * {@link org.hibernate.testing.orm.junit.SessionFactory}, + * {@link org.hibernate.testing.orm.junit.Jpa}, + * {@link org.hibernate.testing.orm.junit.SessionFactoryFunctionalTesting}, + * {@link org.hibernate.testing.orm.junit.ServiceRegistryFunctionalTesting}, ...) + * and {@link org.junit.jupiter.api.BeforeAll}. + * Alternatively to the Hibernate ORM test annotations, + * you can use {@code @TestInstance(TestInstance.Lifecycle.PER_CLASS)} directly on your test. */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE }) +@Deprecated(forRemoval = true) public @interface BeforeClassOnce { } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java b/hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java index 220343db4d..1dc0739a0c 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java @@ -16,9 +16,11 @@ import java.lang.annotation.Target; * * @author Hardy Ferentschik * @author Steve Ebersole + * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.FailureExpected} instead. */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE }) +@Deprecated(forRemoval = true) public @interface FailureExpected { String VALIDATE_FAILURE_EXPECTED = "hibernate.test.validatefailureexpected"; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java b/hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java index 530553a9c6..4ac20085c6 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java @@ -15,8 +15,10 @@ import java.lang.annotation.Target; * Annotation used to identify a method as a callback to be executed whenever a {@link FailureExpected} is handled. * * @author Steve Ebersole + * @deprecated No replacement with JUnit 5 at the moment. */ @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.METHOD ) +@Deprecated(forRemoval = true) public @interface OnExpectedFailure { } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java b/hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java index 00cd39dce7..5c8065f5bc 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java @@ -15,8 +15,10 @@ import java.lang.annotation.Target; * Annotation used to identify a method as a callback to be executed on test failures. * * @author Steve Ebersole + * @deprecated No replacement with JUnit 5 at the moment. */ @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.METHOD ) +@Deprecated(forRemoval = true) public @interface OnFailure { } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java index d2c398e1ae..ca6ddcd17a 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java @@ -21,10 +21,12 @@ import org.hibernate.dialect.Dialect; * @see RequiresDialects * * @author Hardy Ferentschik + * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.RequiresDialect} instead. */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @Repeatable(RequiresDialects.class) +@Deprecated(forRemoval = true) public @interface RequiresDialect { /** * The dialects against which to run the test diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java index 0c1d63177c..0382b38102 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java @@ -16,9 +16,11 @@ import java.lang.annotation.Target; * specified feature. * * @author Hardy Ferentschik + * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.RequiresDialectFeature} instead. */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) +@Deprecated(forRemoval = true) public @interface RequiresDialectFeature { /** * @return Class which checks the necessary dialect feature diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java index d6389fbafc..32520b191f 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java @@ -16,9 +16,11 @@ import java.lang.annotation.Target; * Useful when test needs to be run against more than one dialect because of a different reason. * * @author Lukasz Antoniak + * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.RequiresDialects} instead. */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE }) +@Deprecated(forRemoval = true) public @interface RequiresDialects { RequiresDialect[] value(); } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java b/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java index 417e0dc591..837bfa136e 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java @@ -15,9 +15,12 @@ import java.lang.annotation.Target; * An annotation, used in combination with {@link Matcher}, to determine when/if tests should be skipped. * * @author Steve Ebersole + * @deprecated Use JUnit 5 and {@link org.junit.jupiter.api.condition.DisabledOnOs} + * or {@link org.junit.jupiter.api.condition.DisabledIf}. */ @Retention( RetentionPolicy.RUNTIME ) @Target({ ElementType.METHOD, ElementType.TYPE }) +@Deprecated(forRemoval = true) public @interface Skip { /** * The condition which causes a skip diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java b/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java index ca14607637..602058ea89 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java @@ -22,10 +22,12 @@ import org.hibernate.dialect.Dialect; * * @author Hardy Ferentschik * @author Steve Ebersole + * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.SkipForDialect} instead. */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE }) @Repeatable(SkipForDialects.class) +@Deprecated(forRemoval = true) public @interface SkipForDialect { /** * The dialects against which to skip the test diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java b/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java index 627acb3e11..1f7b348bd3 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java @@ -16,9 +16,11 @@ import java.lang.annotation.Target; * Useful when more than one dialect needs to be skipped because of a different reason. * * @author Lukasz Antoniak + * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.SkipForDialectGroup} instead. */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE }) +@Deprecated(forRemoval = true) public @interface SkipForDialects { SkipForDialect[] value(); } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/TestForIssue.java b/hibernate-testing/src/main/java/org/hibernate/testing/TestForIssue.java index 7d76c0e59e..962a89c21a 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/TestForIssue.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/TestForIssue.java @@ -15,9 +15,11 @@ import java.lang.annotation.Target; * A documentation annotation for notating what JIRA issue is being tested. * * @author Steve Ebersole + * @deprecated Use {@link org.hibernate.testing.orm.junit.JiraKey} instead. */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE }) +@Deprecated(forRemoval = true) public @interface TestForIssue { /** * The key of a JIRA issue tested.