diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java index 7b3a2f519a..20a0283079 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java @@ -18,7 +18,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.ConnectionProviderJdbcConnectionAccess; import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -91,7 +91,7 @@ public class C3P0ConnectionProviderTest extends BaseCoreFunctionalTestCase { assertTrue( "PooledDataSource BMean not found, please verify version of c3p0", mbeanfound ); } - @Test @TestForIssue(jiraKey="HHH-9498") + @Test @JiraKey(value="HHH-9498") public void testIsolationPropertyCouldBeEmpty() { C3P0ConnectionProvider provider = new C3P0ConnectionProvider(); try { diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java index 32fc4eddaf..5c6e44397f 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java @@ -11,7 +11,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInterceptor; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12749") +@JiraKey(value = "HHH-12749") @RequiresDialect(H2Dialect.class) public class C3P0DefaultIsolationLevelTest extends BaseNonConfigCoreFunctionalTestCase { diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java index 56b1ea0a3e..4deeeab468 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java @@ -11,7 +11,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInterceptor; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12749") +@JiraKey(value = "HHH-12749") @RequiresDialect(H2Dialect.class) public class C3P0DifferentIsolationLevelTest extends BaseNonConfigCoreFunctionalTestCase { diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/JdbcCompatibilityTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/JdbcCompatibilityTest.java index 0619472e7c..6e0ae4420f 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/JdbcCompatibilityTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/JdbcCompatibilityTest.java @@ -10,7 +10,7 @@ import java.sql.Statement; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class JdbcCompatibilityTest { @Test - @TestForIssue(jiraKey = "HHH-11308") + @JiraKey(value = "HHH-11308") public void testJdbc41(SessionFactoryScope scope) { scope.inTransaction( session -> { session.doWork( connection -> { @@ -45,7 +45,7 @@ public class JdbcCompatibilityTest { } @Test - @TestForIssue(jiraKey = "HHH-11308") + @JiraKey(value = "HHH-11308") public void testJdbc42(SessionFactoryScope scope) { scope.inTransaction( session -> { for ( int i = 0; i < 5; i++ ) { diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java index 6d2f8cc62e..86ae136809 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java @@ -18,7 +18,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.dialect.OracleDialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals; * @author Vlad Mihalcea */ @RequiresDialect(OracleDialect.class) -@TestForIssue( jiraKey = "HHH-10256" ) +@JiraKey(value = "HHH-10256") public class OracleSQLCallableStatementProxyTest extends BaseCoreFunctionalTestCase { diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java index eb1da70092..1fede761fc 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java @@ -14,8 +14,8 @@ import jakarta.persistence.criteria.CriteriaQuery; import org.junit.Assert; import org.junit.Test; -import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.testing.orm.junit.JiraKey; /** * Tests that when using cached prepared statement with batching enabled doesn't bleed over into new transactions. @@ -24,7 +24,7 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; */ public class StatementCacheTest extends BaseCoreFunctionalTestCase { @Test - @TestForIssue( jiraKey = "HHH-7193" ) + @JiraKey(value = "HHH-7193") public void testStatementCaching() { inSession( session -> { diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DB2LegacyDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DB2LegacyDialectTestCase.java index 6fda520b98..50abc51509 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DB2LegacyDialectTestCase.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DB2LegacyDialectTestCase.java @@ -12,7 +12,7 @@ import org.hibernate.engine.jdbc.Size; import org.hibernate.query.spi.Limit; import org.hibernate.type.spi.TypeConfiguration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.Before; import org.junit.Test; @@ -37,7 +37,7 @@ public class DB2LegacyDialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-6866") + @JiraKey(value = "HHH-6866") public void testGetDefaultBinaryTypeName() { String actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, dialect ); assertEquals( @@ -48,7 +48,7 @@ public class DB2LegacyDialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-6866") + @JiraKey(value = "HHH-6866") public void testGetExplicitBinaryTypeName() { // lower bound String actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, Size.length( 1) ); @@ -76,7 +76,7 @@ public class DB2LegacyDialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12369") + @JiraKey(value = "HHH-12369") public void testIntegerOverflowForMaxResults() { Limit rowSelection = new Limit(); rowSelection.setFirstRow(1); diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java index f972717c5d..180486fbe1 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java @@ -11,7 +11,7 @@ import org.hibernate.query.spi.Limit; import static org.junit.Assert.assertEquals; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.Test; @@ -23,7 +23,7 @@ import org.junit.Test; public class DerbyLegacyDialectTestCase extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-3972" ) + @JiraKey( value = "HHH-3972" ) public void testInsertLimitClause() { final int limit = 50; final String input = "select * from tablename t where t.cat = 5"; @@ -34,7 +34,7 @@ public class DerbyLegacyDialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-3972" ) + @JiraKey( value = "HHH-3972" ) public void testInsertLimitWithOffsetClause() { final int limit = 50; final int offset = 200; @@ -46,7 +46,7 @@ public class DerbyLegacyDialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-3972" ) + @JiraKey( value = "HHH-3972" ) public void testInsertLimitWithForUpdateClause() { final int limit = 50; final int offset = 200; @@ -59,7 +59,7 @@ public class DerbyLegacyDialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-3972" ) + @JiraKey( value = "HHH-3972" ) public void testInsertLimitWithWithClause() { final int limit = 50; final int offset = 200; @@ -72,7 +72,7 @@ public class DerbyLegacyDialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-3972" ) + @JiraKey( value = "HHH-3972" ) public void testInsertLimitWithForUpdateAndWithClauses() { final int limit = 50; final int offset = 200; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java index 91070aaf65..1014609021 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -50,7 +50,7 @@ public class InformixFunctionTest { } @Test - @TestForIssue( jiraKey = "HHH-10846" ) + @JiraKey( value = "HHH-10846" ) public void testConcat(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -66,7 +66,7 @@ public class InformixFunctionTest { } @Test - @TestForIssue( jiraKey = "HHH-10846" ) + @JiraKey( value = "HHH-10846" ) public void testSubstring(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -82,7 +82,7 @@ public class InformixFunctionTest { } @Test - @TestForIssue( jiraKey = "HHH-10846" ) + @JiraKey( value = "HHH-10846" ) public void testSubstr(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -98,7 +98,7 @@ public class InformixFunctionTest { } @Test - @TestForIssue( jiraKey = "HHH-10846" ) + @JiraKey( value = "HHH-10846" ) public void testCoalesceAndNvl(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -122,7 +122,7 @@ public class InformixFunctionTest { } @Test - @TestForIssue( jiraKey = "HHH-10800" ) + @JiraKey( value = "HHH-10800" ) public void testCurrentDate(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -145,7 +145,7 @@ public class InformixFunctionTest { } @Test - @TestForIssue( jiraKey = "HHH-10800" ) + @JiraKey( value = "HHH-10800" ) public void testCurrentTimestamp(SessionFactoryScope scope) { scope.inTransaction( (session) -> { diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java index 637f0563b8..5613683bdc 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java @@ -13,7 +13,7 @@ import org.hibernate.LockOptions; import org.hibernate.dialect.DatabaseVersion; import org.hibernate.query.spi.Limit; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.After; import org.junit.Before; @@ -53,7 +53,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10736") + @JiraKey(value = "HHH-10736") public void testGetLimitStringWithNewlineAfterSelect() { final String query = "select" + System.lineSeparator() + "* FROM Employee E WHERE E.firstName = :firstName"; assertEquals( @@ -64,7 +64,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10736") + @JiraKey(value = "HHH-10736") public void testGetLimitStringWithNewlineAfterSelectWithMultipleSpaces() { final String query = "select " + System.lineSeparator() + "* FROM Employee E WHERE E.firstName = :firstName"; assertEquals( @@ -75,7 +75,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8507") + @JiraKey(value = "HHH-8507") public void testGetLimitStringWithNewlineAfterColumnList() { final String query = "select E.fieldA,E.fieldB\r\nFROM Employee E WHERE E.firstName = :firstName"; assertEquals( @@ -88,7 +88,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-6950") + @JiraKey(value = "HHH-6950") public void testGetLimitStringWithFromColumnName() { final String fromColumnNameSQL = "select persistent0_.rid as rid1688_, " + "persistent0_.deviationfromtarget as deviati16_1688_, " + // "from" character sequence as a part of the column name @@ -105,7 +105,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8301") + @JiraKey(value = "HHH-8301") public void testGetLimitStringAliasGeneration() { final String notAliasedSQL = "select column1, column2, column3, column4 from table1"; @@ -118,7 +118,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10994") + @JiraKey(value = "HHH-10994") public void testGetLimitStringAliasGenerationWithAliasesNoAs() { final String aliasedSQLNoAs = "select column1 c1, column c2, column c3, column c4 from table1"; assertEquals( @@ -130,7 +130,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11352") + @JiraKey(value = "HHH-11352") public void testPagingWithColumnNameStartingWithFrom() { final String sql = "select column1 c1, from_column c2 from table1"; assertEquals( "with query_ as (select row_.*,row_number() over (order by current_timestamp) as rownumber_ from (" + @@ -140,7 +140,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7019") + @JiraKey(value = "HHH-7019") public void testGetLimitStringWithSubselect() { final String subselectInSelectClauseSQL = "select persistent0_.id as col_0_0_, " + "(select max(persistent1_.acceptancedate) " + @@ -158,7 +158,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11084") + @JiraKey(value = "HHH-11084") public void testGetLimitStringWithSelectDistinctSubselect() { final String selectDistinctSubselectSQL = "select col0_.CONTENTID as CONTENT1_12_ " + "where col0_.CONTENTTYPE='PAGE' and (col0_.CONTENTID in " + @@ -173,7 +173,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11084") + @JiraKey(value = "HHH-11084") public void testGetLimitStringWithSelectDistinctSubselectNotFirst() { final String selectDistinctSubselectSQL = "select col0_.CONTENTID as CONTENT1_12_ FROM CONTEXT col0_ " + "where col0_.CONTENTTYPE='PAGE' and (col0_.CONTENTID in " + @@ -188,7 +188,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-6728") + @JiraKey(value = "HHH-6728") public void testGetLimitStringCaseSensitive() { final String caseSensitiveSQL = "select persistent0_.id, persistent0_.uid AS tmp1, " + "(select case when persistent0_.name = 'Smith' then 'Neo' else persistent0_.id end) " + @@ -207,7 +207,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-6310") + @JiraKey(value = "HHH-6310") public void testGetLimitStringDistinctWithinAggregation() { final String distinctInAggregateSQL = "select aggregate_function(distinct p.n) as f1 from table849752 p order by f1"; @@ -220,7 +220,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10994") + @JiraKey(value = "HHH-10994") public void testGetLimitStringDistinctWithinAggregationWithoutAlias() { final String distinctInAggregateSQL = "select aggregate_function(distinct p.n) from table849752 p order by f1"; @@ -233,7 +233,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10994") + @JiraKey(value = "HHH-10994") public void testGetLimitStringDistinctWithinAggregationWithAliasNoAs() { final String distinctInAggregateSQL = "select aggregate_function(distinct p.n) f1 from table849752 p order by f1"; @@ -246,7 +246,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7370") + @JiraKey(value = "HHH-7370") public void testGetLimitStringWithMaxOnly() { final String query = "select product2x0_.id as id0_, product2x0_.description as descript2_0_ " + "from Product2 product2x0_ order by product2x0_.id"; @@ -268,7 +268,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7781") + @JiraKey(value = "HHH-7781") public void testGetLimitStringWithCastOperator() { final String query = "select cast(lc302_doku6_.redniBrojStavke as varchar(255)) as col_0_0_, lc302_doku6_.dokumentiID as col_1_0_ " + "from LC302_Dokumenti lc302_doku6_ order by lc302_doku6_.dokumentiID DESC"; @@ -283,7 +283,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10994") + @JiraKey(value = "HHH-10994") public void testGetLimitStringWithCastOperatorWithAliasNoAs() { final String query = "select cast(lc302_doku6_.redniBrojStavke as varchar(255)) f1, lc302_doku6_.dokumentiID f2 " + "from LC302_Dokumenti lc302_doku6_ order by lc302_doku6_.dokumentiID DESC"; @@ -298,7 +298,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10994") + @JiraKey(value = "HHH-10994") public void testGetLimitStringWithCastOperatorWithoutAliases() { final String query = "select cast(lc302_doku6_.redniBrojStavke as varchar(255)), lc302_doku6_.dokumentiID " + "from LC302_Dokumenti lc302_doku6_ order by lc302_doku6_.dokumentiID DESC"; @@ -313,7 +313,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8007") + @JiraKey(value = "HHH-8007") public void testGetLimitStringSelectingMultipleColumnsFromSeveralTables() { final String query = "select t1.*, t2.* from tab1 t1, tab2 t2 where t1.ref = t2.ref order by t1.id desc"; @@ -326,7 +326,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8007") + @JiraKey(value = "HHH-8007") public void testGetLimitStringSelectingAllColumns() { final String query = "select * from tab1 t1, tab2 t2 where t1.ref = t2.ref order by t1.id desc"; @@ -339,7 +339,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11145") + @JiraKey(value = "HHH-11145") public void testGetLimitStringWithFromInColumnName() { final String query = "select [Created From Nonstock Item], field2 from table1"; @@ -351,7 +351,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11145") + @JiraKey(value = "HHH-11145") public void testGetLimitStringWithQuotedColumnNamesAndAlias() { final String query = "select [Created From Item] c1, field2 from table1"; @@ -363,7 +363,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11145") + @JiraKey(value = "HHH-11145") public void testGetLimitStringWithQuotedColumnNamesAndAliasWithAs() { final String query = "select [Created From Item] as c1, field2 from table1"; @@ -375,7 +375,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11324") + @JiraKey(value = "HHH-11324") public void testGetLimitStringWithSelectClauseNestedQueryUsingParenthesis() { final String query = "select t1.c1 as col_0_0, (select case when count(t2.c1)>0 then 'ADDED' else 'UNMODIFIED' end from table2 t2 WHERE (t2.c1 in (?))) as col_1_0 from table1 t1 WHERE 1=1 ORDER BY t1.c1 ASC"; @@ -388,7 +388,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11650") + @JiraKey(value = "HHH-11650") public void testGetLimitWithStringValueContainingParenthesis() { final String query = "select t1.c1 as col_0_0 FROM table1 t1 where t1.c1 = '(123' ORDER BY t1.c1 ASC"; @@ -400,7 +400,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11324") + @JiraKey(value = "HHH-11324") public void testGetLimitStringWithSelectClauseNestedQueryUsingParenthesisOnlyTop() { final String query = "select t1.c1 as col_0_0, (select case when count(t2.c1)>0 then 'ADDED' else 'UNMODIFIED' end from table2 t2 WHERE (t2.c1 in (?))) as col_1_0 from table1 t1 WHERE 1=1 ORDER BY t1.c1 ASC"; @@ -411,7 +411,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8916") + @JiraKey(value = "HHH-8916") public void testGetLimitStringUsingCTEQueryNoOffset() { Limit selection = toRowSelection( 0, 5 ); @@ -449,7 +449,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8916") + @JiraKey(value = "HHH-8916") public void testGetLimitStringUsingCTEQueryWithOffset() { Limit selection = toRowSelection( 1, 5 ); @@ -497,7 +497,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintReadPastLocking() { final String expectedLockHint = "tab1 with (updlock,rowlock,readpast)"; @@ -508,7 +508,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintReadPastLockingNoTimeOut() { final String expectedLockHint = "tab1 with (updlock,rowlock,readpast,nowait)"; @@ -520,7 +520,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintPessimisticRead() { final String expectedLockHint = "tab1 with (holdlock,rowlock)"; @@ -531,7 +531,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintPessimisticReadNoTimeOut() { final String expectedLockHint = "tab1 with (holdlock,rowlock,nowait)"; @@ -543,7 +543,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintWrite() { final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock)"; @@ -554,7 +554,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintWriteWithNoTimeOut() { final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock,nowait)"; @@ -567,7 +567,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintUpgradeNoWait() { final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock,nowait)"; @@ -578,7 +578,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintUpgradeNoWaitNoTimeout() { final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock,nowait)"; @@ -590,7 +590,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintUpgrade() { final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock)"; @@ -601,7 +601,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintUpgradeNoTimeout() { final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock,nowait)"; @@ -613,7 +613,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintPessimisticWrite() { final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock)"; @@ -624,7 +624,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9635") + @JiraKey(value = "HHH-9635") public void testAppendLockHintPessimisticWriteNoTimeOut() { final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock,nowait)"; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2390SequenceInformationExtractorTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2390SequenceInformationExtractorTest.java index 0fb657db2b..e33b0a6308 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2390SequenceInformationExtractorTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2390SequenceInformationExtractorTest.java @@ -12,12 +12,12 @@ import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationE import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11470") +@JiraKey(value = "HHH-11470") public class DB2390SequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest { @Override diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2400SequenceInformationExtractorTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2400SequenceInformationExtractorTest.java index 0c07836a56..eee441f9bc 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2400SequenceInformationExtractorTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2400SequenceInformationExtractorTest.java @@ -12,13 +12,13 @@ import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationE import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11470") +@JiraKey(value = "HHH-11470") public class DB2400SequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest { @Override diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenFiveDialectSequenceInformationExtractorTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenFiveDialectSequenceInformationExtractorTest.java index 63ff2b817d..fccfbb582b 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenFiveDialectSequenceInformationExtractorTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenFiveDialectSequenceInformationExtractorTest.java @@ -13,12 +13,12 @@ import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationE import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11470") +@JiraKey(value = "HHH-11470") public class DerbyTenFiveDialectSequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest { @Override diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSevenDialectSequenceInformationExtractorTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSevenDialectSequenceInformationExtractorTest.java index 0efea810bc..e3181845a1 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSevenDialectSequenceInformationExtractorTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSevenDialectSequenceInformationExtractorTest.java @@ -13,12 +13,12 @@ import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationE import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorLegacyImpl; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11470") +@JiraKey(value = "HHH-11470") public class DerbyTenSevenDialectSequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest { @Override public Dialect getDialect() { diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSixDialectSequenceInformationExtractorTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSixDialectSequenceInformationExtractorTest.java index 5184a0412a..7e133a4780 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSixDialectSequenceInformationExtractorTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSixDialectSequenceInformationExtractorTest.java @@ -13,12 +13,12 @@ import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationE import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorLegacyImpl; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11470") +@JiraKey(value = "HHH-11470") public class DerbyTenSixDialectSequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest { @Override public Dialect getDialect() { diff --git a/hibernate-core/src/test/java/NoPackageTest.java b/hibernate-core/src/test/java/NoPackageTest.java index 5c8e20aef3..4b1dee44a5 100644 --- a/hibernate-core/src/test/java/NoPackageTest.java +++ b/hibernate-core/src/test/java/NoPackageTest.java @@ -7,7 +7,7 @@ import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals; * Test using an entity which is in no package. * We had problems with ByteBuddy in the past. */ -@TestForIssue(jiraKey = "HHH-13112") +@JiraKey(value = "HHH-13112") public class NoPackageTest extends BaseCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyBasicProxyFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyBasicProxyFactoryTest.java index a61fd3d034..5978a3ade7 100644 --- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyBasicProxyFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyBasicProxyFactoryTest.java @@ -15,10 +15,10 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import org.hibernate.bytecode.internal.bytebuddy.BasicProxyFactoryImpl; import org.hibernate.bytecode.internal.bytebuddy.ByteBuddyState; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; -@TestForIssue(jiraKey = "HHH-12786") +@JiraKey(value = "HHH-12786") public class ByteBuddyBasicProxyFactoryTest { private static final BasicProxyFactoryImpl BASIC_PROXY_FACTORY = new BasicProxyFactoryImpl( Entity.class, null, new ByteBuddyState() ); diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhanceByteCodeNotInProvidedClassLoaderTest.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhanceByteCodeNotInProvidedClassLoaderTest.java index 8189554a17..020358a6b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhanceByteCodeNotInProvidedClassLoaderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhanceByteCodeNotInProvidedClassLoaderTest.java @@ -15,7 +15,7 @@ import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl; import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext; import org.hibernate.bytecode.enhance.spi.Enhancer; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -26,7 +26,7 @@ import org.junit.Test; public class EnhanceByteCodeNotInProvidedClassLoaderTest { @Test - @TestForIssue( jiraKey = "HHH-13343" ) + @JiraKey( value = "HHH-13343" ) public void test() { Enhancer enhancer = createByteBuddyEnhancer(); byte[] buffer = readResource( SimpleEntity.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java index 385d9df342..fa9a4686fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java @@ -14,7 +14,7 @@ import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl; import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext; import org.hibernate.bytecode.enhance.spi.Enhancer; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -26,7 +26,7 @@ import org.junit.Test; public class EnhancerWildFlyNamesTest { @Test - @TestForIssue( jiraKey = "HHH-12545" ) + @JiraKey( value = "HHH-12545" ) public void test() { Enhancer enhancer = createByteBuddyEnhancer(); String internalName = SimpleEntity.class.getName().replace( '.', '/' ); diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java index 5d488219af..3dc8ec4be5 100644 --- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java @@ -18,7 +18,7 @@ import org.hibernate.proxy.ProxyFactory; import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyFactory; import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -35,7 +35,7 @@ import org.junit.jupiter.params.provider.MethodSource; * * @author Sanne Grinovero */ -@TestForIssue( jiraKey = "HHH-15790" ) +@JiraKey( value = "HHH-15790" ) public class SuperTypesEnhancementTest { private static final ByteBuddyProxyHelper helper = new ByteBuddyProxyHelper( new ByteBuddyState() ); diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/H2DialectDatabaseVersionTest.java b/hibernate-core/src/test/java/org/hibernate/dialect/H2DialectDatabaseVersionTest.java index e0a4dc7ae3..0808cedfe4 100644 --- a/hibernate-core/src/test/java/org/hibernate/dialect/H2DialectDatabaseVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/dialect/H2DialectDatabaseVersionTest.java @@ -18,13 +18,13 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @RequiresDialect(H2Dialect.class) -@TestForIssue(jiraKey = "HHH-17791") +@JiraKey(value = "HHH-17791") public class H2DialectDatabaseVersionTest extends BaseUnitTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/MySQLDialectDatabaseVersionTest.java b/hibernate-core/src/test/java/org/hibernate/dialect/MySQLDialectDatabaseVersionTest.java index 466180eac6..f8e061460a 100644 --- a/hibernate-core/src/test/java/org/hibernate/dialect/MySQLDialectDatabaseVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/dialect/MySQLDialectDatabaseVersionTest.java @@ -3,7 +3,7 @@ package org.hibernate.dialect; import java.util.Map; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.Test; @@ -11,7 +11,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; @RequiresDialect(MySQLDialect.class) -@TestForIssue(jiraKey = "HHH-18518") +@JiraKey(value = "HHH-18518") public class MySQLDialectDatabaseVersionTest extends BaseUnitTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java index ea6bc7cc54..ec7fe8e0b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java @@ -20,7 +20,7 @@ import org.hibernate.id.SequenceMismatchStrategy; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -29,7 +29,7 @@ import org.junit.Test; * is going to skip loading the sequence information from the database. */ @RequiresDialect( H2Dialect.class ) -@TestForIssue( jiraKey = "HHH-14667") +@JiraKey( value = "HHH-14667") public class SkipLoadingSequenceInformationTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java b/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java index 9e3768b7a0..0dd4502be6 100644 --- a/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java +++ b/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java @@ -8,7 +8,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Nathan Xu * @author Tassilo Karge */ -@TestForIssue(jiraKey = "HHH-14413") +@JiraKey(value = "HHH-14413") public class PreUpdateEventListenerVetoTest extends BaseSessionFactoryFunctionalTest { private static final Long EXAMPLE_ID_VALUE = 1L; diff --git a/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java index 94b8dd1d00..bc7e36e1c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java @@ -10,7 +10,7 @@ import org.hibernate.event.spi.ClearEvent; import org.hibernate.event.spi.ClearEventListener; import org.hibernate.event.spi.EventType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; * Note: I'm using ClearEvent for the tests because it's the simpler one I've found. *

*/ -@TestForIssue(jiraKey = "HHH-13831") +@JiraKey(value = "HHH-13831") public class EventListenerDuplicationStrategyTest { Tracker tracker = new Tracker(); diff --git a/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerGroupAppendListenerTest.java b/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerGroupAppendListenerTest.java index 8c5355dc77..3d6d3d4797 100644 --- a/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerGroupAppendListenerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerGroupAppendListenerTest.java @@ -17,7 +17,7 @@ import org.hibernate.event.spi.MergeEventListener; import org.hibernate.jpa.event.spi.CallbackRegistry; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Frank Doherty */ -@TestForIssue(jiraKey = "HHH-13070") +@JiraKey(value = "HHH-13070") public class EventListenerGroupAppendListenerTest extends BaseSessionFactoryFunctionalTest { private static final DuplicationStrategy DUPLICATION_STRATEGY_REPLACE_ORIGINAL = new DuplicationStrategy() { diff --git a/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java index d8a77d1e7c..d0816d41bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java @@ -28,7 +28,7 @@ import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; * @author Artem K. * @author Nathan Xu */ -@TestForIssue(jiraKey = "HHH-14178") +@JiraKey(value = "HHH-14178") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class) @DomainModel( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java index 40d9887ae6..7fa27c9f93 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java @@ -15,7 +15,7 @@ import org.hibernate.HibernateException; import org.hibernate.action.spi.AfterTransactionCompletionProcess; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Assert; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertThat; public class CustomAfterCompletionTest extends BaseCoreFunctionalTestCase { @Test - @TestForIssue(jiraKey = "HHH-13666") + @JiraKey(value = "HHH-13666") public void success() { inSession( session -> { AtomicBoolean called = new AtomicBoolean( false ); @@ -54,7 +54,7 @@ public class CustomAfterCompletionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13666") + @JiraKey(value = "HHH-13666") public void failure() { try { inSession( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java index 0345e5a079..a07c18a1e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java @@ -15,7 +15,7 @@ import org.hibernate.HibernateException; import org.hibernate.action.spi.BeforeTransactionCompletionProcess; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Assert; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertThat; public class CustomBeforeCompletionTest extends BaseCoreFunctionalTestCase { @Test - @TestForIssue(jiraKey = "HHH-13666") + @JiraKey(value = "HHH-13666") public void success() { inSession( session -> { AtomicBoolean called = new AtomicBoolean( false ); @@ -54,7 +54,7 @@ public class CustomBeforeCompletionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13666") + @JiraKey(value = "HHH-13666") public void failure() { try { inSession( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/aggregation/UuidAggregationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/aggregation/UuidAggregationTest.java index e4f753fb07..b625d0aa79 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/aggregation/UuidAggregationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/aggregation/UuidAggregationTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.aggregation; import java.util.UUID; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -36,7 +36,7 @@ public class UuidAggregationTest { } @Test - @TestForIssue(jiraKey = "HHH-15495") + @JiraKey(value = "HHH-15495") public void testMaxUuid(SessionFactoryScope scope) { scope.inTransaction( s -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java index 8ba23d4e67..be90e5e60c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java @@ -17,7 +17,7 @@ import java.time.*; import java.util.Calendar; import java.util.Date; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -179,7 +179,7 @@ public class CreationTimestampTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-16240") + @JiraKey( value = "HHH-16240") public void generatesCurrentTimestampInStatelessSession() { doInJPA(this::entityManagerFactory, entityManager -> { Session session = entityManager.unwrap( Session.class); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/HHH16122Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/HHH16122Test.java index 8a1e96fd2c..256ac083ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/HHH16122Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/HHH16122Test.java @@ -6,10 +6,10 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; -@TestForIssue( jiraKey = "HHH-16122" ) +@JiraKey( value = "HHH-16122" ) public class HHH16122Test extends BaseEntityManagerFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java index 792d827ac1..1e544842b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java @@ -16,7 +16,7 @@ import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.NaturalId; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -25,7 +25,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-11096") +@JiraKey(value = "HHH-11096") public class InMemoryCreationTimestampNullableColumnTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java index 54f7738765..0c9d9c3e4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java @@ -23,7 +23,7 @@ import java.time.*; import java.util.Calendar; import java.util.Date; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -185,7 +185,7 @@ public class UpdateTimestampTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-16240") + @JiraKey( value = "HHH-16240") public void generatesCurrentTimestampInStatelessSession() { doInJPA(this::entityManagerFactory, entityManager -> { Session session = entityManager.unwrap( Session.class); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/BackquoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/BackquoteTest.java index 08bec9fc5c..3a90acee38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/BackquoteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/BackquoteTest.java @@ -22,7 +22,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -58,7 +58,7 @@ public class BackquoteTest { } @Test - @TestForIssue(jiraKey = "ANN-718") + @JiraKey(value = "ANN-718") public void testBackquotes() { try { Configuration config = new Configuration(); @@ -88,7 +88,7 @@ public class BackquoteTest { * The same issue exists with getLogicalColumnName() */ @Test - @TestForIssue(jiraKey = "HHH-4647") + @JiraKey(value = "HHH-4647") public void testInvalidReferenceToQuotedTableName() { try (BootstrapServiceRegistry serviceRegistry = new BootstrapServiceRegistryBuilder().build()) { Configuration config = new Configuration( serviceRegistry ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java index d0ab3a1a2e..da71c47016 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java @@ -22,7 +22,7 @@ import org.hibernate.Transaction; import org.hibernate.boot.beanvalidation.ValidationMode; import org.hibernate.cfg.Configuration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -31,7 +31,7 @@ import static org.hibernate.cfg.ValidationSettings.JAKARTA_VALIDATION_MODE; /** * @author Ryan Emerson */ -@TestForIssue( jiraKey = "HHH-9979") +@JiraKey( value = "HHH-9979") public class MergeNotNullCollectionTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java index c40f235f85..8acd72244d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java @@ -28,7 +28,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.hibernate.cfg.ValidationSettings.JAKARTA_VALIDATION_MODE; @@ -40,7 +40,7 @@ import static org.hibernate.cfg.ValidationSettings.JAKARTA_VALIDATION_MODE; DialectChecks.SupportsIdentityColumns.class, DialectChecks.SupportsNoColumnInsert.class }, jiraKey = "HHH-9979") -@TestForIssue( jiraKey = "HHH-9979") +@JiraKey( value = "HHH-9979") public class MergeNotNullCollectionUsingIdentityTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java index a704a42730..c4a3813af2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.cascade.circle.identity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test; public class CascadeCircleIdentityIdTest { @Test - @TestForIssue(jiraKey = "HHH-5472") + @JiraKey(value = "HHH-5472") public void testCascade(SessionFactoryScope scope) { A a = new A(); B b = new B(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java index 7fff1700a1..1244682fa6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.cascade.circle.sequence; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test; public class CascadeCircleSequenceIdTest { @Test - @TestForIssue(jiraKey = "HHH-5472") + @JiraKey(value = "HHH-5472") public void testCascade(SessionFactoryScope scope) { A a = new A(); B b = new B(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java index 79c3c38e97..3f65b1a6ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Id; import jakarta.persistence.IdClass; import jakarta.persistence.ManyToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.FailureExpected; @@ -24,7 +24,7 @@ import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.Test; -@TestForIssue(jiraKey = "HHH-10956") +@JiraKey(value = "HHH-10956") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class) @DomainModel( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java index f99bed4718..64b2e7c0f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.PersistenceException; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.fail; * {@link GenerationType#IDENTITY} * @see HHH-4848 introduced the regression */ -@TestForIssue(jiraKey = "HHH-10956") +@JiraKey(value = "HHH-10956") @DomainModel( annotatedClasses = { CompositeIdFkGeneratedValueTest.Head.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java index 551a87dead..d7e645f475 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.Table; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -29,7 +29,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; * @author Vlad Mihalcea */ @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) -@TestForIssue( jiraKey = "HHH-9662" ) +@JiraKey( value = "HHH-9662" ) public class CompositeIdIdentityTest extends BaseCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java index cec091affe..5541168ad4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -155,7 +155,7 @@ public class CompositeIdTest { } @Test - @TestForIssue(jiraKey = "HHH-10476") + @JiraKey(value = "HHH-10476") public void testManyToOneInCompositePkInPC(SessionFactoryScope scope) { ParentPk ppk = new ParentPk(); ChildPk cpk = new ChildPk(); @@ -295,7 +295,7 @@ public class CompositeIdTest { } @Test - @TestForIssue(jiraKey = "HHH-10476") + @JiraKey(value = "HHH-10476") public void testManyToOneInCompositeIdClassInPC(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -329,7 +329,7 @@ public class CompositeIdTest { } @Test - @TestForIssue(jiraKey = "HHH-10476") + @JiraKey(value = "HHH-10476") public void testGetWithUpdatedDetachedEntityInCompositeID(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -367,7 +367,7 @@ public class CompositeIdTest { } @Test - @TestForIssue(jiraKey = "HHH-10476") + @JiraKey(value = "HHH-10476") public void testGetWithDetachedEntityInCompositeIDWithManagedCopy(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java index 5debcb78d4..cb0d75d243 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.cid.keymanytoone; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -59,7 +59,7 @@ public class EagerKeyManyToOneTest { } @Test - @TestForIssue(jiraKey = "HHH-4147") + @JiraKey(value = "HHH-4147") public void testLoadEntityWithEagerFetchingToKeyManyToOneReferenceBackToSelf(SessionFactoryScope scope) { // based on the core testsuite test of same name in org.hibernate.orm.test.keymanytoone.bidir.component.EagerKeyManyToOneTest // meant to test against regression relating to http://opensource.atlassian.com/projects/hibernate/browse/HHH-2277 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CustomImprovedNamingCollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CustomImprovedNamingCollectionElementTest.java index 37d5c99bda..7564204ba7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CustomImprovedNamingCollectionElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CustomImprovedNamingCollectionElementTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.collectionelement; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.Setting; @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCollectionElementTest { @Test - @TestForIssue(jiraKey = "HHH-9387") + @JiraKey(value = "HHH-9387") public void testDefaultTableNameOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -34,7 +34,7 @@ public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCol } @Test - @TestForIssue(jiraKey = "HHH-9387") + @JiraKey(value = "HHH-9387") public void testDefaultTableNameOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -51,7 +51,7 @@ public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCol @Test - @TestForIssue(jiraKey = "HHH-9389") + @JiraKey(value = "HHH-9389") public void testDefaultJoinColumnOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -63,7 +63,7 @@ public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCol } @Test - @TestForIssue(jiraKey = "HHH-9389") + @JiraKey(value = "HHH-9389") public void testDefaultJoinColumnOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -74,7 +74,7 @@ public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCol } @Test - @TestForIssue(jiraKey = "HHH-9389") + @JiraKey(value = "HHH-9389") public void testDefaultJoinColumnOwnerPrimaryTableOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -85,7 +85,7 @@ public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCol } @Test - @TestForIssue(jiraKey = "HHH-9387") + @JiraKey(value = "HHH-9387") public void testDefaultTableNameOwnerPrimaryTableOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java index 6337a8b9d2..5a3b971a29 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java @@ -19,7 +19,7 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.ForeignKey; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -301,7 +301,7 @@ public class DefaultNamingCollectionElementTest { } @Test - @TestForIssue(jiraKey = "HHH-9387") + @JiraKey(value = "HHH-9387") public void testDefaultTableNameNoOverrides(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -311,7 +311,7 @@ public class DefaultNamingCollectionElementTest { } @Test - @TestForIssue(jiraKey = "HHH-9387") + @JiraKey(value = "HHH-9387") public void testDefaultTableNameOwnerPrimaryTableOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -321,7 +321,7 @@ public class DefaultNamingCollectionElementTest { } @Test - @TestForIssue(jiraKey = "HHH-9387") + @JiraKey(value = "HHH-9387") public void testDefaultTableNameOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -332,7 +332,7 @@ public class DefaultNamingCollectionElementTest { } @Test - @TestForIssue(jiraKey = "HHH-9389") + @JiraKey(value = "HHH-9389") public void testDefaultJoinColumnOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -355,7 +355,7 @@ public class DefaultNamingCollectionElementTest { } @Test - @TestForIssue(jiraKey = "HHH-9389") + @JiraKey(value = "HHH-9389") public void testDefaultJoinColumnNoOverrides(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -365,7 +365,7 @@ public class DefaultNamingCollectionElementTest { } @Test - @TestForIssue(jiraKey = "HHH-9389") + @JiraKey(value = "HHH-9389") public void testDefaultJoinColumnOwnerPrimaryTableOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -375,7 +375,7 @@ public class DefaultNamingCollectionElementTest { } @Test - @TestForIssue(jiraKey = "HHH-9389") + @JiraKey(value = "HHH-9389") public void testDefaultJoinColumnOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -386,7 +386,7 @@ public class DefaultNamingCollectionElementTest { } @Test - @TestForIssue(jiraKey = "HHH-9387") + @JiraKey(value = "HHH-9387") public void testDefaultTableNameOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.java index a4aa0f256b..22c69e6d97 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.java @@ -16,7 +16,7 @@ import org.hibernate.orm.test.annotations.collectionelement.ElementCollectionOfE import org.hibernate.orm.test.annotations.collectionelement.ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.Plan; import org.hibernate.orm.test.annotations.collectionelement.ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.SubPlan; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -48,7 +48,7 @@ import static org.hibernate.annotations.FetchMode.SUBSELECT; } ) @SessionFactory( useCollectingStatementInspector = true ) -@TestForIssue(jiraKey = "HHH-15713") +@JiraKey(value = "HHH-15713") public class ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionWithEntityAndFKForElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionWithEntityAndFKForElementTest.java index 314c7230ca..cf1c137b86 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionWithEntityAndFKForElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionWithEntityAndFKForElementTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.annotations.collectionelement; import java.io.Serializable; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; } ) -@TestForIssue(jiraKey = "HHH-15759") +@JiraKey(value = "HHH-15759") public class ElementCollectionWithEntityAndFKForElementTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java index 8b5875b679..45510d8f86 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java @@ -22,7 +22,7 @@ import org.hibernate.query.criteria.HibernateCriteriaBuilder; import org.hibernate.query.criteria.JpaCriteriaQuery; import org.hibernate.query.criteria.JpaRoot; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class EmbeddableCollectionElementWithLazyManyToOneTest { @Test - @TestForIssue(jiraKey = "???") + @JiraKey(value = "???") public void testLazyManyToOneInEmbeddable(SessionFactoryScope scope) { Parent p = new Parent(); p.containedChild = new ContainedChild( new Child() ); @@ -69,7 +69,7 @@ public class EmbeddableCollectionElementWithLazyManyToOneTest { } @Test - @TestForIssue(jiraKey = "???") + @JiraKey(value = "???") public void testLazyManyToOneInCollectionElementEmbeddable(SessionFactoryScope scope) { Parent p = new Parent(); p.containedChildren.add( new ContainedChild( new Child() ) ); @@ -96,7 +96,7 @@ public class EmbeddableCollectionElementWithLazyManyToOneTest { } @Test - @TestForIssue(jiraKey = "???") + @JiraKey(value = "???") public void testLazyBoth(SessionFactoryScope scope) { Parent p = new Parent(); ContainedChild containedChild = new ContainedChild( new Child() ); @@ -126,7 +126,7 @@ public class EmbeddableCollectionElementWithLazyManyToOneTest { } @Test - @TestForIssue(jiraKey = "HHH-13045") + @JiraKey(value = "HHH-13045") public void testAccessIdOfManyToOneInEmbeddable(SessionFactoryScope scope) { Parent p = new Parent(); p.containedChildren.add( new ContainedChild( new Child() ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ImprovedNamingCollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ImprovedNamingCollectionElementTest.java index 581c10b4d9..0ddfe1048d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ImprovedNamingCollectionElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ImprovedNamingCollectionElementTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.collectionelement; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.Setting; @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; public class ImprovedNamingCollectionElementTest extends DefaultNamingCollectionElementTest { @Test - @TestForIssue(jiraKey = "HHH-9387") + @JiraKey(value = "HHH-9387") public void testDefaultTableNameOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -36,7 +36,7 @@ public class ImprovedNamingCollectionElementTest extends DefaultNamingCollection } @Test - @TestForIssue(jiraKey = "HHH-9387") + @JiraKey(value = "HHH-9387") public void testDefaultTableNameOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -46,7 +46,7 @@ public class ImprovedNamingCollectionElementTest extends DefaultNamingCollection } @Test - @TestForIssue(jiraKey = "HHH-9389") + @JiraKey(value = "HHH-9389") public void testDefaultJoinColumnOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). @@ -56,7 +56,7 @@ public class ImprovedNamingCollectionElementTest extends DefaultNamingCollection } @Test - @TestForIssue(jiraKey = "HHH-9389") + @JiraKey(value = "HHH-9389") public void testDefaultJoinColumnOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) { // NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass) // to ensure that entity names/tables are not changed (which would invalidate these test cases). diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionTest.java index f72379c5e2..7d4382aec2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionTest.java @@ -11,7 +11,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -34,7 +34,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15159") +@JiraKey(value = "HHH-15159") public class OrphanRemovalOfAnEntityWithElementCollectionTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionWithUpdatesAndInsertsOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionWithUpdatesAndInsertsOrderTest.java index 88f35346f4..651aae0aae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionWithUpdatesAndInsertsOrderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionWithUpdatesAndInsertsOrderTest.java @@ -13,7 +13,7 @@ import java.util.Set; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -44,7 +44,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @Setting(name = AvailableSettings.ORDER_UPDATES, value = "true") } ) -@TestForIssue(jiraKey = "HHH-15159") +@JiraKey(value = "HHH-15159") public class OrphanRemovalOfAnEntityWithElementCollectionWithUpdatesAndInsertsOrderTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java index d33d4ab07b..f6d540dd6d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.collectionelement; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -49,7 +49,7 @@ public class QueryTest { } @Test - @TestForIssue(jiraKey = "HHH-5209") + @JiraKey(value = "HHH-5209") public void testMemberOfSyntax(SessionFactoryScope scope) { // performs syntax checking of the MEMBER OF predicate against a basic collection scope.inSession( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java index 358417771f..b378e22b44 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java @@ -10,7 +10,7 @@ import java.util.Iterator; import org.hibernate.Transaction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -49,7 +49,7 @@ public class TestBasicOps { } @Test - @TestForIssue(jiraKey = "HHH-7072") + @JiraKey(value = "HHH-7072") public void testEmbeddableWithNullables(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java index f4de3b3fab..001eafffcc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java @@ -18,7 +18,7 @@ import org.hibernate.metamodel.mapping.ordering.OrderByFragmentImpl; import org.hibernate.metamodel.mapping.ordering.ast.OrderingSpecification; import org.hibernate.persister.collection.BasicCollectionPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -65,7 +65,7 @@ public class ElementCollectionSortingTest { } @Test - @TestForIssue(jiraKey = "HHH-6875") + @JiraKey(value = "HHH-6875") public void testSortingEmbeddableCollectionOfPrimitives(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java index 2e96f08973..4856fc659e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java @@ -10,7 +10,7 @@ import java.util.Date; import org.hibernate.BaseSessionEventListener; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -41,7 +41,7 @@ public class RecreateCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-9474") + @JiraKey(value = "HHH-9474") public void testUpdateCollectionOfElements(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java index cc0e238904..7ec8b091b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java @@ -24,7 +24,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -39,7 +39,7 @@ public class CommentTest { private static final String TABLE_COMMENT = "I am table"; @Test - @TestForIssue(jiraKey = "HHH-4369") + @JiraKey(value = "HHH-4369") public void testComments() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); Metadata metadata = new MetadataSources(ssr).addAnnotatedClass(TestEntity.class).buildMetadata(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentsTest.java index 1b5ba20e2e..a6cb04c43d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentsTest.java @@ -20,7 +20,7 @@ import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -45,7 +45,7 @@ public class CommentsTest { private static final String SEC_TABLE_COMMENT = "I am a table too"; @Test - @TestForIssue(jiraKey = "HHH-4369") + @JiraKey(value = "HHH-4369") public void testComments() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); Metadata metadata = new MetadataSources(ssr).addAnnotatedClass(TestEntity.class).buildMetadata(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java index 8ebb5eb12c..d2b5a0dff3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.derivedidentities.bidirectional; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -72,7 +72,7 @@ public class CompositeDerivedIdentityTest { } @Test - @TestForIssue(jiraKey = "HHH-10476") + @JiraKey(value = "HHH-10476") public void testBidirectonalKeyManyToOneId(SessionFactoryScope scope) { Product product = new Product(); product.setName( "Product 1" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java index 7304be8edd..20299b9cb0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java @@ -13,7 +13,7 @@ import java.util.Objects; import org.hibernate.jpa.internal.PersistenceUnitUtilImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ImplicitListAsBagProvider; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -67,7 +67,7 @@ public class CompositeIdDerivedIdWithIdClassTest { } @Test - @TestForIssue(jiraKey = "HHH-11328") + @JiraKey(value = "HHH-11328") public void testMergeTransientIdManyToOne(SessionFactoryScope scope) { ShoppingCart transientCart = new ShoppingCart( "cart1" ); transientCart.addLineItem( new LineItem( 0, "description2", transientCart ) ); @@ -96,7 +96,7 @@ public class CompositeIdDerivedIdWithIdClassTest { } @Test - @TestForIssue(jiraKey = "HHH-10623") + @JiraKey(value = "HHH-10623") public void testMergeDetachedIdManyToOne(SessionFactoryScope scope) { ShoppingCart cart = new ShoppingCart( "cart1" ); @@ -125,7 +125,7 @@ public class CompositeIdDerivedIdWithIdClassTest { } @Test - @TestForIssue(jiraKey = "HHH-12007") + @JiraKey(value = "HHH-12007") public void testBindTransientEntityWithTransientKeyManyToOne(SessionFactoryScope scope) { ShoppingCart cart = new ShoppingCart( "cart" ); @@ -147,7 +147,7 @@ public class CompositeIdDerivedIdWithIdClassTest { } @Test - @TestForIssue(jiraKey = "HHH-12007") + @JiraKey(value = "HHH-12007") public void testBindTransientEntityWithPersistentKeyManyToOne(SessionFactoryScope scope) { ShoppingCart cart = new ShoppingCart( "cart" ); LineItem item = new LineItem( 0, "desc", cart ); @@ -169,7 +169,7 @@ public class CompositeIdDerivedIdWithIdClassTest { } @Test - @TestForIssue(jiraKey = "HHH-12007") + @JiraKey(value = "HHH-12007") public void testBindTransientEntityWithDetachedKeyManyToOne(SessionFactoryScope scope) { ShoppingCart cart = new ShoppingCart( "cart" ); @@ -191,7 +191,7 @@ public class CompositeIdDerivedIdWithIdClassTest { } @Test - @TestForIssue(jiraKey = "HHH-12007") + @JiraKey(value = "HHH-12007") public void testBindTransientEntityWithCopiedKeyManyToOne(SessionFactoryScope scope) { ShoppingCart cart = new ShoppingCart( "cart" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java index bcf85d7642..e71245c0be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java @@ -13,7 +13,7 @@ import java.util.Set; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -45,7 +45,7 @@ public class ManyToOneEagerDerivedIdFetchModeJoinTest { private Foo foo; @Test - @TestForIssue(jiraKey = "HHH-14466") + @JiraKey(value = "HHH-14466") public void testQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo.id = :id" ) @@ -63,7 +63,7 @@ public class ManyToOneEagerDerivedIdFetchModeJoinTest { } @Test - @TestForIssue(jiraKey = "HHH-14466") + @JiraKey(value = "HHH-14466") public void testQueryById(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo = :foo" ) @@ -81,7 +81,7 @@ public class ManyToOneEagerDerivedIdFetchModeJoinTest { } @Test - @TestForIssue(jiraKey = "HHH-14466") + @JiraKey(value = "HHH-14466") public void testFindByPrimaryKey(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = session.find( Bar.class, foo.getId() ); @@ -97,7 +97,7 @@ public class ManyToOneEagerDerivedIdFetchModeJoinTest { } @Test - @TestForIssue(jiraKey = "HHH-14466") + @JiraKey(value = "HHH-14466") public void testFindByInversePrimaryKey(SessionFactoryScope scope) { scope.inTransaction( session -> { Foo newFoo = session.find( Foo.class, foo.getId() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java index 35728626a7..9d1e8c0f00 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java @@ -11,7 +11,7 @@ import java.io.Serializable; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -42,7 +42,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest { private Foo foo; @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo.id = :id" ) @@ -56,7 +56,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest { } @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testQueryById(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo = :foo" ) @@ -70,7 +70,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest { } @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testFindByPrimaryKey(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = session.find( Bar.class, foo.getId() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java index b10c8e20c8..7e5e22d483 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java @@ -11,7 +11,7 @@ import java.io.Serializable; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -41,7 +41,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest { private Foo foo; @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo.id = :id" ) @@ -55,7 +55,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest { } @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testQueryById(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo = :foo" ) @@ -69,7 +69,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest { } @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testFindByPrimaryKey(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = session.find( Bar.class, foo.getId() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java index c788220978..2f615ef7b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -48,7 +48,7 @@ public class OneToOneWithDerivedIdentityTest { } @Test - @TestForIssue(jiraKey = "HHH-11903") + @JiraKey(value = "HHH-11903") public void testInsertFooAndBarWithDerivedId(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -78,7 +78,7 @@ public class OneToOneWithDerivedIdentityTest { } @Test - @TestForIssue(jiraKey = "HHH-14389") + @JiraKey(value = "HHH-14389") public void testQueryById(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -108,7 +108,7 @@ public class OneToOneWithDerivedIdentityTest { } @Test - @TestForIssue(jiraKey = "HHH-14389") + @JiraKey(value = "HHH-14389") public void testFindById(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -135,7 +135,7 @@ public class OneToOneWithDerivedIdentityTest { } @Test - @TestForIssue(jiraKey = "HHH-14389") + @JiraKey(value = "HHH-14389") public void testFindByPrimaryKey(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -163,7 +163,7 @@ public class OneToOneWithDerivedIdentityTest { } @Test - @TestForIssue(jiraKey = "HHH-10476") + @JiraKey(value = "HHH-10476") public void testInsertFooAndBarWithDerivedIdPC(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -194,7 +194,7 @@ public class OneToOneWithDerivedIdentityTest { } @Test - @TestForIssue(jiraKey = "HHH-6813") + @JiraKey(value = "HHH-6813") public void testSelectWithDerivedId(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -222,7 +222,7 @@ public class OneToOneWithDerivedIdentityTest { } @Test - @TestForIssue(jiraKey = "HHH-6813") + @JiraKey(value = "HHH-6813") // Regression test utilizing multiple types of queries. public void testCase(SessionFactoryScope scope) { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java index 1ea3f95bdd..b8218b954d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java @@ -10,7 +10,7 @@ import java.io.Serializable; import org.hibernate.boot.spi.MetadataImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -32,7 +32,7 @@ import static org.hibernate.orm.test.util.SchemaUtil.getColumnNames; *

* org.hibernate.MappingException: Foreign key (FK2m2b1kaetxfvcsaih4raaocn8:ref_mto_derived [])) must have same number of columns as the referenced primary key (mto_derived [idsource_id]) */ -@TestForIssue(jiraKey = "HHH-14467") +@JiraKey(value = "HHH-14467") @DomainModel( annotatedClasses = { // These two must be mentioned first in order to trigger the bug. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java index 6f759fcbe5..2d5882dcb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java @@ -11,7 +11,7 @@ import java.io.Serializable; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -40,7 +40,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest { private Foo foo; @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo.id = :id" ) @@ -54,7 +54,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest { } @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testQueryById(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo = :foo" ) @@ -68,7 +68,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest { } @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testFindByPrimaryKey(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = session.find( Bar.class, foo.getId() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java index 100b7dfa2b..fdee2425f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java @@ -11,7 +11,7 @@ import java.io.Serializable; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -40,7 +40,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest { private Foo foo; @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo.id = :id" ) @@ -54,7 +54,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest { } @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testQueryById(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo = :foo" ) @@ -68,7 +68,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest { } @Test - @TestForIssue(jiraKey = "HHH-14390") + @JiraKey(value = "HHH-14390") public void testFindByPrimaryKey(SessionFactoryScope scope) { scope.inTransaction( session -> { Bar newBar = session.find( Bar.class, foo.getId() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableAndMappedSuperClassWithGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableAndMappedSuperClassWithGenericsTest.java index bb36cb32d2..39d6e4e30a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableAndMappedSuperClassWithGenericsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableAndMappedSuperClassWithGenericsTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.embeddables; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15552") +@JiraKey(value = "HHH-15552") public class EmbeddableAndMappedSuperClassWithGenericsTest { private final static long POPULAR_BOOK_ID = 1l; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithGenericAndMappedSuperClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithGenericAndMappedSuperClassTest.java index c4e8fc5c6d..7f388a6fe2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithGenericAndMappedSuperClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithGenericAndMappedSuperClassTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.annotations.embeddables; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -186,7 +186,7 @@ public class EmbeddableWithGenericAndMappedSuperClassTest { } @Test - @TestForIssue(jiraKey = "HHH-4299") + @JiraKey(value = "HHH-4299") public void testGenericEmbeddedAttribute(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithManyToManyTest.java index c6eccb1ee3..b04415e7cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithManyToManyTest.java @@ -11,7 +11,7 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15453") +@JiraKey(value = "HHH-15453") public class EmbeddableWithManyToManyTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java index 13075f3f0e..d414d4f4ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java @@ -28,12 +28,12 @@ import jakarta.persistence.Version; import org.hibernate.boot.MetadataSources; import org.hibernate.internal.util.StringHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-11302") +@JiraKey(value = "HHH-11302") public class EmbeddableWithManyToMany_HHH_11302_Test extends AbstractEmbeddableWithManyToManyTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java index 43dbca2c95..55d7051de5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java @@ -28,12 +28,12 @@ import jakarta.persistence.Version; import org.hibernate.boot.MetadataSources; import org.hibernate.internal.util.StringHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-11302") +@JiraKey(value = "HHH-11302") public class EmbeddableWithOneToMany_HHH_11302_Test extends AbstractEmbeddableWithManyToManyTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java index a8e8da61b5..89e86701fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java @@ -23,12 +23,12 @@ import jakarta.validation.constraints.Size; import org.hibernate.boot.MetadataSources; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-8564") +@JiraKey(value = "HHH-8564") public class EmbeddableWithOneToMany_HHH_8564_Test extends AbstractEmbeddableWithManyToManyTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java index beccc6b819..67561b9ea2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java @@ -21,12 +21,12 @@ import jakarta.persistence.Version; import org.hibernate.boot.MetadataSources; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-8860") +@JiraKey(value = "HHH-8860") public class EmbeddableWithOneToMany_HHH_8860_Test extends AbstractEmbeddableWithManyToManyTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/EmbeddableWithOneToMany_HHH_11302_xml_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/EmbeddableWithOneToMany_HHH_11302_xml_Test.java index dc85b67ea9..4cf70fb2d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/EmbeddableWithOneToMany_HHH_11302_xml_Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/EmbeddableWithOneToMany_HHH_11302_xml_Test.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.embeddables.collection.xml; import org.hibernate.boot.MetadataSources; import org.hibernate.orm.test.annotations.embeddables.collection.AbstractEmbeddableWithManyToManyTest; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-11302") +@JiraKey(value = "HHH-11302") public class EmbeddableWithOneToMany_HHH_11302_xml_Test extends AbstractEmbeddableWithManyToManyTest { protected void addResources(MetadataSources metadataSources) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java index f7ca2b2d84..c746ceab6c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java @@ -13,7 +13,7 @@ import java.util.ConcurrentModificationException; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -24,7 +24,7 @@ import org.junit.Test; public class HibernateAnnotationMappingTest extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-7446" ) + @JiraKey( value = "HHH-7446" ) public void testUniqueConstraintAnnotationOnNaturalIds() throws Exception { Configuration configuration = new Configuration(); ServiceRegistryUtil.applySettings( configuration.getStandardServiceRegistryBuilder() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java index 9418ea6c65..ded4f9d977 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java @@ -10,7 +10,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.UnknownEntityTypeException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -49,7 +49,7 @@ public class EntityNonEntityTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9856" ) + @JiraKey( value = "HHH-9856" ) public void testGetAndFindNonEntityThrowsIllegalArgumentException() { try { sessionFactory().getMetamodel().locateEntityPersister(Cellular.class); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java index 1a356b0c7e..bf8793ad0f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java @@ -1,6 +1,6 @@ package org.hibernate.orm.test.annotations.enumerated; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -21,7 +21,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16479") +@JiraKey(value = "HHH-16479") public class EnumeratedAndGenerics2Test { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java index f75ddad9b8..ae99eb75e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java @@ -1,6 +1,6 @@ package org.hibernate.orm.test.annotations.enumerated; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -20,7 +20,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16479") +@JiraKey(value = "HHH-16479") public class EnumeratedAndGenerics3Test { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java index 5de0ee1218..dabde08a62 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java @@ -1,6 +1,6 @@ package org.hibernate.orm.test.annotations.enumerated; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -21,7 +21,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-16479") +@JiraKey( value = "HHH-16479") public class EnumeratedAndGenericsTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java index 2fe18a300b..9f5590e14c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java @@ -13,7 +13,7 @@ import org.hibernate.type.Type; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.junit4.ExtraAssertions; import org.hibernate.type.internal.BasicTypeImpl; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-7645" ) +@JiraKey( value = "HHH-7645" ) public class OrmXmlEnumTypeTest extends BaseUnitTestCase { @Test public void testOrmXmlDefinedEnumType() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java index 8154984a0a..98ed738f83 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java @@ -18,7 +18,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -34,7 +34,7 @@ import static org.junit.Assert.fail; * * @author Hardy Ferentschik */ -@TestForIssue( jiraKey = "HHH-4812" ) +@JiraKey( value = "HHH-4812" ) public class FetchProfileTest extends BaseUnitTestCase { private ServiceRegistry serviceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java index ef27cf43f3..a3bba11a25 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java @@ -5,13 +5,13 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.orm.test.annotations.fetchprofile.mappedby.Address; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; import static org.junit.Assert.assertTrue; -@TestForIssue( jiraKey = "HHH-14071" ) +@JiraKey( value = "HHH-14071" ) public class MappedByFetchProfileFunctionTest extends BaseCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java index e00c255a6f..71589d3285 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java @@ -7,7 +7,7 @@ import org.hibernate.orm.test.annotations.fetchprofile.mappedby.Address; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.After; import org.junit.Before; @@ -15,7 +15,7 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; -@TestForIssue( jiraKey = "HHH-14071" ) +@JiraKey( value = "HHH-14071" ) public class MappedByFetchProfileUnitTest extends BaseUnitTestCase { private ServiceRegistry serviceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java index aa5c4e0ffd..508021df63 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java @@ -24,7 +24,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -50,7 +50,7 @@ public class JoinColumnOrFormulaTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9897" ) + @JiraKey( value = "HHH-9897" ) @FailureExpected( jiraKey = "HHH-9897" ) public void testUseOfJoinColumnOrFormula() { Metadata metadata = new MetadataSources( ssr ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java index 2cf7a89da3..454e859fdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java @@ -22,7 +22,7 @@ import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -@TestForIssue(jiraKey = "HHH-12770") +@JiraKey(value = "HHH-12770") public class JoinFormulaManyToOneLazyFetchingTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java index d2f100b7d2..98276241ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java @@ -18,7 +18,7 @@ import org.hibernate.boot.model.internal.ToOneBinder; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; import org.junit.Rule; @@ -40,7 +40,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -@TestForIssue(jiraKey = "HHH-12770") +@JiraKey(value = "HHH-12770") public class JoinFormulaManyToOneNotIgnoreLazyFetchingTest extends BaseEntityManagerFunctionalTestCase { @Rule diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java index 60d3106640..79a1f4d559 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java @@ -18,7 +18,7 @@ import org.hibernate.boot.model.internal.ToOneBinder; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; import org.junit.Rule; @@ -40,7 +40,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -@TestForIssue(jiraKey = "HHH-12770") +@JiraKey(value = "HHH-12770") public class JoinFormulaOneToOneNotIgnoreLazyFetchingTest extends BaseEntityManagerFunctionalTestCase { @Rule diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java index 2e872e180b..9a2d35030d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java @@ -19,9 +19,10 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.junit.Rule; import org.junit.Test; @@ -42,7 +43,10 @@ import static org.hibernate.testing.transaction.TransactionUtil2.fromTransaction import static org.junit.Assert.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -@TestForIssue(jiraKey = {"HHH-12770", "HHH-15545"}) +@JiraKeyGroup( value = { + @JiraKey( value = "HHH-12770" ), + @JiraKey( value = "HHH-15545" ) +} ) public class ManyToManyNotIgnoreLazyFetchingTest extends BaseEntityManagerFunctionalTestCase { @Rule diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassAndGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassAndGenericsTest.java index 08778bb349..7f93306ed6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassAndGenericsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassAndGenericsTest.java @@ -1,6 +1,6 @@ package org.hibernate.orm.test.annotations.generics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import jakarta.persistence.MappedSuperclass; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-15970") +@JiraKey( value = "HHH-15970") public class MappedSuperclassAndGenericsTest { public enum MyEnum { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleBoundsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleBoundsTest.java index eb227d29aa..fdcbab1bfa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleBoundsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleBoundsTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.annotations.generics; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertInstanceOf; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-15687") +@JiraKey( value = "HHH-15687") public class MultipleBoundsTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/TypeVariableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/TypeVariableTest.java index 17463cfdd3..519cf44d5d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/TypeVariableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/TypeVariableTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.annotations.generics; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -28,7 +28,7 @@ import static org.hamcrest.MatcherAssert.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15646") +@JiraKey(value = "HHH-15646") public class TypeVariableTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildcardsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildcardsTest.java index 9968376297..a83e010055 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildcardsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildcardsTest.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Set; import java.util.stream.Collectors; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeEach; @@ -27,7 +27,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; WildcardsTest.BalanceUsage.class } ) -@TestForIssue(jiraKey = "HHH-15624") +@JiraKey(value = "HHH-15624") public class WildcardsTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java index e980e24734..75c91cba5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.id; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; * * @author Hardy Ferentschik */ -@TestForIssue(jiraKey = "ANN-744") +@JiraKey(value = "ANN-744") @DomainModel( annotatedClasses = PlanetCheatSheet.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java index bb5de187e9..047ab608b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeEach; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; IdClassAndAssociationsTest.UserRole.class } ) -@TestForIssue( jiraKey = "HHH-16075") +@JiraKey( value = "HHH-16075") public class IdClassAndAssociationsTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/JoinColumnOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/JoinColumnOverrideTest.java index 771cf55693..217f63a552 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/JoinColumnOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/JoinColumnOverrideTest.java @@ -15,7 +15,7 @@ import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.cfg.AvailableSettings; import org.hibernate.tool.schema.internal.SchemaCreatorImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -40,7 +40,7 @@ public class JoinColumnOverrideTest { "id numeric(128,0) not null, primary key (id))"; @Test - @TestForIssue(jiraKey = "ANN-748") + @JiraKey(value = "ANN-748") public void testBlownPrecision() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( AvailableSettings.DIALECT, "SQLServer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java index 042ffda054..0182c9afbd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java @@ -13,7 +13,7 @@ import org.hibernate.id.enhanced.PooledOptimizer; import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.id.enhanced.TableGenerator; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -127,7 +127,7 @@ public class NewGeneratorMappingsTest { } @Test - @TestForIssue(jiraKey = "HHH-6790") + @JiraKey(value = "HHH-6790") public void testSequencePerEntity(SessionFactoryScope scope) { // Checking first entity. EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(DedicatedSequenceEntity1.class.getName()); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java index 94dac3d2b0..f9cd0ea594 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.id.sequences; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; * * @author Hardy Ferentschik */ -@TestForIssue(jiraKey = "ANN-744") +@JiraKey(value = "ANN-744") @DomainModel( annotatedClasses = PlanetCheatSheet.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java index 1fe436e206..98c0ec7270 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java @@ -14,7 +14,7 @@ import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.mapping.Table; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Lukasz Antoniak */ -@TestForIssue(jiraKey = "HHH-6068") +@JiraKey(value = "HHH-6068") @RequiresDialect(value = H2Dialect.class) @DomainModel( annotatedClasses = HibernateSequenceEntity.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java index b857f440a6..33fa33dfe9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.id.sequences; import org.hibernate.mapping.Column; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -289,7 +289,7 @@ public class IdTest { } @Test - @TestForIssue(jiraKey = "HHH-6790") + @JiraKey(value = "HHH-6790") public void testSequencePerEntity(SessionFactoryScope scope) { DedicatedSequenceEntity1 entity1 = new DedicatedSequenceEntity1(); DedicatedSequenceEntity2 entity2 = new DedicatedSequenceEntity2(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/JoinColumnOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/JoinColumnOverrideTest.java index 4477f520d1..b27ca82c5a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/JoinColumnOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/JoinColumnOverrideTest.java @@ -17,7 +17,7 @@ import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.cfg.AvailableSettings; import org.hibernate.tool.schema.internal.SchemaCreatorImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -43,7 +43,7 @@ public class JoinColumnOverrideTest { "id numeric(128,0) not null, primary key (id))"; @Test - @TestForIssue(jiraKey = "ANN-748") + @JiraKey(value = "ANN-748") public void testBlownPrecision() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( AvailableSettings.DIALECT, "SQLServer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java index 891bb4d289..087062208d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Id; import jakarta.persistence.IdClass; import jakarta.persistence.MappedSuperclass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9114") +@JiraKey(value = "HHH-9114") @DomainModel(annotatedClasses = IdClassMappedSuperclassTest.Simple.class) @SessionFactory public class IdClassMappedSuperclassTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java index 9b3509b6bd..78feb5b139 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java @@ -16,7 +16,7 @@ import org.hibernate.Session; import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl; import org.hibernate.cfg.Configuration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -53,7 +53,7 @@ public class IdManyToOneTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7767" ) + @JiraKey( value = "HHH-7767" ) public void testCriteriaRestrictionOnIdManyToOne() { inTransaction( s -> { s.createQuery( "from Course c join c.students cs join cs.student s where s.name = 'Foo'", Object[].class ).list(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java index 902c1259aa..4d5ee39e70 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java @@ -19,7 +19,7 @@ import org.hibernate.annotations.Immutable; import org.hibernate.cfg.AvailableSettings; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -31,7 +31,7 @@ import static org.junit.Assert.fail; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-12387" ) +@JiraKey( value = "HHH-12387" ) public class ImmutableEntityUpdateQueryHandlingModeExceptionTest extends BaseNonConfigCoreFunctionalTestCase { @Override @@ -76,7 +76,7 @@ public class ImmutableEntityUpdateQueryHandlingModeExceptionTest extends BaseNon } @Test - @TestForIssue( jiraKey = "HHH-12927" ) + @JiraKey( value = "HHH-12927" ) public void testUpdateMutableWithImmutableSubSelect() { doInHibernate(this::sessionFactory, session -> { String selector = "foo"; @@ -104,7 +104,7 @@ public class ImmutableEntityUpdateQueryHandlingModeExceptionTest extends BaseNon } @Test - @TestForIssue( jiraKey = "HHH-12927" ) + @JiraKey( value = "HHH-12927" ) public void testUpdateImmutableWithMutableSubSelect() { doInHibernate(this::sessionFactory, session -> { String selector = "foo"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java index 89129528e3..830370776b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.annotations.immutable; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.query.sqm.tree.update.SqmUpdateStatement; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-12387" ) +@JiraKey( value = "HHH-12387" ) public class ImmutableEntityUpdateQueryHandlingModeWarningTest extends BaseNonConfigCoreFunctionalTestCase { @Rule diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java index c13291f09e..c01a7516fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java @@ -22,7 +22,7 @@ import org.hibernate.dialect.HSQLDialect; import org.hibernate.mapping.Collection; import org.hibernate.mapping.Column; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -672,7 +672,7 @@ public class IndexedCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-8879") + @JiraKey(value = "HHH-8879") public void testMapKeyEmbeddableWithEntityKey(SessionFactoryScope scope) { Session s = scope.getSessionFactory().openSession(); Transaction tx; @@ -716,7 +716,7 @@ public class IndexedCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-8994") + @JiraKey(value = "HHH-8994") public void testEmbeddableWithEntityKey(SessionFactoryScope scope) { Session s = scope.getSessionFactory().openSession(); Transaction tx; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceEagerAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceEagerAssociationTest.java index b9129de396..a75653fa48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceEagerAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceEagerAssociationTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.annotations.inheritance; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -36,7 +36,7 @@ import jakarta.persistence.Version; SingleTableInheritanceEagerAssociationTest.Message.class, } ) -@TestForIssue(jiraKey = "HHH-15969") +@JiraKey(value = "HHH-15969") public class SingleTableInheritanceEagerAssociationTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceLazyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceLazyAssociationTest.java index 4fc2a47097..80cd00754c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceLazyAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceLazyAssociationTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; SingleTableInheritanceLazyAssociationTest.Message.class, } ) -@TestForIssue(jiraKey = "HHH-15969") +@JiraKey(value = "HHH-15969") public class SingleTableInheritanceLazyAssociationTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java index 8532399d68..5e37ff2d29 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java @@ -10,7 +10,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -143,7 +143,7 @@ public class JoinedSubclassTest { } @Test - @TestForIssue(jiraKey = "HHH-4250") + @JiraKey(value = "HHH-4250") public void testManyToOneWithJoinTable(SessionFactoryScope scope) { //HHH-4250 : @ManyToOne - @OneToMany doesn't work with @Inheritance(strategy= InheritanceType.JOINED) scope.inTransaction( @@ -184,7 +184,7 @@ public class JoinedSubclassTest { } @Test - @TestForIssue(jiraKey = "HHH-4240") + @JiraKey(value = "HHH-4240") public void testSecondaryTables(SessionFactoryScope scope) { // HHH-4240 - SecondaryTables not recognized when using JOINED inheritance Company company = new Company(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java index 7ba3aafd61..33a7816286 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java @@ -20,7 +20,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.internal.SessionFactoryRegistry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Lukasz Antoniak */ -@TestForIssue( jiraKey = "HHH-7214" ) +@JiraKey( value = "HHH-7214" ) @BaseUnitTest public class DuplicatedDiscriminatorValueTest { private static final String DISCRIMINATOR_VALUE = "D"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/joincolumn/JoinColumnWithSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/joincolumn/JoinColumnWithSecondaryTableTest.java index 232c60c44f..b72f100d0e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/joincolumn/JoinColumnWithSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/joincolumn/JoinColumnWithSecondaryTableTest.java @@ -1,6 +1,6 @@ package org.hibernate.orm.test.annotations.joincolumn; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -27,7 +27,7 @@ import jakarta.persistence.Table; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-15111") +@JiraKey( value = "HHH-15111") public class JoinColumnWithSecondaryTableTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java index 3d76e56225..c536eaedd0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java @@ -12,7 +12,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -129,7 +129,7 @@ public class VersionedLobTest extends AbstractLobTest { @@ -361,7 +361,7 @@ public class OneToOneTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-5757") + @JiraKey(value = "HHH-5757") public void testHqlQuery() { //test a default one to one and a mappedBy in the other side final Passport passport = TransactionUtil.doInHibernate( this::sessionFactory, session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java index a02372e199..7ab5a1c1db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.id.IdentifierGenerationException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -127,7 +127,7 @@ public class OptionalOneToOneMappedByTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-5757") + @JiraKey(value = "HHH-5757") public void testBidirQueryEntityProperty() { AtomicReference personHolder = new AtomicReference<>(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java index 65f476e210..0c51a886e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Table; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.After; import org.junit.Test; @@ -25,7 +25,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -@TestForIssue( jiraKey = "HHH-13875") +@JiraKey( value = "HHH-13875") public class OptionalOneToOneMapsIdQueryTest extends BaseNonConfigCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java index 61005bd53c..94a86456e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.OneToOne; import jakarta.persistence.PrimaryKeyJoinColumn; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.After; import org.junit.Test; @@ -23,7 +23,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -@TestForIssue( jiraKey = "HHH-13875") +@JiraKey( value = "HHH-13875") public class OptionalOneToOnePKJCQueryTest extends BaseNonConfigCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java index d35dca99a6..81aff649be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java @@ -15,7 +15,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.id.IdentifierGenerationException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -32,7 +32,7 @@ import static org.junit.Assert.fail; public class OptionalOneToOnePKJCTest extends BaseCoreFunctionalTestCase { @Test - @TestForIssue( jiraKey = "HHH-4982") + @JiraKey( value = "HHH-4982") public void testNullBidirForeignIdGenerator() { Session s = openSession(); Transaction tx = s.beginTransaction(); @@ -54,7 +54,7 @@ public class OptionalOneToOnePKJCTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-4982") + @JiraKey( value = "HHH-4982") public void testNotFoundBidirForeignIdGenerator() { Session s = openSession(); Transaction tx = s.beginTransaction(); @@ -79,7 +79,7 @@ public class OptionalOneToOnePKJCTest extends BaseCoreFunctionalTestCase { // @PrimaryKeyJoinColumn @OneToOne(optional=true) non-foreign generator @Test - @TestForIssue( jiraKey = "HHH-4982") + @JiraKey( value = "HHH-4982") public void testNotFoundBidirDefaultIdGenerator() { Session s = openSession(); s.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OverrideOneToOneJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OverrideOneToOneJoinColumnTest.java index ec67b531a2..c53d7e1353 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OverrideOneToOneJoinColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OverrideOneToOneJoinColumnTest.java @@ -11,7 +11,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.mapping.ForeignKey; import org.hibernate.mapping.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Aresnii Skvortsov */ -@TestForIssue(jiraKey = "HHH-4384") +@JiraKey(value = "HHH-4384") @BaseUnitTest public class OverrideOneToOneJoinColumnTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java index 192b8193a9..b06120cf09 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java @@ -17,9 +17,11 @@ import jakarta.persistence.UniqueConstraint; import org.hibernate.AnnotationException; import org.hibernate.boot.model.internal.EntityBinder; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; +import org.hibernate.testing.orm.junit.JiraKeyGroup; + import org.jboss.logging.Logger; import org.junit.Rule; import org.junit.jupiter.api.Test; @@ -32,7 +34,12 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12609, HHH-12654, HHH-13172") +@JiraKeyGroup( value = { + @JiraKey(value = "HHH-12609"), + @JiraKey(value = "HHH-12654"), + @JiraKey(value = "HHH-13172") +} ) +@JiraKey(value = "HHH-12609, HHH-12654, HHH-13172") public class EntityInheritanceAttributeOverrideTest extends EntityManagerFactoryBasedFunctionalTest { @Rule diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java index 4fdb602b1c..3c58d4e32c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.MappedSuperclass; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class MappedSuperclassAttributeOverrideTest { @Test - @TestForIssue(jiraKey = "HHH-12609") + @JiraKey(value = "HHH-12609") public void test(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { TaxonEntity taxon1 = new TaxonEntity(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java index c862c6487e..d94fc3ef88 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java @@ -8,14 +8,14 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.junit.jupiter.api.Test; /** * @author Stanislav Gubanov */ -@TestForIssue(jiraKey = "HHH-11771") +@JiraKey(value = "HHH-11771") @DomainModel( annotatedClasses = { MappedSuperClassBasicPropertyIdAttributeOverrideTest.BaseMappedSuperClass.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassIdPropertyBasicAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassIdPropertyBasicAttributeOverrideTest.java index 3c1b2878f2..661b676ef1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassIdPropertyBasicAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassIdPropertyBasicAttributeOverrideTest.java @@ -6,7 +6,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.spi.MetadataImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Stanislav Gubanov */ -@TestForIssue(jiraKey = "HHH-11771") +@JiraKey(value = "HHH-11771") public class MappedSuperClassIdPropertyBasicAttributeOverrideTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java index d6d80675fc..2bc390db72 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.query; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -74,7 +74,7 @@ public class NamedQueryTest { } @Test - @TestForIssue( jiraKey = "HHH-15263" ) + @JiraKey( value = "HHH-15263" ) public void testNoExceptionThrownForNamedUpdate(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java index 5aa82292ef..cbf0b93e33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java @@ -27,7 +27,7 @@ import org.hibernate.query.Query; import org.hibernate.stat.Statistics; import org.hibernate.type.StandardBasicTypes; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -136,7 +136,7 @@ public class QueryAndSQLTest { } @Test - @TestForIssue(jiraKey = "HHH-10161") + @JiraKey(value = "HHH-10161") public void testQueryWithNullParameter(SessionFactoryScope scope) { Chaos c0 = new Chaos(); c0.setId( 0L ); @@ -180,7 +180,7 @@ public class QueryAndSQLTest { } @Test - @TestForIssue(jiraKey = "HHH-10161") + @JiraKey(value = "HHH-10161") public void testQueryWithNullParameterTyped(SessionFactoryScope scope) { Chaos c0 = new Chaos(); c0.setId( 0L ); @@ -224,7 +224,7 @@ public class QueryAndSQLTest { } @Test - @TestForIssue(jiraKey = "HHH-10161") + @JiraKey(value = "HHH-10161") public void testNativeQueryWithNullParameter(SessionFactoryScope scope) { Chaos c0 = new Chaos(); c0.setId( 0L ); @@ -269,7 +269,7 @@ public class QueryAndSQLTest { } @Test - @TestForIssue(jiraKey = "HHH-10161") + @JiraKey(value = "HHH-10161") public void testNativeQueryWithNullParameterTyped(SessionFactoryScope scope) { Chaos c0 = new Chaos(); c0.setId( 0L ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java index a295e3dcc4..b5514aee3e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java @@ -14,7 +14,7 @@ import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -82,7 +82,7 @@ public class QueryListParametersWithFetchSubSelectTest { } @Test - @TestForIssue(jiraKey = "HHH-14439") + @JiraKey(value = "HHH-14439") public void reusingQueryWithFewerNamedParameters(SessionFactoryScope scope) { final SQLStatementInspector sqlStatementInterceptor = scope.getCollectingStatementInspector(); @@ -117,7 +117,7 @@ public class QueryListParametersWithFetchSubSelectTest { @Test - @TestForIssue(jiraKey = "HHH-14439") + @JiraKey(value = "HHH-14439") public void reusingQueryWithFewerOrdinalParameters(SessionFactoryScope scope) { final SQLStatementInspector sqlStatementInterceptor = scope.getCollectingStatementInspector(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc0Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc0Test.java index b152944ece..0ee96630d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc0Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc0Test.java @@ -6,7 +6,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -16,7 +16,7 @@ import java.io.Serializable; @DomainModel(annotatedClasses = {Misc0Test.EntityA.class, Misc0Test.EntityB.class}) @SessionFactory -@TestForIssue(jiraKey = "HHH-15355") +@JiraKey(value = "HHH-15355") public class Misc0Test { @Test public void test(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc1Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc1Test.java index ecb41ad64a..9c7d5b42b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc1Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc1Test.java @@ -4,7 +4,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -14,7 +14,7 @@ import java.io.Serializable; @DomainModel(annotatedClasses = {Misc1Test.EntityA.class, Misc1Test.EntityB.class}) @SessionFactory -@TestForIssue(jiraKey = "HHH-15355") +@JiraKey(value = "HHH-15355") public class Misc1Test { @Test public void test(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc2Test.java index 6bde983a19..b9e55a0e99 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc2Test.java @@ -8,7 +8,7 @@ import jakarta.persistence.FetchType; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @DomainModel(annotatedClasses = {Misc2Test.A.class, Misc2Test.B.class}) @SessionFactory -@TestForIssue(jiraKey = "HHH-15277") +@JiraKey(value = "HHH-15277") public class Misc2Test { @Test public void test(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc3Test.java index 89d174d54c..95ffe11432 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc3Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc3Test.java @@ -12,7 +12,7 @@ import jakarta.persistence.JoinColumns; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; @DomainModel(annotatedClasses = {Misc3Test.A.class, Misc3Test.B.class}) @SessionFactory -@TestForIssue(jiraKey = "HHH-14687") +@JiraKey(value = "HHH-14687") public class Misc3Test { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc4Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc4Test.java index 158735bec1..203b64b23a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc4Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc4Test.java @@ -11,7 +11,7 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import java.util.Objects; @DomainModel(annotatedClasses = {Misc4Test.A.class, Misc4Test.B.class}) @SessionFactory -@TestForIssue(jiraKey = "HHH-13054") +@JiraKey(value = "HHH-13054") public class Misc4Test { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc5Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc5Test.java index c721a2a5bd..5fe344ab8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc5Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/misc/Misc5Test.java @@ -9,7 +9,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.JoinTable; import jakarta.persistence.ManyToMany; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -21,7 +21,7 @@ import java.util.Set; @DomainModel(annotatedClasses = {Misc5Test.Animal.class}) @SessionFactory -@TestForIssue(jiraKey = "HHH-14014") +@JiraKey(value = "HHH-14014") public class Misc5Test { @Test void test(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/RefToSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/RefToSecondaryTableTest.java index 405b3606b9..54ab193a4b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/RefToSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/secondary/RefToSecondaryTableTest.java @@ -1,13 +1,13 @@ package org.hibernate.orm.test.annotations.refcolnames.secondary; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -@TestForIssue(jiraKey = "HHH-15933") +@JiraKey(value = "HHH-15933") @SessionFactory @DomainModel(annotatedClasses = { Split.class, Reference.class }) public class RefToSecondaryTableTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java index 11b491f743..73e5334744 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java @@ -8,14 +8,18 @@ package org.hibernate.orm.test.annotations.reflection; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; -@TestForIssue(jiraKey = {"HHH-11924", "HHH-14529"}) +@JiraKeyGroup( value = { + @JiraKey( value = "HHH-11924" ), + @JiraKey( value = "HHH-14529" ) +} ) public class ElementCollectionConverterTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java index ac6da619ed..29ad98438d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java @@ -10,7 +10,7 @@ import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl; import org.hibernate.boot.model.internal.XMLContext; import org.hibernate.orm.test.internal.util.xml.XMLMappingHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.boot.BootstrapContextImpl; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; /** * @author Emmanuel Bernard */ -@TestForIssue(jiraKey = "HHH-14529") +@JiraKey(value = "HHH-14529") public class XMLContextTest { private BootstrapContextImpl bootstrapContext; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java index 34f6713e5b..54ce30e3d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.annotations.secondarytable; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -33,7 +33,7 @@ import static org.hamcrest.MatcherAssert.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15117") +@JiraKey(value = "HHH-15117") public class ParentChildWithSameSecondaryTableTest { @AfterEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/TestDiscriminatedOneToMany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/TestDiscriminatedOneToMany.java index 52b965026b..fad581c333 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/TestDiscriminatedOneToMany.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/sharedfk/TestDiscriminatedOneToMany.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.annotations.sharedfk; import org.hibernate.PropertyValueException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -@TestForIssue(jiraKey = "JPA-46") +@JiraKey(value = "JPA-46") @SessionFactory @DomainModel(annotatedClasses = {AbstractChild.class, Parent.class, ConcreteChild1.class, ConcreteChild2.class}) public class TestDiscriminatedOneToMany { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java index 66b9080de9..1c606e8300 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java @@ -11,7 +11,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12688") +@JiraKey(value = "HHH-12688") @RequiresDialect(H2Dialect.class) @Jpa( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java index bb997cc502..46c7561267 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Table; import org.hibernate.exception.ConstraintViolationException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.fail; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-11236") +@JiraKey(value = "HHH-11236") public class UniqueConstraintThrowsConstraintViolationExceptionTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java index 42c9152906..4d5509e1c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java @@ -25,7 +25,7 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -40,7 +40,7 @@ import static org.junit.Assert.fail; public class UniqueConstraintUnitTests extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-8026" ) + @JiraKey( value = "HHH-8026" ) public void testUnNamedConstraints() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); @@ -74,7 +74,7 @@ public class UniqueConstraintUnitTests extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8537" ) + @JiraKey( value = "HHH-8537" ) public void testNonExistentColumn() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java index 2e8226cba4..800a6cdcad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java @@ -17,7 +17,7 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -29,7 +29,7 @@ import org.junit.Test; public class UniqueConstraintValidationTest extends BaseUnitTestCase { @Test(expected = AnnotationException.class) - @TestForIssue(jiraKey = "HHH-4084") + @JiraKey(value = "HHH-4084") public void testUniqueConstraintWithEmptyColumnName() { buildSessionFactory(EmptyColumnNameEntity.class); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneOneGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneOneGeneratedValueTest.java index a57b1df09d..14372eeff8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneOneGeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneOneGeneratedValueTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.annotations.various; import org.hibernate.annotations.Subselect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15520") +@JiraKey(value = "HHH-15520") public class OneOneGeneratedValueTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java index 7086cbd0b3..bc3795196d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java @@ -15,7 +15,7 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.persister.collection.BasicCollectionPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Emmanuel Bernard */ -@TestForIssue(jiraKey = "HHH-14529") +@JiraKey(value = "HHH-14529") @DomainModel( annotatedClasses = { CarModel.class, Manufacturer.class, Model.class, Light.class }, xmlMappings = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java index cd7c14bf62..63b952b274 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java @@ -11,13 +11,17 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.junit.Test; import static org.junit.Assert.fail; -@TestForIssue(jiraKey = {"HHH-6271", "HHH-14529"}) +@JiraKeyGroup( value = { + @JiraKey( value = "HHH-6271" ), + @JiraKey( value = "HHH-14529" ) +} ) public class NonExistentOrmVersionTest extends BaseUnitTestCase { @Test public void testNonExistentOrmVersion() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java index 4399d05d2d..3f99a797f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java @@ -11,10 +11,11 @@ import org.hibernate.Transaction; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.junit.Rule; import org.junit.Test; @@ -25,7 +26,10 @@ import java.lang.invoke.MethodHandles; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -@TestForIssue(jiraKey = {"HHH-6271", "HHH-14529"}) +@JiraKeyGroup( value = { + @JiraKey( value = "HHH-6271" ), + @JiraKey( value = "HHH-14529" ) +} ) public class OrmVersion1SupportedTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java index 418bc6430b..899467d913 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java @@ -16,13 +16,17 @@ import org.hibernate.cfg.Configuration; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -@TestForIssue(jiraKey = {"HHH-14530", "HHH-14529"}) +@JiraKeyGroup( value = { + @JiraKey( value = "HHH-14530" ), + @JiraKey( value = "HHH-14529" ) +} ) @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) public class PreParsedOrmXmlTest extends BaseCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PreParsedHbmXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PreParsedHbmXmlTest.java index afc27b8112..b94ea20397 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PreParsedHbmXmlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/PreParsedHbmXmlTest.java @@ -15,13 +15,13 @@ import org.hibernate.boot.jaxb.spi.Binding; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -@TestForIssue(jiraKey = "HHH-14530") +@JiraKey(value = "HHH-14530") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class) public class PreParsedHbmXmlTest extends BaseSessionFactoryFunctionalTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyImplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyImplicitDiscriminatorTest.java index 36e3e19275..e2eba56912 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyImplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyImplicitDiscriminatorTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.any.annotations; import org.hibernate.query.spi.QueryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -119,7 +119,7 @@ public class AnyImplicitDiscriminatorTest { } @Test - @TestForIssue( jiraKey = "HHH-16732") + @JiraKey( value = "HHH-16732") public void testHqlAnyIdQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -137,7 +137,7 @@ public class AnyImplicitDiscriminatorTest { } @Test - @TestForIssue( jiraKey = "HHH-15323") + @JiraKey( value = "HHH-15323") public void testHqlCollectionTypeQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -165,7 +165,7 @@ public class AnyImplicitDiscriminatorTest { } @Test - @TestForIssue( jiraKey = "HHH-15442") + @JiraKey( value = "HHH-15442") public void testHqlCollectionTypeQueryWithParameters(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -197,7 +197,7 @@ public class AnyImplicitDiscriminatorTest { } @Test - @TestForIssue( jiraKey = "HHH-15323") + @JiraKey( value = "HHH-15323") public void testHqlTypeQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -220,7 +220,7 @@ public class AnyImplicitDiscriminatorTest { @Test - @TestForIssue( jiraKey = "HHH-15442") + @JiraKey( value = "HHH-15442") public void testHqlTypeQueryWithParameter(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyTest.java index dba13d4b88..17a8da390d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.LazyInitializationException; import org.hibernate.query.spi.QueryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -131,7 +131,7 @@ public class AnyTest { } @Test - @TestForIssue( jiraKey = "HHH-16732") + @JiraKey( value = "HHH-16732") public void testHqlAnyIdQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -149,7 +149,7 @@ public class AnyTest { } @Test - @TestForIssue( jiraKey = "HHH-15323") + @JiraKey( value = "HHH-15323") public void testHqlCollectionTypeQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -177,7 +177,7 @@ public class AnyTest { } @Test - @TestForIssue( jiraKey = "HHH-15442") + @JiraKey( value = "HHH-15442") public void testHqlCollectionTypeQueryWithParameters(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -209,7 +209,7 @@ public class AnyTest { } @Test - @TestForIssue( jiraKey = "HHH-15323") + @JiraKey( value = "HHH-15323") public void testHqlTypeQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -232,7 +232,7 @@ public class AnyTest { @Test - @TestForIssue( jiraKey = "HHH-15442") + @JiraKey( value = "HHH-15442") public void testHqlTypeQueryWithParameter(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EagerAnyDiscriminatorQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EagerAnyDiscriminatorQueryTest.java index b37268a31f..54c94060b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EagerAnyDiscriminatorQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EagerAnyDiscriminatorQueryTest.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.AnyDiscriminatorValue; import org.hibernate.annotations.AnyDiscriminatorValues; import org.hibernate.annotations.AnyKeyJavaClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; EagerAnyDiscriminatorQueryTest.StringProperty.class } ) -@TestForIssue(jiraKey = "HHH-15423") +@JiraKey(value = "HHH-15423") public class EagerAnyDiscriminatorQueryTest { private static final Long PROPERTY_HOLDER_ID = 2l; private static final Long STRING_PROPERTY_ID = 1l; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java index 82e423440d..8ca943db63 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java @@ -13,7 +13,7 @@ import org.hibernate.annotations.AnyDiscriminator; import org.hibernate.annotations.AnyDiscriminatorValue; import org.hibernate.annotations.AnyKeyJavaClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -83,7 +83,7 @@ public class EmbeddedAnyTest { } @Test - @TestForIssue( jiraKey = "HHH-16732") + @JiraKey( value = "HHH-16732") public void testEmbeddedIdHql(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -94,7 +94,7 @@ public class EmbeddedAnyTest { } @Test - @TestForIssue( jiraKey = "HHH-15323") + @JiraKey( value = "HHH-15323") public void testEmbeddedTypeHql(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -105,7 +105,7 @@ public class EmbeddedAnyTest { } @Test - @TestForIssue( jiraKey = "HHH-15323") + @JiraKey( value = "HHH-15323") public void testEmbeddedTypeHql2(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyAnyDiscriminatorQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyAnyDiscriminatorQueryTest.java index d1b72d2953..6fe9014088 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyAnyDiscriminatorQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyAnyDiscriminatorQueryTest.java @@ -15,7 +15,7 @@ import org.hibernate.annotations.AnyDiscriminatorValue; import org.hibernate.annotations.AnyDiscriminatorValues; import org.hibernate.annotations.AnyKeyJavaClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; LazyAnyDiscriminatorQueryTest.StringProperty.class } ) -@TestForIssue(jiraKey = "HHH-15423") +@JiraKey(value = "HHH-15423") public class LazyAnyDiscriminatorQueryTest { private static final Long PROPERTY_HOLDER_ID = 2l; private static final Long STRING_PROPERTY_ID = 1l; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java index de51d699c9..0bbb2b0b1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.any.hbm; import org.hibernate.cfg.AvailableSettings; import org.hibernate.query.SemanticException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -26,7 +26,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-1663") +@JiraKey(value = "HHH-1663") @ServiceRegistry( settings = @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ) ) @DomainModel( xmlMappings = "org/hibernate/orm/test/any/hbm/Person.hbm.xml" ) @SessionFactory diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdAndLazyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdAndLazyCollectionTest.java index fdc2c04d41..22366849f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdAndLazyCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdAndLazyCollectionTest.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.BatchSize; import org.hibernate.cfg.AvailableSettings; import org.hibernate.internal.util.StringHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -51,7 +51,7 @@ import static org.junit.Assert.assertTrue; @SessionFactory( useCollectingStatementInspector = true ) -@TestForIssue(jiraKey = "HHH-15921") +@JiraKey(value = "HHH-15921") public class BatchAndClassIdAndLazyCollectionTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdTest.java index 65b19547f7..a64e444d60 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndClassIdTest.java @@ -10,7 +10,7 @@ import org.hibernate.Hibernate; import org.hibernate.annotations.BatchSize; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue; @SessionFactory( useCollectingStatementInspector = true ) -@TestForIssue(jiraKey = "HHH-15921") +@JiraKey(value = "HHH-15921") public class BatchAndClassIdTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdId2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdId2Test.java index 71887fecb3..0d7c2880f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdId2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdId2Test.java @@ -10,7 +10,7 @@ import org.hibernate.Hibernate; import org.hibernate.annotations.BatchSize; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -50,7 +50,7 @@ import static org.junit.Assert.assertTrue; @SessionFactory( useCollectingStatementInspector = true ) -@TestForIssue(jiraKey = "HHH-15921") +@JiraKey(value = "HHH-15921") public class BatchAndEmbeddedIdId2Test { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdAndLazyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdAndLazyCollectionTest.java index a2a649a65c..03391231dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdAndLazyCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdAndLazyCollectionTest.java @@ -11,7 +11,7 @@ import org.hibernate.Hibernate; import org.hibernate.annotations.BatchSize; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -52,7 +52,7 @@ import static org.junit.Assert.assertTrue; @SessionFactory( useCollectingStatementInspector = true ) -@TestForIssue(jiraKey = "HHH-15921") +@JiraKey(value = "HHH-15921") public class BatchAndEmbeddedIdIdAndLazyCollectionTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdTest.java index 1aef59a8a7..d76e0c4afe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndEmbeddedIdIdTest.java @@ -10,7 +10,7 @@ import org.hibernate.Hibernate; import org.hibernate.annotations.BatchSize; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue; @SessionFactory( useCollectingStatementInspector = true ) -@TestForIssue(jiraKey = "HHH-15921") +@JiraKey(value = "HHH-15921") public class BatchAndEmbeddedIdIdTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndResultStreamTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndResultStreamTest.java index 7bd10d9549..8594ea49e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndResultStreamTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchAndResultStreamTest.java @@ -6,7 +6,7 @@ import java.util.stream.Stream; import org.hibernate.annotations.BatchSize; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; BatchAndResultStreamTest.Appointment.class } ) -@TestForIssue( jiraKey = "HHH-16039") +@JiraKey( value = "HHH-16039") public class BatchAndResultStreamTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchNoUseJdbcMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchNoUseJdbcMetadataTest.java index 78c213b8b4..ed0e659604 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchNoUseJdbcMetadataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchNoUseJdbcMetadataTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.batch; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -29,7 +29,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @Setting(name = "hibernate.temp.use_jdbc_metadata_defaults", value = "false") } ) -@TestForIssue(jiraKey = "HHH-15281") +@JiraKey(value = "HHH-15281") @RequiresDialect(H2Dialect.class) public class BatchNoUseJdbcMetadataTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPaginationTest.java index 3556805784..f22d08ab37 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPaginationTest.java @@ -6,7 +6,7 @@ import java.util.stream.Collectors; import org.hibernate.annotations.BatchSize; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -31,7 +31,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; , useCollectingStatementInspector = true ) -@TestForIssue( jiraKey = "HHH-16005") +@JiraKey( value = "HHH-16005") public class BatchPaginationTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java index 0318d7e4fd..3ba5280e5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.batch; import org.hibernate.annotations.BatchSize; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; BatchPostLoadTest.MyEntity2.class } ) -@TestForIssue(jiraKey = "HHH-16106") +@JiraKey(value = "HHH-16106") public class BatchPostLoadTest { private static final Long MY_ENTITY_1_ID = 1l; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSizeAndStatelessSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSizeAndStatelessSessionTest.java index 756b9ec95e..735a1f6845 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSizeAndStatelessSessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSizeAndStatelessSessionTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.batch; import org.hibernate.Session; import org.hibernate.StatelessSession; import org.hibernate.query.SelectionQuery; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; annotatedClasses = { BatchSizeAndStatelessSessionTest.TestEntity.class } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-16249") +@JiraKey( value = "HHH-16249") public class BatchSizeAndStatelessSessionTest { private final String countQuery = "select count(id) from TestEntity"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java index c9d58c5f06..ca45f1cd20 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java @@ -8,7 +8,7 @@ import jakarta.persistence.OptimisticLockException; import org.hibernate.StaleObjectStateException; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -41,7 +41,7 @@ import static org.junit.jupiter.api.Assertions.fail; public class BatchUpdateAndVersionTest { @Test - @TestForIssue(jiraKey = "HHH-16394") + @JiraKey(value = "HHH-16394") public void testUpdate(SessionFactoryScope scope) { scope.getSessionFactory().getSchemaManager().truncate(); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java index bccdf8be69..e14525587d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java @@ -15,7 +15,7 @@ import org.hibernate.engine.jdbc.batch.spi.Batch; import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -31,7 +31,7 @@ import static org.junit.Assert.fail; * @author Shawn Clowater * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-7689" ) +@JiraKey( value = "HHH-7689" ) public class BatchingBatchFailureTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java index d9512f092f..f7545f176d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java @@ -26,7 +26,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -37,7 +37,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-12470" ) +@JiraKey( value = "HHH-12470" ) public class BatchingInheritanceDeleteTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceTest.java index 9bb411b706..256da41fbe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.batch; import org.hibernate.annotations.BatchSize; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -25,7 +25,7 @@ import jakarta.persistence.criteria.CriteriaQuery; BatchingInheritanceTest.Smell.class, } ) -@TestForIssue( jiraKey = "HHH-15694") +@JiraKey( value = "HHH-15694") public class BatchingInheritanceTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DynamicMutationsAndBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DynamicMutationsAndBatchingTest.java index b558804e99..f0c418868e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DynamicMutationsAndBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DynamicMutationsAndBatchingTest.java @@ -19,7 +19,7 @@ import org.hibernate.annotations.DynamicUpdate; import org.hibernate.cfg.AvailableSettings; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; annotatedClasses = { DynamicMutationsAndBatchingTest.EntityA.class } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-16352") +@JiraKey( value = "HHH-16352") public class DynamicMutationsAndBatchingTest { @AfterEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java index 892305521a..6137dbdbdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @ServiceRegistry( settings = @Setting(name = AvailableSettings.DEFAULT_BATCH_FETCH_SIZE, value = "2") ) -@TestForIssue(jiraKey = "HHH-15346") +@JiraKey(value = "HHH-15346") public class EagerManyToOneBatchTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableBatchingTest.java index 30b9677dcf..571b9ac1a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableBatchingTest.java @@ -8,7 +8,7 @@ import org.hibernate.engine.spi.EntityEntry; import org.hibernate.internal.SessionImpl; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -33,7 +33,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; }, integrationSettings = { @Setting(name = Environment.DEFAULT_BATCH_FETCH_SIZE, value = "2") } ) -@TestForIssue(jiraKey = "HHH-15644") +@JiraKey(value = "HHH-15644") class EmbeddableBatchingTest { private static final EntityC ENTITY_C = new EntityC( 2, true ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableWithNullValuesExceptForAssociationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableWithNullValuesExceptForAssociationsTest.java index a6c7c4a135..29b4abf1dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableWithNullValuesExceptForAssociationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EmbeddableWithNullValuesExceptForAssociationsTest.java @@ -5,7 +5,7 @@ import java.util.Objects; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -28,7 +28,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; }, integrationSettings = { @Setting(name = Environment.DEFAULT_BATCH_FETCH_SIZE, value = "2") } ) -@TestForIssue( jiraKey = "HHH-15695") +@JiraKey( value = "HHH-15695") public class EmbeddableWithNullValuesExceptForAssociationsTest { private static final EntityB ENTITY_B = new EntityB( 2, "d" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java index 23492f0c83..a1748283fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @ServiceRegistry( settings = @Setting(name = AvailableSettings.DEFAULT_BATCH_FETCH_SIZE, value = "2") ) -@TestForIssue(jiraKey = "HHH-15346") +@JiraKey(value = "HHH-15346") public class LazyManyToOneBatchTest { @BeforeEach public void setUp(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java index 14887fd0cc..f1a00b8117 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java @@ -14,7 +14,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.engine.jdbc.batch.spi.Batch; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -30,7 +30,7 @@ import static org.junit.Assert.fail; * @author Shawn Clowater * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-7689" ) +@JiraKey( value = "HHH-7689" ) public class NonBatchingBatchFailureTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/RefreshAndBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/RefreshAndBatchTest.java index 4221b8abe3..e55cd6c569 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/RefreshAndBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/RefreshAndBatchTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.batch; import org.hibernate.annotations.BatchSize; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @Jpa( annotatedClasses = RefreshAndBatchTest.TestEntity.class ) -@TestForIssue(jiraKey = "HHH-15851") +@JiraKey(value = "HHH-15851") public class RefreshAndBatchTest { private static final Long ENTITY1_ID = 1l; private static final Long ENTITY2_ID = 2l; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java index d4e0b4d7f8..2fc2d05b48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ImplicitListAsBagProvider; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -57,7 +57,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class BatchFetchReferencedColumnNameTest { @Test - @TestForIssue(jiraKey = "HHH-13059") + @JiraKey(value = "HHH-13059") public void test(SessionFactoryScope scope) throws Exception { scope.inTransaction( session -> { Parent p = new Parent(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java index 316e06afbf..92f6d2fc38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java @@ -11,7 +11,7 @@ import java.util.stream.IntStream; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull; public class DynamicBatchFetchTestCase { @Test - @TestForIssue(jiraKey = "HHH-12835") + @JiraKey(value = "HHH-12835") public void batchFetchTest(SessionFactoryScope scope) { scope.inTransaction( session -> { // Having DEFAULT_BATCH_FETCH_SIZE=15 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/SubselectFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/SubselectFetchTest.java index 18e31f21a4..f70537246c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/SubselectFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/SubselectFetchTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.engine.spi.BatchFetchQueue; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -69,7 +69,7 @@ public class SubselectFetchTest { } @Test - @TestForIssue( jiraKey = "HHH-15202") + @JiraKey( value = "HHH-15202") public void testSubselectFetchOnlyCreatedIfEnabled(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionWithAbstractBidClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionWithAbstractBidClassTest.java index ef27424fa6..865ae5766c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionWithAbstractBidClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionWithAbstractBidClassTest.java @@ -10,8 +10,9 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Date; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.Test; @@ -26,7 +27,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue; xmlMappings = "org/hibernate/orm/test/bidi/Auction3.hbm.xml" ) @SessionFactory -@TestForIssue( jiraKey = {"HHH-987", "HHH-992"} ) +@JiraKeyGroup( + value = { + @JiraKey( value = "HHH-987" ), + @JiraKey( value = "HHH-992" ) + } +) public class AuctionWithAbstractBidClassTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java index e4014ac40d..c6b19a4762 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java @@ -18,7 +18,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue; * * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-10120" ) +@JiraKey( value = "HHH-10120" ) public class CfgXmlResourceNameClosingTest extends BaseUnitTestCase { private static class InputStreamWrapper extends InputStream { private final InputStream wrapped; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java index 174624c909..b115bd4c75 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java @@ -62,8 +62,9 @@ import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.CustomParameterized; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; import org.junit.runner.RunWith; @@ -88,7 +89,12 @@ import jakarta.persistence.TableGenerator; import static org.assertj.core.api.Assertions.assertThat; @RunWith(CustomParameterized.class) -@TestForIssue(jiraKey = { "HHH-14921", "HHH-14922", "HHH-15212", "HHH-16177" }) +@JiraKeyGroup( value = { + @JiraKey( value = "HHH-14921" ), + @JiraKey( value = "HHH-14922" ), + @JiraKey( value = "HHH-15212" ), + @JiraKey( value = "HHH-16177" ) +} ) @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) public class DefaultCatalogAndSchemaTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/NamespaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/NamespaceTest.java index cbc30c0221..5731722cfc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/NamespaceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/NamespaceTest.java @@ -12,7 +12,7 @@ import org.hibernate.boot.model.relational.Database; import org.hibernate.boot.model.relational.Namespace; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -24,7 +24,7 @@ import static org.mockito.Mockito.when; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11625") +@JiraKey(value = "HHH-11625") public class NamespaceTest { private static final String EXPECTED_CATALOG_PHYSICAL_NAME = "catalog"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java index d3e1c5b370..34dee62091 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java @@ -11,7 +11,7 @@ import org.hibernate.boot.model.relational.QualifiedNameParser; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; @@ -20,7 +20,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10174") +@JiraKey(value = "HHH-10174") public class QualifiedNameParserTest { private static final Identifier DEFAULT_SCHEMA = Identifier.toIdentifier( "schema" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/source/AttributePathTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/source/AttributePathTest.java index 3d4fb64aba..3b33d2a24a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/source/AttributePathTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/source/AttributePathTest.java @@ -10,7 +10,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.hibernate.boot.model.source.spi.AttributePath; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; /** @@ -19,7 +19,7 @@ import org.junit.Test; public class AttributePathTest { @Test - @TestForIssue(jiraKey = "HHH-10863") + @JiraKey(value = "HHH-10863") public void testCollectionElement() { AttributePath attributePath = AttributePath.parse( "items.{element}.name" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java index 1985a07c76..bcb0fd0da8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java @@ -19,7 +19,7 @@ import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12062") +@JiraKey(value = "HHH-12062") public class AttributeAccessorTest { private ServiceRegistry serviceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessMappingTest.java index 59031d3163..b1cfb5fbe8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessMappingTest.java @@ -19,7 +19,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.type.descriptor.java.spi.JdbcTypeRecommendationException; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -269,7 +269,7 @@ public class AccessMappingTest { } } - @TestForIssue(jiraKey = "HHH-5004") + @JiraKey(value = "HHH-5004") @Test public void testAccessOnClassAndId() { Configuration cfg = new Configuration(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java index 557fbf6bb7..9d031e0de4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java @@ -22,7 +22,7 @@ import org.hibernate.mapping.Component; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -52,7 +52,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @SessionFactory public class EmbeddedOverrideTests { @Test - @TestForIssue(jiraKey = "HHH-8630") + @JiraKey(value = "HHH-8630") public void testModel(DomainModelScope scope) { assertTrue( SchemaUtil.isColumnPresent( "DOMESTIC_CUSTOMER", "DC_address_street", scope.getDomainModel() ) ); assertTrue( SchemaUtil.isColumnPresent( "FOREIGN_CUSTOMER", "FC_address_street", scope.getDomainModel() ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java index e626d8faaf..270a86e6b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java @@ -26,7 +26,7 @@ import org.hibernate.mapping.Property; import org.hibernate.mapping.SimpleValue; import org.hibernate.type.BasicType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; import org.hibernate.testing.orm.junit.FailureExpected; @@ -64,7 +64,7 @@ public class PluralEmbeddedOverrideTests { @SuppressWarnings("rawtypes") @Test - @TestForIssue(jiraKey = "HHH-8630") + @JiraKey(value = "HHH-8630") public void testModel(DomainModelScope scope) { final PersistentClass entityBinding = scope.getDomainModel().getEntityBinding( AggregatedTypeValue.class.getName() ); final Property attributesBinding = entityBinding.getProperty( "attributes" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java index b156b91f13..a7542e15c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java @@ -20,7 +20,7 @@ import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -54,7 +54,7 @@ public class EmbeddedCircularFetchTests { // - `org.hibernate.orm.test.fetch.circular.manytoone` @Test - @TestForIssue(jiraKey = "HHH-9642") + @JiraKey(value = "HHH-9642") public void testCircularFetchAcrossComponent(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java index 4861834356..1f5893d47c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java @@ -20,7 +20,7 @@ import org.hibernate.orm.test.bootstrap.binding.annotations.embedded.FloatLeg.Ra import org.hibernate.orm.test.bootstrap.binding.annotations.embedded.Leg.Frequency; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -111,7 +111,7 @@ public class EmbeddedTest { } @Test - @TestForIssue(jiraKey = "HHH-8172") + @JiraKey(value = "HHH-8172") public void testQueryWithEmbeddedIsNull(SessionFactoryScope scope) { Person person = new Person(); Address a = new Address(); @@ -142,7 +142,7 @@ public class EmbeddedTest { } @Test - @TestForIssue(jiraKey = "HHH-8172") + @JiraKey(value = "HHH-8172") public void testQueryWithEmbeddedParameterAllNull(SessionFactoryScope scope) { Person person = new Person(); Address a = new Address(); @@ -176,7 +176,7 @@ public class EmbeddedTest { } @Test - @TestForIssue(jiraKey = "HHH-8172") + @JiraKey(value = "HHH-8172") public void testQueryWithEmbeddedParameterOneNull(SessionFactoryScope scope) { Person person = new Person(); Address a = new Address(); @@ -211,7 +211,7 @@ public class EmbeddedTest { } @Test - @TestForIssue(jiraKey = "HHH-8172") + @JiraKey(value = "HHH-8172") public void testQueryWithEmbeddedWithNullUsingSubAttributes(SessionFactoryScope scope) { Person person = new Person(); Address a = new Address(); @@ -586,7 +586,7 @@ public class EmbeddedTest { } @Test - @TestForIssue(jiraKey = "HHH-9642") + @JiraKey(value = "HHH-9642") public void testEmbeddedAndOneToManyHql(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -769,7 +769,7 @@ public class EmbeddedTest { } @Test - @TestForIssue(jiraKey = "HHH-3868") + @JiraKey(value = "HHH-3868") public void testTransientMergeComponentParent(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java index a0d8bd00bb..8c185760a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NestedEmbeddableAttributeOverrideTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -18,7 +18,7 @@ import org.junit.Test; public class NestedEmbeddableAttributeOverrideTest extends BaseCoreFunctionalTestCase { @Test - @TestForIssue(jiraKey="HHH-8021") + @JiraKey(value="HHH-8021") public void testAttributeOverride() { EmbeddableB embedB = new EmbeddableB(); embedB.setEmbedAttrB( "B" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java index 43260d60c3..adff7c3c51 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java @@ -10,7 +10,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.mapping.Table; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Assert; @@ -20,7 +20,7 @@ import org.junit.Test; * @author Lukasz Antoniak */ @RequiresDialect(H2Dialect.class) -@TestForIssue(jiraKey = "HHH-6662") +@JiraKey(value = "HHH-6662") public class AssociationOverrideSchemaTest extends BaseNonConfigCoreFunctionalTestCase { public static final String SCHEMA_NAME = "OTHER_SCHEMA"; public static final String TABLE_NAME = "BLOG_TAGS"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java index 957b6568eb..30c55fc35d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java @@ -16,7 +16,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.spi.MetadataImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -42,7 +42,7 @@ public class InheritedAttributeOverridingTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9485" ) + @JiraKey( value = "HHH-9485" ) public void testInheritedAttributeOverridingMappedsuperclass() { Metadata metadata = new MetadataSources( standardServiceRegistry ) .addAnnotatedClass( A.class ) @@ -54,7 +54,7 @@ public class InheritedAttributeOverridingTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9485" ) + @JiraKey( value = "HHH-9485" ) public void testInheritedAttributeOverridingEntity() { Metadata metadata = new MetadataSources( standardServiceRegistry ) .addAnnotatedClass( C.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/ImplicitIndexColumnNameSourceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/ImplicitIndexColumnNameSourceTest.java index 54bb7d5e21..6ff568a1f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/ImplicitIndexColumnNameSourceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/ImplicitIndexColumnNameSourceTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.bootstrap.binding.naming; import org.hibernate.boot.model.naming.ImplicitIndexColumnNameSource; import org.hibernate.boot.model.naming.ImplicitNameSource; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; public class ImplicitIndexColumnNameSourceTest { @Test - @TestForIssue(jiraKey = "HHH-10810") + @JiraKey(value = "HHH-10810") public void testExtensionImplicitNameSource() { assertTrue( ImplicitNameSource.class.isAssignableFrom( ImplicitIndexColumnNameSource.class ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java index 5e70a9a58b..1a023992d6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.bootstrap.binding.naming; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.NamingHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.Test; @@ -18,7 +18,7 @@ import static org.junit.Assert.assertEquals; public class NamingHelperTest extends BaseUnitTestCase { @Test - @TestForIssue(jiraKey = "HHH-12357") + @JiraKey(value = "HHH-12357") public void generateHashedFkName() { Identifier booksDe = new Identifier( "Bücher", false ); Identifier authorsDe = new Identifier( "Autoren", false ); @@ -34,7 +34,7 @@ public class NamingHelperTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12357") + @JiraKey(value = "HHH-12357") public void generateHashedFkNameUSingUtf8() { Identifier booksDe = new Identifier( "Bücher", false ); Identifier authorsDe = new Identifier( "Autoren", false ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java index f75fd5b919..7a0e95f37d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java @@ -23,7 +23,7 @@ import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.jdbc.DataSourceStub; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.jpa.PersistenceUnitInfoAdapter; import org.junit.Test; @@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals; @RequiresDialect( H2Dialect.class ) public class PersistenceUnitInfoTests extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-13432" ) + @JiraKey( value = "HHH-13432" ) public void testNonJtaDataExposedAsProperty() { final DataSource puDataSource = new DataSourceStub( "puDataSource" ); final PersistenceUnitInfoAdapter info = new PersistenceUnitInfoAdapter() { @@ -73,7 +73,7 @@ public class PersistenceUnitInfoTests extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-13432" ) + @JiraKey( value = "HHH-13432" ) public void testJtaDataExposedAsProperty() { final DataSource puDataSource = new DataSourceStub( "puDataSource" ); final PersistenceUnitInfoAdapter info = new PersistenceUnitInfoAdapter() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java index ba1e58d2ab..b3946d662c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java @@ -27,7 +27,7 @@ import org.hibernate.jpa.HibernatePersistenceProvider; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.env.ConnectionProviderBuilder; import org.hibernate.testing.jdbc.DataSourceStub; import org.hibernate.testing.junit4.BaseUnitTestCase; @@ -312,7 +312,7 @@ public class PersistenceUnitOverridesTests extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-13640" ) + @JiraKey( value = "HHH-13640" ) public void testIntegrationOverridesOfPersistenceXmlDataSource() { // mimics a DataSource defined in the persistence.xml @@ -359,7 +359,7 @@ public class PersistenceUnitOverridesTests extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-13640" ) + @JiraKey( value = "HHH-13640" ) public void testIntegrationOverridesOfPersistenceXmlDataSourceWithDriverManagerInfo() { // mimics a DataSource defined in the persistence.xml @@ -398,7 +398,7 @@ public class PersistenceUnitOverridesTests extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-13640" ) + @JiraKey( value = "HHH-13640" ) public void testIntegrationOverridesOfPersistenceXmlDataSourceWithDriverManagerInfoUsingJakarta() { // mimics a DataSource defined in the persistence.xml diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderServiceImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderServiceImplTest.java index 3aac806599..0e07cd7e5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderServiceImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderServiceImplTest.java @@ -15,7 +15,7 @@ import java.util.List; import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl; import org.hibernate.boot.registry.classloading.internal.TcclLookupPrecedence; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -146,7 +146,7 @@ public class ClassLoaderServiceImplTest { } @Test - @TestForIssue(jiraKey = "HHH-13551") + @JiraKey(value = "HHH-13551") public void testServiceFromIncompatibleClassLoader() { ClassLoaderServiceImpl classLoaderService = new ClassLoaderServiceImpl( Arrays.asList( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java index 40c8b30193..0228126fc7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java @@ -38,7 +38,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.orm.test.jpa.pack.defaultpar.Version; import org.hibernate.orm.test.jpa.pack.explodedpar.Carpet; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.RequiresDialect; import org.junit.jupiter.api.Test; @@ -276,7 +276,7 @@ public class JarVisitorTest extends PackagingTestCase { } @Test - @TestForIssue(jiraKey = "HHH-6806") + @JiraKey(value = "HHH-6806") public void testJarVisitorFactory() throws Exception { final File explodedPar = buildExplodedPar(); final File defaultPar = buildDefaultPar(); @@ -314,7 +314,7 @@ public class JarVisitorTest extends PackagingTestCase { } @Test - @TestForIssue( jiraKey = "EJB-230" ) + @JiraKey( value = "EJB-230" ) public void testDuplicateFilterExplodedJarExpected() throws Exception { // File explodedPar = buildExplodedPar(); // addPackageToClasspath( explodedPar ); @@ -360,7 +360,7 @@ public class JarVisitorTest extends PackagingTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7835") + @JiraKey(value = "HHH-7835") public void testGetBytesFromInputStream() throws Exception { File file = buildLargeJar(); @@ -406,7 +406,7 @@ public class JarVisitorTest extends PackagingTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7835") + @JiraKey(value = "HHH-7835") public void testGetBytesFromZeroInputStream() throws Exception { // Ensure that JarVisitorFactory#getBytesFromInputStream // can handle 0 length streams gracefully. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java index 5f867e17fc..7425e3b95c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java @@ -41,7 +41,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.engine.config.internal.ConfigurationServiceInitiator; import org.hibernate.engine.config.spi.ConfigurationService; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.Logger; import org.hibernate.testing.orm.junit.MessageKeyInspection; import org.hibernate.testing.orm.junit.MessageKeyWatcher; @@ -135,7 +135,7 @@ public class ScanningCoordinatorTest { } @Test - @TestForIssue(jiraKey = "HHH-14473") + @JiraKey(value = "HHH-14473") public void testApplyScanResultsToManagedResultsWhileExplicitClassNameLoadable() { Class expectedClass = Object.class; when( classLoaderService.classForName( eq( "a.b.C" ) ) ).thenReturn( expectedClass ); @@ -153,13 +153,13 @@ public class ScanningCoordinatorTest { } @Test - @TestForIssue(jiraKey = "HHH-12505") + @JiraKey(value = "HHH-12505") public void testManagedResourcesAfterCoordinateScanWithDisabledScanner() { assertManagedResourcesAfterCoordinateScanWithScanner( new DisabledScanner(), true ); } @Test - @TestForIssue(jiraKey = "HHH-12505") + @JiraKey(value = "HHH-12505") public void testManagedResourcesAfterCoordinateScanWithCustomEnabledScanner() { final Scanner scanner = new Scanner() { @Override @@ -176,7 +176,7 @@ public class ScanningCoordinatorTest { } @Test - @TestForIssue(jiraKey = "HHH-10778") + @JiraKey(value = "HHH-10778") public void testManagedResourcesAfterCoordinateScanWithConverterScanner() { when( classLoaderService.classForName( "converter" ) ).thenReturn( (Class) IntegerToVarcharConverter.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java index 0e10ca9352..fd2f56e218 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java @@ -16,7 +16,7 @@ import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals; * @author Vlad Mihalcea */ @RequiresDialect(H2Dialect.class) -@TestForIssue( jiraKey = "HHH-12589" ) +@JiraKey( value = "HHH-12589" ) public abstract class AbstractSqlFunctionMetadataBuilderContributorTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java index 56e8d45b73..b940d2acd6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java @@ -21,7 +21,7 @@ import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; * @author Vlad Mihalcea */ @RequiresDialect(H2Dialect.class) -@TestForIssue( jiraKey = "HHH-13040" ) +@JiraKey( value = "HHH-13040" ) public class AttributeConverterMetadataBuilderContributorTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java index 02aaaf953d..81e61acf5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Vlad Mihalcea */ @RequiresDialect(H2Dialect.class) -@TestForIssue( jiraKey = "HHH-12589" ) +@JiraKey( value = "HHH-12589" ) public class SqlFunctionMetadataBuilderContributorClassNameTest extends AbstractSqlFunctionMetadataBuilderContributorTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java index 302d8e3c51..d828c96951 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -20,7 +20,7 @@ import static org.junit.Assert.fail; * @author Vlad Mihalcea */ @RequiresDialect(H2Dialect.class) -@TestForIssue( jiraKey = "HHH-12589" ) +@JiraKey( value = "HHH-12589" ) public class SqlFunctionMetadataBuilderContributorClassTest extends AbstractSqlFunctionMetadataBuilderContributorTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java index 446d8e017e..29e605c840 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -18,7 +18,7 @@ import static org.junit.Assert.fail; * @author Vlad Mihalcea */ @RequiresDialect(H2Dialect.class) -@TestForIssue( jiraKey = "HHH-12589" ) +@JiraKey( value = "HHH-12589" ) public class SqlFunctionMetadataBuilderContributorIllegalArgumentTest extends AbstractSqlFunctionMetadataBuilderContributorTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java index 2cf005e0ec..6a3e04ac5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hamcrest.Matchers; @@ -22,7 +22,7 @@ import static org.junit.Assert.fail; * @author Vlad Mihalcea */ @RequiresDialect(H2Dialect.class) -@TestForIssue( jiraKey = "HHH-12589" ) +@JiraKey( value = "HHH-12589" ) public class SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest extends AbstractSqlFunctionMetadataBuilderContributorTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java index ca47fa5b9d..f1a7452feb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Vlad Mihalcea */ @RequiresDialect(H2Dialect.class) -@TestForIssue( jiraKey = "HHH-12589" ) +@JiraKey( value = "HHH-12589" ) public class SqlFunctionMetadataBuilderContributorInstanceTest extends AbstractSqlFunctionMetadataBuilderContributorTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java index b1675c2a8d..dcc966fc9c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java @@ -16,7 +16,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.sqm.mutation.internal.inline.InlineMutationStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-12561" ) +@JiraKey( value = "HHH-12561" ) public class GlobalQuotedIdentifiersBulkIdTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java index 52a8611bb2..9a25bd9e1a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertNotNull; import org.hibernate.bytecode.spi.BytecodeProvider; import org.hibernate.bytecode.spi.ReflectionOptimizer; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -62,7 +62,7 @@ public class ReflectionOptimizerTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12584") + @JiraKey(value = "HHH-12584") public void testAbstractClass() { ReflectionOptimizer reflectionOptimizer = provider.getReflectionOptimizer( AbstractClass.class, new String[]{ "getProperty" }, new String[]{ "setProperty" }, new Class[]{ String.class } ); @@ -70,7 +70,7 @@ public class ReflectionOptimizerTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12584") + @JiraKey(value = "HHH-12584") public void testInterface() { ReflectionOptimizer reflectionOptimizer = provider.getReflectionOptimizer( Interface.class, new String[]{ "getProperty" }, new String[]{ "setProperty" }, new Class[]{ String.class } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java index 96c5c5b624..6dbacb41f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java @@ -2,10 +2,9 @@ package org.hibernate.orm.test.bytecode.enhancement.detached; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced; import org.hibernate.testing.orm.junit.DomainModel; -import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SessionFactoryScope; import jakarta.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/RemoveUninitializedLazyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/RemoveUninitializedLazyCollectionTest.java index 2ac752f418..559202fb4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/RemoveUninitializedLazyCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/RemoveUninitializedLazyCollectionTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.bytecode.enhancement.EnhancementOptions; import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced; import org.hibernate.testing.orm.junit.DomainModel; @@ -33,7 +33,7 @@ import jakarta.persistence.OneToMany; /** * @author Christian Beikov */ -@TestForIssue(jiraKey = "HHH-14387") +@JiraKey(value = "HHH-14387") @DomainModel( annotatedClasses = { RemoveUninitializedLazyCollectionTest.Parent.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java index 859f7f9670..4a6bd8798a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java @@ -19,7 +19,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.proxy.HibernateProxy; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-13640" ) +@JiraKey( value = "HHH-13640" ) @DomainModel( annotatedClasses = { LazyToOnesProxyWithSubclassesStatelessTest.Animal.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java index ae2796a9b2..d910849472 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java @@ -12,7 +12,7 @@ import java.util.List; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; @@ -36,7 +36,7 @@ import static org.junit.Assert.fail; /** * @author Luis Barreiro */ -@TestForIssue( jiraKey = "HHH-11459" ) +@JiraKey( value = "HHH-11459" ) @RunWith( BytecodeEnhancerRunner.class ) public class MergeEnhancedEntityDynamicUpdateTest extends BaseCoreFunctionalTestCase { private Person person; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshAndInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshAndInheritanceTest.java index 42ce3dbdfd..5ea8671755 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshAndInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/refresh/RefreshAndInheritanceTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.bytecode.enhancement.refresh; import java.util.ArrayList; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -36,7 +36,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; RefreshAndInheritanceTest.Person.class, } ) -@TestForIssue( jiraKey = "HHH-16447") +@JiraKey( value = "HHH-16447") public class RefreshAndInheritanceTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java index f6c599ec59..5c9279a458 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java @@ -18,7 +18,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.spi.Status; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -98,7 +98,7 @@ public class ByteCodeEnhancedImmutableReferenceCacheTest extends BaseCoreFunctio } @Test - @TestForIssue( jiraKey = "HHH-10795") + @JiraKey( value = "HHH-10795") public void testAssociatedWithMultiplePersistenceContexts() { MyEnhancedReferenceData myReferenceData = new MyEnhancedReferenceData( 1, "first item", "abc" ); MyEnhancedReferenceData myOtherReferenceData = new MyEnhancedReferenceData( 2, "second item", "def" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java index 97b096f319..ccdc9c6383 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java @@ -16,7 +16,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; @@ -42,7 +42,7 @@ public class CacheAnnotationTests extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12587") + @JiraKey(value = "HHH-12587") public void testCacheWriteConcurrencyStrategyNone() { doInHibernate( this::sessionFactory, session -> { NoCacheConcurrencyStrategyEntity entity = new NoCacheConcurrencyStrategyEntity(); @@ -53,7 +53,7 @@ public class CacheAnnotationTests extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12868") + @JiraKey(value = "HHH-12868") public void testCacheReadConcurrencyStrategyNone() { doInHibernate( this::sessionFactory, session -> { NoCacheConcurrencyStrategyEntity entity = new NoCacheConcurrencyStrategyEntity(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheOneToManyAndIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheOneToManyAndIdClassTest.java index 2c359d9360..d71737c5d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheOneToManyAndIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheOneToManyAndIdClassTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -42,7 +42,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true") } ) -@TestForIssue(jiraKey = "HHH-16493") +@JiraKey(value = "HHH-16493") public class CacheOneToManyAndIdClassTest { public static final Long CONTENT_ID = 200l; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java index 10097f174d..233bc57964 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java @@ -19,7 +19,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.stat.CacheRegionStatistics; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.cache.CachingRegionFactory; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.After; @@ -35,7 +35,7 @@ import static org.junit.Assert.assertEquals; public class CacheRegionStatisticsTest extends BaseNonConfigCoreFunctionalTestCase { @Test - @TestForIssue( jiraKey = "HHH-15105") + @JiraKey( value = "HHH-15105") public void testAccessDefaultQueryRegionStatistics() { final Statistics statistics = sessionFactory().getStatistics(); final CacheRegionStatistics queryRegionStatistics = statistics.getQueryRegionStatistics( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CircularityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CircularityTest.java index 433f54ce86..3fd1d20990 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CircularityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CircularityTest.java @@ -4,7 +4,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -26,7 +26,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; }, integrationSettings = @Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true") ) -@TestForIssue(jiraKey = "HHH-16197") +@JiraKey(value = "HHH-16197") public class CircularityTest { private static final String CHILD_ID = "c1"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java index a52777fd22..ad13089285 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java @@ -16,7 +16,7 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.metamodel.CollectionClassification; import org.hibernate.persister.collection.CollectionPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -31,7 +31,7 @@ import static org.junit.Assert.fail; /** * @author Andreas Berger */ -@TestForIssue(jiraKey = "HHH-4910") +@JiraKey(value = "HHH-4910") public class CollectionCacheEvictionTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { @@ -254,7 +254,7 @@ public class CollectionCacheEvictionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10631") + @JiraKey(value = "HHH-10631") public void testCollectionCacheEvictionUpdateWhenChildIsSetToNull() { Session s = openSession(); s.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java index 7b8c394c9a..be9cd97e3e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java @@ -22,7 +22,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; @@ -49,7 +49,7 @@ public class EntityUpdateCacheModeIgnoreTest extends BaseCoreFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH9739") + @JiraKey( value = "HHH9739") public void testCachModeIgnore() { // Test that there is no interaction with cache except for invalidation when using CacheMode.IGNORE // From API Doc : CacheMode.IGNORE -> The session will never interact with the cache, except to invalidate cache items when updates occur. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java index d6a31e604c..be956a300c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java @@ -11,7 +11,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.metamodel.CollectionClassification; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.hibernate.cfg.AvailableSettings.DEFAULT_LIST_SEMANTICS; @@ -76,7 +76,7 @@ public class LockModeTest extends BaseCoreFunctionalTestCase { /** */ - @TestForIssue(jiraKey = "HHH-9764") + @JiraKey(value = "HHH-9764") @Test public void testDefaultLockModeOnCollectionInitialization() { Session s1 = openSession(); @@ -109,7 +109,7 @@ public class LockModeTest extends BaseCoreFunctionalTestCase { s1.close(); } - @TestForIssue(jiraKey = "HHH-9764") + @JiraKey(value = "HHH-9764") @Test public void testDefaultLockModeOnEntityLoad() { @@ -145,7 +145,7 @@ public class LockModeTest extends BaseCoreFunctionalTestCase { s1.close(); } - @TestForIssue(jiraKey = "HHH-9764") + @JiraKey(value = "HHH-9764") @Test public void testReadLockModeOnEntityLoad() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NoCachingRegionFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NoCachingRegionFactoryTest.java index fbeb3a89fd..8eeb98a5aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NoCachingRegionFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NoCachingRegionFactoryTest.java @@ -4,7 +4,7 @@ import org.hibernate.cache.internal.NoCachingRegionFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -20,7 +20,7 @@ public class NoCachingRegionFactoryTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-12508" ) + @JiraKey( value = "HHH-12508" ) public void testSessionFactoryOptionsConsistent() { assertFalse( sessionFactory().getSessionFactoryOptions().isSecondLevelCacheEnabled() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java index cc0205c5b2..7e5b1d5003 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java @@ -21,7 +21,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.cache.CachingRegionFactory; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -40,7 +40,7 @@ import static org.junit.Assert.fail; /** * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-11143") +@JiraKey( value = "HHH-11143") public class NonRootEntityWithCacheAnnotationTest { @Rule diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java index c682656887..79339996b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java @@ -19,7 +19,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.cache.CachingRegionFactory; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; @@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue; /** * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-11143") +@JiraKey( value = "HHH-11143") public class NonRootEntityWithCacheableAnnotationTest { @Rule diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java index a679d7167f..1e87471a72 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java @@ -20,7 +20,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -33,7 +33,7 @@ import jakarta.persistence.Version; /** * @author Zhenlei Huang */ -@TestForIssue(jiraKey = "HHH-10649") +@JiraKey(value = "HHH-10649") @RequiresDialect(value = H2Dialect.class) public class RefreshUpdatedDataTest extends BaseCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java index 7abe27262a..8a87bc77da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java @@ -29,7 +29,7 @@ import org.hibernate.stat.CacheRegionStatistics; import org.hibernate.stat.QueryStatistics; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.cache.CachingRegionFactory; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.After; @@ -54,7 +54,7 @@ public class SharedDomainDataAndQueryResultsTest extends BaseNonConfigCoreFuncti private static final String PREFIX = "test"; @Test - @TestForIssue( jiraKey = "HHH-13586") + @JiraKey( value = "HHH-13586") public void testAllCachedStatistics() { final Statistics statistics = sessionFactory().getStatistics(); @@ -274,7 +274,7 @@ public class SharedDomainDataAndQueryResultsTest extends BaseNonConfigCoreFuncti } @Test - @TestForIssue( jiraKey = "HHH-13586") + @JiraKey( value = "HHH-13586") public void testCacheImplementorGetRegion() { rebuildSessionFactory(); @@ -304,7 +304,7 @@ public class SharedDomainDataAndQueryResultsTest extends BaseNonConfigCoreFuncti } @Test - @TestForIssue( jiraKey = "HHH-13586") + @JiraKey( value = "HHH-13586") public void testEvictCaches() { final Statistics statistics = sessionFactory().getStatistics(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/TransactionalConcurrencyCollectionCacheEvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/TransactionalConcurrencyCollectionCacheEvictionTest.java index 74d9bd409c..f2c424e95a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/TransactionalConcurrencyCollectionCacheEvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/TransactionalConcurrencyCollectionCacheEvictionTest.java @@ -28,7 +28,7 @@ import org.hibernate.cache.internal.CollectionCacheInvalidator; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -43,7 +43,7 @@ import static org.junit.Assert.fail; /** * @author Christian Beikov */ -@TestForIssue(jiraKey = "HHH-4910") +@JiraKey(value = "HHH-4910") public class TransactionalConcurrencyCollectionCacheEvictionTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java index 3ce366492e..ba439b8ead 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java @@ -13,7 +13,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -24,7 +24,7 @@ import org.junit.Test; public class NonAggregatedCompositeIdCachingTest extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-9913" ) + @JiraKey( value = "HHH-9913" ) public void testNonAggregatedCompositeId() { // HHH-9913 reports a NPE when bootstrapping a SF with non-aggregated composite identifiers // in org.hibernate.cache.internal.CacheDataDescriptionImpl#decode @@ -46,7 +46,7 @@ public class NonAggregatedCompositeIdCachingTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9913" ) + @JiraKey( value = "HHH-9913" ) public void testNonAggregatedCompositeIdWithPkClass() { // HHH-9913 reports a NPE when bootstrapping a SF with non-aggregated composite identifiers // in org.hibernate.cache.internal.CacheDataDescriptionImpl#decode diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java index 39623235b7..3344ec88b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java @@ -4,7 +4,7 @@ import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; CachingAndBatchTest.MyEntity2.class } ) -@TestForIssue( jiraKey = "HHH-16025") +@JiraKey( value = "HHH-16025") public class CachingAndBatchTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionTest.java index 5cb9b3fddf..3bc123d8a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndVersionTest.java @@ -7,7 +7,7 @@ import java.util.Set; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -32,7 +32,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16126") +@JiraKey(value = "HHH-16126") public class CachingAndVersionTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithBatchAndFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithBatchAndFetchModeSelectTest.java index d2d2cfbed3..40803bc65c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithBatchAndFetchModeSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithBatchAndFetchModeSelectTest.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -34,7 +34,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) -@TestForIssue(jiraKey = "HHH-16230") +@JiraKey(value = "HHH-16230") public class CachingWithBatchAndFetchModeSelectTest { public final static String CATEGORY_A_NAME = "A"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheAccessTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheAccessTypeTest.java index 273181472e..ebf6301515 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheAccessTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheAccessTypeTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cache.spi.access.UnknownAccessTypeException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; @@ -21,7 +21,7 @@ import static org.junit.Assert.fail; public class CacheAccessTypeTest { @Test - @TestForIssue( jiraKey = "HHH-9844") + @JiraKey( value = "HHH-9844") public void testExplicitExternalNames() { assertSame( AccessType.READ_ONLY, AccessType.fromExternalName( "read-only" ) ); assertSame( AccessType.READ_WRITE, AccessType.fromExternalName( "read-write" ) ); @@ -30,7 +30,7 @@ public class CacheAccessTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-9844") + @JiraKey( value = "HHH-9844") public void testEnumNames() { assertSame( AccessType.READ_ONLY, AccessType.fromExternalName( "READ_ONLY" ) ); assertSame( AccessType.READ_WRITE, AccessType.fromExternalName( "READ_WRITE" ) ); @@ -39,7 +39,7 @@ public class CacheAccessTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-9844") + @JiraKey( value = "HHH-9844") public void testLowerCaseEnumNames() { assertSame( AccessType.READ_ONLY, AccessType.fromExternalName( "read_only" ) ); assertSame( AccessType.READ_WRITE, AccessType.fromExternalName( "read_write" ) ); @@ -48,7 +48,7 @@ public class CacheAccessTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-9844") + @JiraKey( value = "HHH-9844") public void testUpperCaseWithHyphens() { try { AccessType.fromExternalName( "READ-ONLY" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java index f1d190fbf8..2734e61981 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java @@ -21,7 +21,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotEquals; public class CacheKeyImplementationHashCodeTest { @Test - @TestForIssue( jiraKey = "HHH-12746") + @JiraKey( value = "HHH-12746") public void test() { try (ServiceRegistryImplementor serviceRegistry = ServiceRegistryUtil.serviceRegistry()) { MetadataSources ms = new MetadataSources( serviceRegistry ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java index 84b0247e0b..7a4b9bc980 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java @@ -25,7 +25,7 @@ import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.SybaseASEDialect; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; @@ -93,7 +93,7 @@ public class ReadWriteCacheTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13792") + @JiraKey(value = "HHH-13792") public void testDeleteHQL() throws InterruptedException { bookId = 2L; @@ -119,7 +119,7 @@ public class ReadWriteCacheTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13792") + @JiraKey(value = "HHH-13792") public void testDeleteNativeQuery() throws InterruptedException { bookId = 3L; @@ -174,7 +174,7 @@ public class ReadWriteCacheTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13792") + @JiraKey(value = "HHH-13792") public void testUpdateHQL() throws InterruptedException { bookId = 5L; @@ -201,7 +201,7 @@ public class ReadWriteCacheTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13792") + @JiraKey(value = "HHH-13792") public void testUpdateNativeQuery() throws InterruptedException { bookId = 6L; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java index 2f38f4a78e..c1f8c17291 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java @@ -29,7 +29,7 @@ import jakarta.persistence.Version; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestForIssue(jiraKey = "HHH-13590") +@JiraKey(value = "HHH-13590") @DomainModel( annotatedClasses = { CascadeMergeToProxyEntityCopyAllowedTest.AbstractEntity.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java index 28a100b454..d3c609ce28 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.MappedSuperclass; import jakarta.persistence.OneToMany; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import static org.junit.Assert.assertNotNull; -@TestForIssue(jiraKey = "HHH-13590") +@JiraKey(value = "HHH-13590") @DomainModel( annotatedClasses = { CascadeMergeToProxySimpleTest.AbstractEntity.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java index 6e6b1f055e..2eeac9d6bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java @@ -26,11 +26,11 @@ import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; -@TestForIssue(jiraKey = "HHH-12867") +@JiraKey(value = "HHH-12867") public class RefreshLazyOneToManyTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java index db3d7c8f89..0decbaef54 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.cascade.circle.delete; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15218") +@JiraKey(value = "HHH-15218") public class CascadeDeleteTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java index 4dd0926c22..109bf1ac7e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java @@ -44,7 +44,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Table; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; /** @@ -52,7 +52,7 @@ import org.junit.Test; * * @author Karthik Abram */ -@TestForIssue( jiraKey = "HHH-10549" ) +@JiraKey( value = "HHH-10549" ) public class ConversionAutoApplyTest extends BaseEntityManagerFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java index 49bf0a7986..769bce8625 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java @@ -35,7 +35,7 @@ import java.util.List; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.orm.test.jpa.model.AbstractJPATest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -91,7 +91,7 @@ public class ConvertBetweenTest extends AbstractJPATest { } @Test - @TestForIssue(jiraKey = "HHH-9356") + @JiraKey(value = "HHH-9356") public void testBetweenLiteral() { inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java index 274edc2053..78a3dd0d30 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java @@ -49,7 +49,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -64,7 +64,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { public static final float SALARY = 267.89f; @Test - @TestForIssue( jiraKey = "HHH-9356" ) + @JiraKey( value = "HHH-9356" ) public void testCriteriaBetween() { final EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java index dfb6b9a3b5..7c287c96ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java @@ -21,7 +21,7 @@ import org.hibernate.orm.test.cdi.converters.OrmXmlConverterBean; import org.hibernate.orm.test.cdi.converters.TheOrmXmlEntity; import org.hibernate.tool.schema.Action; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -107,7 +107,7 @@ public class CdiHostedConverterTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-14881\n") + @JiraKey(value = "HHH-14881\n") public void testOrmXml() { MonitorBean.reset(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java index f503680a3a..e0e2586ec7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java @@ -18,7 +18,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.resource.beans.container.spi.ExtendedBeanManager; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.hibernate.usertype.DynamicParameterizedType; @@ -32,7 +32,7 @@ import java.sql.SQLException; import java.sql.Types; import java.util.Properties; -@TestForIssue(jiraKey = "HHH-16096") +@JiraKey(value = "HHH-16096") public class ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java index b4334e667c..393b0b1086 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java @@ -17,13 +17,13 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.resource.beans.container.spi.ExtendedBeanManager; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; import jakarta.enterprise.inject.spi.BeanManager; -@TestForIssue(jiraKey = "HHH-15068") +@JiraKey(value = "HHH-15068") public class ExtendedBeanManagerNotAvailableDuringTypeResolutionTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java index 6c73197acf..f43531a28c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.AnnotationException; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -21,7 +21,7 @@ import static junit.framework.TestCase.fail; /** * @author Dominique Toupin */ -@TestForIssue(jiraKey = "HHH-10456") +@JiraKey(value = "HHH-10456") public class AnnotationBinderTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java index 58279ff426..f5357eee08 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Persistence; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertNull; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-13227") +@JiraKey(value = "HHH-13227") public class CfgFilePropertyTest extends BaseUnitTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionType.java index 10a6d6b1fd..d5d3f1badb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionType.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.cfg; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertTrue; @@ -16,7 +16,7 @@ import static org.junit.Assert.assertTrue; /** * @author Chris Cranford */ -@TestForIssue(jiraKey ="HHH-12199") +@JiraKey(value ="HHH-12199") public class PropertyAccessTypeDetectionType extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java index e0b31b9809..89325abcc8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java @@ -18,7 +18,7 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertTrue; * * @author Didier Villevalois */ -@TestForIssue(jiraKey = "HHH-7134") +@JiraKey(value = "HHH-7134") public class WrongCircularityDetectionTest extends BaseUnitTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java index f752348326..b1f5512718 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java @@ -23,7 +23,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue; public class DefaultCacheConcurrencyPropertyTest extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-9763" ) + @JiraKey( value = "HHH-9763" ) public void testExplicitDefault() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java index b86d394fe8..869121a68c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java @@ -14,7 +14,7 @@ import org.hibernate.annotations.Immutable; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; @@ -24,7 +24,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-13665") +@JiraKey(value = "HHH-13665") public class DirectReferenceCacheEntriesTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionUpdateTest.java index bc34d469bf..1ed4055eda 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ElementCollectionUpdateTest.java @@ -5,7 +5,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; @DomainModel(annotatedClasses = ElementCollectionUpdateTest.Person.class) @SessionFactory -@TestForIssue(jiraKey = "HHH-16297") +@JiraKey(value = "HHH-16297") public class ElementCollectionUpdateTest { private Person thePerson; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/OneToManyUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/OneToManyUpdateTest.java index 7c21f158ff..1f9f53b6ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/OneToManyUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/OneToManyUpdateTest.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16297") +@JiraKey(value = "HHH-16297") public class OneToManyUpdateTest { private static final Integer PERSON_ID = 7242000; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java index e2790aecc5..9ed2c02382 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.OrderBy; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -99,7 +99,7 @@ public class BagElementNullBasicTest { } @Test - @TestForIssue(jiraKey = "HHH-13651") + @JiraKey(value = "HHH-13651") public void addNullValueToNullableCollections(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java index e13a003340..25fc38e02d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -44,7 +44,7 @@ public class PersistentBagContainsTest { * managed and detached entities. */ @Test - @TestForIssue(jiraKey = "HHH-5409") + @JiraKey(value = "HHH-5409") public void testContains(SessionFactoryScope scope) { Order _order = scope.fromTransaction( session -> { Order order = new Order(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/JoinFetchElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/JoinFetchElementCollectionTest.java index 8fea03f933..993a8eadb3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/JoinFetchElementCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/JoinFetchElementCollectionTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.collection.basic; import java.util.HashSet; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -53,7 +53,7 @@ public class JoinFetchElementCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-8206") + @JiraKey(value = "HHH-8206") public void testJoinFetchesByPath(SessionFactoryScope scope) { // Session 2: Retrieve the user object and check if the sets have the expected values scope.inTransaction( @@ -71,7 +71,7 @@ public class JoinFetchElementCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-5465") + @JiraKey(value = "HHH-5465") public void testJoinFetchElementCollection(SessionFactoryScope scope) { // Session 2: Retrieve the user object and check if the sets have the expected values scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java index a1403748ff..57042c5155 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.collection.spi.AbstractPersistentCollection; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -87,7 +87,7 @@ public class BagDelayedOperationNoCascadeTest { } @Test - @TestForIssue(jiraKey = "HHH-5855") + @JiraKey(value = "HHH-5855") public void testSimpleAddManaged(SessionFactoryScope scope) { // Add 2 Child entities Child c1 = new Child( "Darwin" ); @@ -143,7 +143,7 @@ public class BagDelayedOperationNoCascadeTest { } @Test - @TestForIssue(jiraKey = "HHH-11209") + @JiraKey(value = "HHH-11209") public void testMergeInitializedBagAndRemerge(SessionFactoryScope scope) { Parent parent = scope.fromTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java index 399d0bdde1..a321a57641 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java @@ -27,7 +27,7 @@ import org.hibernate.collection.spi.AbstractPersistentCollection; import org.hibernate.testing.orm.junit.ImplicitListAsBagProvider; import org.hibernate.type.CollectionType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.LoggingInspections; import org.hibernate.testing.orm.junit.LoggingInspectionsScope; @@ -114,7 +114,7 @@ public class DetachedBagDelayedOperationTest { } @Test - @TestForIssue(jiraKey = "HHH-11209") + @JiraKey(value = "HHH-11209") public void testMergeDetachedCollectionWithQueuedOperations( SessionFactoryScope scope, LoggingInspectionsScope loggingScope) { @@ -220,7 +220,7 @@ public class DetachedBagDelayedOperationTest { } @Test - @TestForIssue(jiraKey = "HHH-11209") + @JiraKey(value = "HHH-11209") public void testCollectionWithQueuedOperationsOnRollback( SessionFactoryScope scope, LoggingInspectionsScope loggingScope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java index 902558401c..04be008b3f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java @@ -21,7 +21,7 @@ import org.hibernate.Hibernate; import org.hibernate.LazyInitializationException; import org.hibernate.collection.spi.PersistentCollection; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -160,7 +160,7 @@ public class ListAddTest { } @Test - @TestForIssue(jiraKey = "HHH-10375") + @JiraKey(value = "HHH-10375") public void testAddQuestionAfterSessionIsClosed(SessionFactoryScope scope) { Quizz quizz = scope.fromTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java index 5cc64de00b..2232456ba7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java @@ -30,7 +30,7 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.CollectionEntry; import org.hibernate.engine.spi.EntityEntry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -55,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class UnversionedCascadeDereferencedCollectionTest extends AbstractDereferencedCollectionTest { @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testMergeNullCollection(SessionFactoryScope scope) { UnversionedCascadeOne unversionedCascadeOne = new UnversionedCascadeOne(); scope.inTransaction( @@ -135,7 +135,7 @@ public class UnversionedCascadeDereferencedCollectionTest extends AbstractDerefe } @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testGetAndNullifyCollection(SessionFactoryScope scope) { UnversionedCascadeOne unversionedCascadeOne = new UnversionedCascadeOne(); scope.inTransaction( @@ -221,7 +221,7 @@ public class UnversionedCascadeDereferencedCollectionTest extends AbstractDerefe } @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testGetAndReplaceCollection(SessionFactoryScope scope) { UnversionedCascadeOne unversionedCascadeOne = new UnversionedCascadeOne(); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java index ee8568eb06..c34233b6e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java @@ -30,7 +30,7 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.CollectionEntry; import org.hibernate.engine.spi.EntityEntry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -54,7 +54,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class UnversionedNoCascadeDereferencedCollectionTest extends AbstractDereferencedCollectionTest { @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testMergeNullCollection(SessionFactoryScope scope) { UnversionedNoCascadeOne unversionedNoCascadeOne = new UnversionedNoCascadeOne(); scope.inTransaction( @@ -133,7 +133,7 @@ public class UnversionedNoCascadeDereferencedCollectionTest extends AbstractDere } @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testGetAndNullifyCollection(SessionFactoryScope scope) { UnversionedNoCascadeOne unversionedNoCascadeOne = new UnversionedNoCascadeOne(); scope.inTransaction( @@ -218,7 +218,7 @@ public class UnversionedNoCascadeDereferencedCollectionTest extends AbstractDere } @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testGetAndReplaceCollection(SessionFactoryScope scope) { UnversionedNoCascadeOne unversionedNoCascadeOne = new UnversionedNoCascadeOne(); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java index 6132540679..e832f67370 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java @@ -30,7 +30,7 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.CollectionEntry; import org.hibernate.engine.spi.EntityEntry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -55,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class VersionedCascadeDereferencedCollectionTest extends AbstractDereferencedCollectionTest { @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testMergeNullCollection(SessionFactoryScope scope) { VersionedCascadeOne versionedCascadeOne = new VersionedCascadeOne(); @@ -136,7 +136,7 @@ public class VersionedCascadeDereferencedCollectionTest extends AbstractDerefere } @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testGetAndNullifyCollection(SessionFactoryScope scope) { VersionedCascadeOne versionedCascadeOne = new VersionedCascadeOne(); scope.inTransaction( @@ -218,7 +218,7 @@ public class VersionedCascadeDereferencedCollectionTest extends AbstractDerefere } @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testGetAndReplaceCollection(SessionFactoryScope scope) { VersionedCascadeOne versionedCascadeOne = new VersionedCascadeOne(); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java index e6f7ec281a..4fdfd45b4a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java @@ -30,7 +30,7 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.CollectionEntry; import org.hibernate.engine.spi.EntityEntry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -55,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class VersionedNoCascadeDereferencedCollectionTest extends AbstractDereferencedCollectionTest { @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testMergeNullCollection(SessionFactoryScope scope) { VersionedNoCascadeOne versionedNoCascadeOne = new VersionedNoCascadeOne(); scope.inTransaction( @@ -135,7 +135,7 @@ public class VersionedNoCascadeDereferencedCollectionTest extends AbstractDerefe } @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testGetAndNullifyCollection(SessionFactoryScope scope) { VersionedNoCascadeOne versionedNoCascadeOne = new VersionedNoCascadeOne(); scope.inTransaction( @@ -220,7 +220,7 @@ public class VersionedNoCascadeDereferencedCollectionTest extends AbstractDerefe } @Test - @TestForIssue(jiraKey = "HHH-9777") + @JiraKey(value = "HHH-9777") public void testGetAndReplaceCollection(SessionFactoryScope scope) { VersionedNoCascadeOne versionedNoCascadeOne = new VersionedNoCascadeOne(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/IterateOverListInTheSetMethodTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/IterateOverListInTheSetMethodTest.java index 94e0298736..02317ba1d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/IterateOverListInTheSetMethodTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/IterateOverListInTheSetMethodTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.hibernate.query.spi.ScrollableResultsImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -33,7 +33,7 @@ public class IterateOverListInTheSetMethodTest { @Test - @TestForIssue(jiraKey = "HHH-16120") + @JiraKey(value = "HHH-16120") public void testHqlQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -56,7 +56,7 @@ public class IterateOverListInTheSetMethodTest { } @Test - @TestForIssue(jiraKey = "HHH-16184") + @JiraKey(value = "HHH-16184") public void testSelectParentsWithoutChildren(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -77,7 +77,7 @@ public class IterateOverListInTheSetMethodTest { } @Test - @TestForIssue(jiraKey = "HHH-16184") + @JiraKey(value = "HHH-16184") public void testScrollParentsWithoutChildren(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -108,7 +108,7 @@ public class IterateOverListInTheSetMethodTest { } @Test - @TestForIssue(jiraKey = "HHH-16184") + @JiraKey(value = "HHH-16184") public void testSelectParentsWithoutChildren2(SessionFactoryScope scope) { Integer parentId = 2; scope.inTransaction( @@ -132,7 +132,7 @@ public class IterateOverListInTheSetMethodTest { } @Test - @TestForIssue(jiraKey = "HHH-16184") + @JiraKey(value = "HHH-16184") public void testSelectParentsWithChildren(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java index 10b7c9d800..58642b665c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java @@ -19,7 +19,7 @@ import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.sql.ComparisonRestriction; import org.hibernate.sql.SimpleSelect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue; public class PersistentListTest { @Test - @TestForIssue(jiraKey = "HHH-5732") + @JiraKey(value = "HHH-5732") public void testInverseListIndex(SessionFactoryScope scope) { // make sure no one changes the mapping SessionFactoryImplementor sessionFactory = scope.getSessionFactory(); @@ -106,7 +106,7 @@ public class PersistentListTest { } @Test - @TestForIssue(jiraKey = "HHH-5732") + @JiraKey(value = "HHH-5732") public void testInverseListIndex2(SessionFactoryScope scope) { // make sure no one changes the mapping SessionFactoryImplementor sessionFactory = scope.getSessionFactory(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java index 1d4538c5ea..54789abd60 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java @@ -25,7 +25,7 @@ import jakarta.persistence.Table; import org.hibernate.collection.spi.PersistentMap; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -193,7 +193,7 @@ public class PersistentMapTest { } @Test - @TestForIssue(jiraKey = "HHH-5732") + @JiraKey(value = "HHH-5732") public void testClearMap(SessionFactoryScope scope) { scope.inSession( session -> { @@ -250,7 +250,7 @@ select } @Test - @TestForIssue(jiraKey = "HHH-5393") + @JiraKey(value = "HHH-5393") public void testMapKeyColumnInEmbeddableElement(SessionFactoryScope scope) { MultilingualString m = new MultilingualString(); scope.inTransaction( @@ -283,7 +283,7 @@ select } @Test - @TestForIssue(jiraKey = "HQLPARSER-15") + @JiraKey(value = "HQLPARSER-15") public void testJoinFetchElementCollectionWithParentSelect(SessionFactoryScope scope) { MultilingualStringParent parent = new MultilingualStringParent(); scope.inTransaction( @@ -327,7 +327,7 @@ select } @Test - @TestForIssue(jiraKey = "HHH-11038") + @JiraKey(value = "HHH-11038") public void testMapKeyColumnNonInsertableNonUpdatableBidirOneToMany(SessionFactoryScope scope) { User user = new User(); scope.inTransaction( @@ -360,7 +360,7 @@ select } @Test - @TestForIssue(jiraKey = "HHH-11038") + @JiraKey(value = "HHH-11038") public void testMapKeyColumnNonInsertableNonUpdatableUnidirOneToMany(SessionFactoryScope scope) { Integer userId = scope.fromTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java index 97aaa38044..ab4365d500 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java @@ -42,7 +42,7 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.dialect.HSQLDialect; import org.hibernate.engine.spi.CollectionEntry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SessionFactory; @@ -70,7 +70,7 @@ import static org.junit.jupiter.api.Assertions.fail; public class MultipleSessionCollectionTest { @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey(value = "HHH-9518") public void testCopyPersistentCollectionReferenceBeforeFlush(SessionFactoryScope scope) { Parent parent = new Parent(); Child c = new Child(); @@ -157,7 +157,7 @@ public class MultipleSessionCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey(value = "HHH-9518") public void testCopyUninitializedCollectionReferenceAfterGet(SessionFactoryScope scope) { Parent parent = new Parent(); Child c = new Child(); @@ -196,7 +196,7 @@ public class MultipleSessionCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey(value = "HHH-9518") public void testCopyInitializedCollectionReferenceAfterGet(SessionFactoryScope scope) { Parent parent = new Parent(); Child c = new Child(); @@ -240,7 +240,7 @@ public class MultipleSessionCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey(value = "HHH-9518") public void testCopyInitializedCollectionReferenceToNewEntityCollectionRoleAfterGet(SessionFactoryScope scope) { Parent parent = new Parent(); Child c = new Child(); @@ -290,7 +290,7 @@ public class MultipleSessionCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey(value = "HHH-9518") public void testDeleteCommitCopyToNewOwnerInNewSession(SessionFactoryScope scope) { Parent p1 = new Parent(); p1.nickNames.add( "nick" ); @@ -335,7 +335,7 @@ public class MultipleSessionCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey(value = "HHH-9518") public void testDeleteCommitCopyToNewOwnerNewCollectionRoleInNewSession(SessionFactoryScope scope) { Parent p1 = new Parent(); p1.nickNames.add( "nick" ); @@ -381,7 +381,7 @@ public class MultipleSessionCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey(value = "HHH-9518") public void testDeleteCopyToNewOwnerInNewSessionBeforeFlush(SessionFactoryScope scope) { Parent p1 = new Parent(); p1.nickNames.add( "nick" ); @@ -416,7 +416,7 @@ public class MultipleSessionCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey(value = "HHH-9518") public void testDeleteCopyToNewOwnerNewCollectionRoleInNewSessionBeforeFlush(SessionFactoryScope scope) { Parent p1 = new Parent(); p1.nickNames.add( "nick" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java index 106be4fa7a..d3ecbb368c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java @@ -41,7 +41,7 @@ import org.hibernate.engine.spi.CollectionEntry; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.Logger; import org.hibernate.testing.orm.junit.LoggingInspections; @@ -83,7 +83,7 @@ public class MultipleSessionCollectionWarningTest { private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractPersistentCollection.class ); @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey(value = "HHH-9518") public void testUnsetSessionCannotOverwriteNonConnectedSession( SessionFactoryScope scope, LoggingInspectionsScope loggingScope) { @@ -142,7 +142,7 @@ public class MultipleSessionCollectionWarningTest { } @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey(value = "HHH-9518") public void testUnsetSessionCannotOverwriteConnectedSession( SessionFactoryScope scope, LoggingInspectionsScope loggingScope) { @@ -195,7 +195,7 @@ public class MultipleSessionCollectionWarningTest { } @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey(value = "HHH-9518") public void testUnsetSessionCannotOverwriteConnectedSessionFlushed( SessionFactoryScope scope, LoggingInspectionsScope loggingScope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java index 3bd7d1880e..6f1589cd3a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -@TestForIssue(jiraKey = "HHH-13236") +@JiraKey(value = "HHH-13236") @DomainModel( annotatedClasses = { NonInsertableColumnTest.Parent.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java index be6698ed32..25213c13a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.collection.original; import org.hibernate.Hibernate; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -246,7 +246,7 @@ public class CollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-3636") + @JiraKey(value = "HHH-3636") public void testCollectionInheritance(SessionFactoryScope scope) { Zoo zoo = new Zoo(); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java index d78f13593e..4f312fca83 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java @@ -10,7 +10,7 @@ import java.util.Set; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-565") +@JiraKey(value = "HHH-565") @DomainModel( xmlMappings = { "org/hibernate/orm/test/collection/propertyref/User.hbm.xml", diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java index d2d0d18106..34d06d6e7d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-565") +@JiraKey(value = "HHH-565") @DomainModel( annotatedClasses = { ReferencedColumnNameTest.User.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java index 812edc72d1..d9aa2dc19a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java @@ -10,7 +10,7 @@ import java.util.Set; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-565") +@JiraKey(value = "HHH-565") @DomainModel( xmlMappings = { "org/hibernate/orm/test/collection/propertyref/lazy/User.hbm.xml", diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java index 8abf04c081..5c01a83fc2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; /** * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-11881") +@JiraKey( value = "HHH-11881") public class SetElementNullBasicTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java index 68272ea463..957a1ea1ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.collectionalias; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; @SessionFactory public class CollectionAliasTest { - @TestForIssue(jiraKey = "HHH-7545") + @JiraKey(value = "HHH-7545") @Test public void test(SessionFactoryScope scope) { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java index 5449c4bb67..dea9c00451 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.collectionalias; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; @SessionFactory public class ReorderedMappingsCollectionAliasTest { - @TestForIssue(jiraKey = "HHH-7545") + @JiraKey(value = "HHH-7545") @Test public void test(SessionFactoryScope scope) { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java index eaf822864d..a17570051f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java @@ -25,7 +25,7 @@ import org.hibernate.mapping.Formula; import org.hibernate.mapping.PersistentClass; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; @@ -129,7 +129,7 @@ public class ComponentTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue( jiraKey = "HHH-2366" ) + @JiraKey( value = "HHH-2366" ) public void testComponentStateChangeAndDirtiness() { inTransaction( s -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java index 6ee339c91f..ebde0e1d71 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.component.basic2; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -45,7 +45,7 @@ public class ComponentJoinsTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7849") + @JiraKey(value = "HHH-7849") public void testComponentJoinsHHH7849() { // Just checking proper query construction and syntax checking via database query parser... Session session = openSession(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java index 72f23cef1c..a202f7784d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart; import org.hibernate.metamodel.spi.EmbeddableInstantiator; import org.hibernate.type.spi.CompositeTypeImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; import org.hibernate.testing.orm.junit.SessionFactory; @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ComponentBasicProxyTest { @Test - @TestForIssue(jiraKey = "HHH-12786") + @JiraKey(value = "HHH-12786") public void testBasicProxyingWithProtectedMethodCalledInConstructor(SessionFactoryScope scope) { scope.inTransaction( (entityManager) -> { Adult adult = new Adult(); @@ -50,7 +50,7 @@ public class ComponentBasicProxyTest { } @Test - @TestForIssue(jiraKey = "HHH-12791") + @JiraKey(value = "HHH-12791") public void testOnlyOneProxyClassGenerated(DomainModelScope domainModelScope, SessionFactoryScope sfScope) { final SessionFactoryImplementor sessionFactory = sfScope.getSessionFactory(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKWithOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKWithOrphanRemovalTest.java index 4a64cb3607..09a9c99e08 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKWithOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKWithOrphanRemovalTest.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15098") +@JiraKey(value = "HHH-15098") public class OneToManyEmbeddedIdFKWithOrphanRemovalTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerRegistrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerRegistrationTest.java index c86cad2f89..595451ef74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerRegistrationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerRegistrationTest.java @@ -15,7 +15,7 @@ import java.sql.SQLFeatureNotSupportedException; import java.util.Properties; import java.util.logging.Logger; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.fail; * * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-7272" ) +@JiraKey( value = "HHH-7272" ) public class DriverManagerRegistrationTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java index cca02d5225..2f5772c9cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java @@ -26,12 +26,13 @@ import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.env.ConnectionProviderBuilder; import org.hibernate.testing.jdbc.ConnectionProviderDelegate; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.hibernate.testing.junit4.CustomParameterized; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.hibernate.testing.transaction.TransactionUtil2; import org.junit.Rule; import org.junit.Test; @@ -111,7 +112,10 @@ public class BeforeCompletionReleaseTest extends BaseEntityManagerFunctionalTest } @Test - @TestForIssue(jiraKey = {"HHH-13976", "HHH-14326"}) + @JiraKeyGroup( value = { + @JiraKey( value = "HHH-13976" ), + @JiraKey( value = "HHH-14326" ) + } ) public void testResourcesReleasedThenConnectionClosedThenCommit() throws SQLException, XAException { try (SessionImplementor s = (SessionImplementor) openSession()) { XAResource transactionSpy = mock( XAResource.class ); @@ -144,7 +148,7 @@ public class BeforeCompletionReleaseTest extends BaseEntityManagerFunctionalTest } @Test - @TestForIssue(jiraKey = {"HHH-14557"}) + @JiraKey(value = "HHH-14557") public void testResourcesReleasedThenConnectionClosedOnEachRollback() throws SQLException { try (SessionImplementor s = (SessionImplementor) openSession()) { Connection[] connections = new Connection[1]; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ThreadLocalCurrentSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ThreadLocalCurrentSessionTest.java index e771d22f92..3f7371102e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ThreadLocalCurrentSessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ThreadLocalCurrentSessionTest.java @@ -17,7 +17,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.resource.transaction.spi.TransactionStatus; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -75,7 +75,7 @@ public class ThreadLocalCurrentSessionTest extends ConnectionManagementTestCase } @Test - @TestForIssue(jiraKey = "HHH-11067") + @JiraKey(value = "HHH-11067") public void testEqualityChecking() { Session session1 = sessionFactory().getCurrentSession(); Session session2 = sessionFactory().getCurrentSession(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java index 3fa1d0e95e..9ff917e4d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java @@ -20,7 +20,7 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.ForeignKey; import org.hibernate.mapping.UniqueKey; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -47,7 +47,7 @@ public class ConstraintTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7797" ) + @JiraKey( value = "HHH-7797" ) public void testUniqueConstraints() { Column column = (Column) metadata().getEntityBinding( DataPoint.class.getName() ) .getProperty( "foo1" ).getSelectables().get( 0 ); @@ -66,7 +66,7 @@ public class ConstraintTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-1904" ) + @JiraKey( value = "HHH-1904" ) public void testConstraintNameLength() { int foundCount = 0; for ( Namespace namespace : metadata().getDatabase().getNamespaces() ) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java index cb02152b2a..58e3834c1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.OneToOne; import org.hibernate.boot.model.relational.Namespace; import org.hibernate.mapping.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.fail; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12320") +@JiraKey(value = "HHH-12320") public class ForeignKeyConstraintMapsIdTest extends BaseNonConfigCoreFunctionalTestCase { @Entity(name = "Post") public static class Post { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java index d307c8ccfd..b133f15afb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; import org.hibernate.boot.model.relational.Namespace; import org.hibernate.mapping.Column; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; import org.hibernate.testing.orm.junit.SessionFactory; @@ -64,7 +64,7 @@ import static org.junit.Assert.fail; /** * @author Christian Beikov */ -@TestForIssue( jiraKey = "HHH-11180" ) +@JiraKey( value = "HHH-11180" ) @DomainModel( annotatedClasses = { ForeignKeyConstraintTest.CreditCard.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java index eb43df4b4e..7f394ba0b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.boot.model.relational.Namespace; import org.hibernate.mapping.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -40,7 +40,7 @@ public class ForeignKeyNoConstraintTest extends BaseNonConfigCoreFunctionalTestC } @Test - @TestForIssue(jiraKey = "HHH-12975") + @JiraKey(value = "HHH-12975") public void testPrimaryKeyJoinColumnForeignKeyNoConstraint() { for ( Namespace namespace : metadata().getDatabase().getNamespaces() ) { for ( Table table : namespace.getTables() ) { @@ -52,7 +52,7 @@ public class ForeignKeyNoConstraintTest extends BaseNonConfigCoreFunctionalTestC } @Test - @TestForIssue(jiraKey = "HHH-12975") + @JiraKey(value = "HHH-12975") public void testMapsIdJoinColumnForeignKeyNoConstraint() { for ( Namespace namespace : metadata().getDatabase().getNamespaces() ) { for ( Table table : namespace.getTables() ) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java index 7cf6b5d7aa..a5cc5cf2f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java @@ -31,7 +31,7 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.internal.SimpleForeignKeyDescriptor; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.hamcrest.CollectionMatchers; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; @@ -55,7 +55,7 @@ import static org.junit.Assert.fail; * It tries to get to the bottom of the failures in * {@link ForeignKeyConstraintTest#testGet} */ -@TestForIssue( jiraKey = "HHH-11180" ) +@JiraKey( value = "HHH-11180" ) @DomainModel( annotatedClasses = { NonRootTablePolymorphicTests.Root.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeUserTypeTest.java index 0dd983a21c..a163e55248 100755 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeUserTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/CompositeUserTypeTest.java @@ -15,7 +15,7 @@ import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.SybaseASEDialect; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -213,7 +213,7 @@ public class CompositeUserTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-5946") + @JiraKey(value = "HHH-5946") public void testNotEqualOperator(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -259,7 +259,7 @@ public class CompositeUserTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-5946") + @JiraKey(value = "HHH-5946") public void testLessThanOperator(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -272,7 +272,7 @@ public class CompositeUserTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-5946") + @JiraKey(value = "HHH-5946") public void testLessOrEqualOperator(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -284,7 +284,7 @@ public class CompositeUserTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-5946") + @JiraKey(value = "HHH-5946") public void testGreaterThanOperator(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -296,7 +296,7 @@ public class CompositeUserTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-5946") + @JiraKey(value = "HHH-5946") public void testGreaterOrEqualOperator(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableCompositeUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableCompositeUserTypeTest.java index 3c3df93512..0d85adf88b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableCompositeUserTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/ImmutableCompositeUserTypeTest.java @@ -12,7 +12,7 @@ import java.util.List; import org.hibernate.annotations.CompositeType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; annotatedClasses = ImmutableCompositeUserTypeTest.Wallet.class ) @SessionFactory -@TestForIssue( jiraKey = "HHH-15554") +@JiraKey( value = "HHH-15554") public class ImmutableCompositeUserTypeTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeTest.java index f4caec7a98..35151f41fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cut/generic/GenericCompositeUserTypeTest.java @@ -1,6 +1,6 @@ package org.hibernate.orm.test.cut.generic; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -@TestForIssue(jiraKey = "HHH-17019") +@JiraKey(value = "HHH-17019") @DomainModel( annotatedClasses = { GenericCompositeUserTypeEntity.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java index 065dcb154a..67becea41a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java @@ -20,7 +20,7 @@ import org.junit.Before; import org.junit.Test; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11747") +@JiraKey(value = "HHH-11747") @RequiresDialect(DB2zDialect.class) public class DB2390DialectTestCase extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java index 4080d62155..eaf8cac36c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java @@ -16,7 +16,7 @@ import org.hibernate.type.spi.TypeConfiguration; import org.junit.Before; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import static org.junit.Assert.assertEquals; @@ -39,7 +39,7 @@ public class DB2DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-6866") + @JiraKey(value = "HHH-6866") public void testGetDefaultBinaryTypeName() { String actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, dialect ); assertEquals( @@ -50,7 +50,7 @@ public class DB2DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-6866") + @JiraKey(value = "HHH-6866") public void testGetExplicitBinaryTypeName() { // lower bound String actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, Size.length( 1) ); @@ -78,7 +78,7 @@ public class DB2DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12369") + @JiraKey(value = "HHH-12369") public void testIntegerOverflowForMaxResults() { Limit rowSelection = new Limit(); rowSelection.setFirstRow(1); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2iDialectInitTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2iDialectInitTestCase.java index c84a67291f..1a35c0a44e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2iDialectInitTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2iDialectInitTestCase.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.dialect; import org.hibernate.dialect.DB2iDialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertNotNull; @@ -10,7 +10,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Onno Goczol */ -@TestForIssue(jiraKey = "HHH-15046") +@JiraKey(value = "HHH-15046") @RequiresDialect(DB2iDialect.class) public class DB2iDialectInitTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2zDialectInitTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2zDialectInitTestCase.java index 5d6664cbb2..8a56081e56 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2zDialectInitTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2zDialectInitTestCase.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.dialect; import org.hibernate.dialect.DB2zDialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertNotNull; @@ -10,7 +10,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Onno Goczol */ -@TestForIssue(jiraKey = "HHH-15046") +@JiraKey(value = "HHH-15046") @RequiresDialect(DB2zDialect.class) public class DB2zDialectInitTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectSQLExceptionConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectSQLExceptionConversionTest.java index 1d86f78413..d9478a8bb6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectSQLExceptionConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectSQLExceptionConversionTest.java @@ -11,7 +11,7 @@ import java.sql.SQLException; import org.hibernate.dialect.Dialect; import org.hibernate.exception.spi.SQLExceptionConversionDelegate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectContext; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ public class DialectSQLExceptionConversionTest { private final Dialect dialect = DialectContext.getDialect(); @Test - @TestForIssue(jiraKey = "HHH-15592") + @JiraKey(value = "HHH-15592") public void testExceptionConversionDoesntNPE() { final SQLExceptionConversionDelegate conversionDelegate = dialect.buildSQLExceptionConversionDelegate(); Assumptions.assumeTrue( conversionDelegate != null ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/HANADialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/HANADialectTestCase.java index 5386dd4b9d..79d5a627b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/HANADialectTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/HANADialectTestCase.java @@ -18,7 +18,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.HANADialect; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.orm.junit.ServiceRegistryScope; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -81,7 +81,7 @@ public class HANADialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13239") + @JiraKey(value = "HHH-13239") public void testLockWaitTimeout() { HANADialect dialect = new HANADialect(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java index 85c250d64c..f6cecb3b3a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java @@ -10,14 +10,14 @@ import org.hibernate.dialect.pagination.AbstractLimitHandler; import org.hibernate.dialect.pagination.Oracle12LimitHandler; import org.hibernate.query.spi.Limit; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; import static org.hibernate.dialect.pagination.AbstractLimitHandler.hasFirstRow; import static org.hibernate.dialect.pagination.AbstractLimitHandler.hasMaxRows; -@TestForIssue( jiraKey = "HHH-14649") +@JiraKey( value = "HHH-14649") public class Oracle12LimitHandlerTest extends AbstractLimitHandlerTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java index ef0cfc2684..4866397852 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java @@ -28,7 +28,7 @@ import org.hibernate.exception.spi.SQLExceptionConversionDelegate; import org.hibernate.mapping.Table; import org.hibernate.mapping.UniqueKey; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.Test; @@ -49,7 +49,7 @@ import static org.junit.Assert.fail; public class PostgreSQLDialectTestCase extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-7251") + @JiraKey( value = "HHH-7251") public void testDeadlockException() { PostgreSQLDialect dialect = new PostgreSQLDialect(); SQLExceptionConversionDelegate delegate = dialect.buildSQLExceptionConversionDelegate(); @@ -60,7 +60,7 @@ public class PostgreSQLDialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7251") + @JiraKey( value = "HHH-7251") public void testTimeoutException() { PostgreSQLDialect dialect = new PostgreSQLDialect(); SQLExceptionConversionDelegate delegate = dialect.buildSQLExceptionConversionDelegate(); @@ -71,7 +71,7 @@ public class PostgreSQLDialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-13661") + @JiraKey( value = "HHH-13661") public void testQueryTimeoutException() { final PostgreSQLDialect dialect = new PostgreSQLDialect(); final SQLExceptionConversionDelegate delegate = dialect.buildSQLExceptionConversionDelegate(); @@ -85,7 +85,7 @@ public class PostgreSQLDialectTestCase extends BaseUnitTestCase { * Tests that getForUpdateString(String aliases, LockOptions lockOptions) will return a String * that will effect the SELECT ... FOR UPDATE OF tableAlias1, ..., tableAliasN */ - @TestForIssue( jiraKey = "HHH-5654" ) + @JiraKey( value = "HHH-5654" ) public void testGetForUpdateStringWithAliasesAndLockOptions() { PostgreSQLDialect dialect = new PostgreSQLDialect(); LockOptions lockOptions = new LockOptions(); @@ -110,7 +110,7 @@ public class PostgreSQLDialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8687") + @JiraKey(value = "HHH-8687") public void testMessageException() { PostgreSQLDialect dialect = new PostgreSQLDialect(); try { @@ -127,7 +127,7 @@ public class PostgreSQLDialectTestCase extends BaseUnitTestCase { * Tests that getAlterTableString() will make use of IF EXISTS syntax */ @Test - @TestForIssue( jiraKey = "HHH-11647" ) + @JiraKey( value = "HHH-11647" ) public void testGetAlterTableString() { PostgreSQLDialect dialect = new PostgreSQLDialect(); @@ -135,7 +135,7 @@ public class PostgreSQLDialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-16252" ) + @JiraKey( value = "HHH-16252" ) public void testAlterTableDropConstraintString() { PostgreSQLDialect dialect = new PostgreSQLDialect(); AlterTableUniqueDelegate alterTable = new AlterTableUniqueDelegate( dialect ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/SQLServer2012DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/SQLServer2012DialectTestCase.java index 678212f28e..af35aeea2f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/SQLServer2012DialectTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/SQLServer2012DialectTestCase.java @@ -16,7 +16,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import static org.junit.Assert.assertEquals; @@ -40,7 +40,7 @@ public class SQLServer2012DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8768") + @JiraKey(value = "HHH-8768") public void testGetLimitStringMaxRowsOnly() { final String input = "select distinct f1 as f53245 from table846752 order by f234, f67 desc"; assertEquals( @@ -50,7 +50,7 @@ public class SQLServer2012DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8768") + @JiraKey(value = "HHH-8768") public void testGetLimitStringWithOffsetAndMaxRows() { final String input = "select distinct f1 as f53245 from table846752 order by f234, f67 desc"; assertEquals( @@ -60,7 +60,7 @@ public class SQLServer2012DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8768") + @JiraKey(value = "HHH-8768") public void testGetLimitStringMaxRowsOnlyNoOrderBy() { final String input = "select f1 from table"; assertEquals( @@ -70,7 +70,7 @@ public class SQLServer2012DialectTestCase extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8768") + @JiraKey(value = "HHH-8768") public void testGetLimitStringWithOffsetAndMaxRowsNoOrderBy() { final String input = "select f1 from table"; assertEquals( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java index 4e15bfd8a2..1fae505418 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java @@ -17,7 +17,7 @@ import org.hibernate.Transaction; import org.hibernate.dialect.HANADialect; import org.hibernate.query.Query; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -47,7 +47,7 @@ public class HANAFunctionsTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12546") + @JiraKey(value = "HHH-12546") public void testLocateFunction() { try ( Session s = openSession() ) { Transaction tx = s.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java index 3f2cde7876..a993da6921 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java @@ -33,7 +33,7 @@ import java.util.Date; import org.hibernate.dialect.SybaseASEDialect; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -85,7 +85,7 @@ public class SybaseASEFunctionTest { } @Test - @TestForIssue(jiraKey = "HHH-7070") + @JiraKey(value = "HHH-7070") public void testDateaddFunction(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -96,7 +96,7 @@ public class SybaseASEFunctionTest { } @Test - @TestForIssue(jiraKey = "HHH-7070") + @JiraKey(value = "HHH-7070") public void testDatepartFunction(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -107,7 +107,7 @@ public class SybaseASEFunctionTest { } @Test - @TestForIssue(jiraKey = "HHH-7070") + @JiraKey(value = "HHH-7070") public void testDatediffFunction(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -118,7 +118,7 @@ public class SybaseASEFunctionTest { } @Test - @TestForIssue(jiraKey = "HHH-7070") + @JiraKey(value = "HHH-7070") public void testAtn2Function(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java index b7831fe60d..1a63f6f7d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java @@ -20,7 +20,7 @@ import org.hibernate.Session; import org.hibernate.dialect.HANADialect; import org.hibernate.query.Query; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -76,7 +76,7 @@ public class HANABooleanTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12132") + @JiraKey(value = "HHH-12132") public void testBooleanType() throws Exception { rebuildSessionFactory( configuration -> { configuration.setProperty( "hibernate.dialect.hana.use_legacy_boolean_type", Boolean.FALSE.toString() ); @@ -106,7 +106,7 @@ public class HANABooleanTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12132") + @JiraKey(value = "HHH-12132") public void testBooleanTypeDefaultBehavior() throws Exception { rebuildSessionFactory(); @@ -134,7 +134,7 @@ public class HANABooleanTest extends BaseCoreFunctionalTestCase { } @Test(expected = PersistenceException.class) - @TestForIssue(jiraKey = "HHH-12132") + @JiraKey(value = "HHH-12132") public void testLegacyBooleanType() throws Exception { rebuildSessionFactory( configuration -> { configuration.setProperty( "hibernate.dialect.hana.use_legacy_boolean_type", Boolean.FALSE.toString() ); @@ -160,7 +160,7 @@ public class HANABooleanTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12132") + @JiraKey(value = "HHH-12132") public void testLegacyBooleanTypeLegacyBehavior() throws Exception { rebuildSessionFactory( configuration -> { configuration.setProperty( "hibernate.dialect.hana.use_legacy_boolean_type", Boolean.TRUE.toString() ); @@ -190,7 +190,7 @@ public class HANABooleanTest extends BaseCoreFunctionalTestCase { } @Test(expected = PersistenceException.class) - @TestForIssue(jiraKey = "HHH-12132") + @JiraKey(value = "HHH-12132") public void testBooleanTypeLegacyBehavior() throws Exception { rebuildSessionFactory( configuration -> { configuration.setProperty( "hibernate.dialect.hana.use_legacy_boolean_type", Boolean.TRUE.toString() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java index 57191ed18c..2c3c6f0998 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java @@ -23,7 +23,7 @@ import org.hibernate.Session; import org.hibernate.dialect.HANADialect; import org.hibernate.query.Query; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -109,7 +109,7 @@ public class HANACalcViewTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12541") + @JiraKey(value = "HHH-12541") public void testCalcViewEntity() throws Exception { Session s = openSession(); CVEntity cvEntity = s.find( CVEntity.class, "X" ); @@ -120,7 +120,7 @@ public class HANACalcViewTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12541") + @JiraKey(value = "HHH-12541") public void testCalcViewEntityQuery() throws Exception { Session s = openSession(); Query query = s.createQuery( "select e from CVEntity e", CVEntity.class ); @@ -134,7 +134,7 @@ public class HANACalcViewTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12541") + @JiraKey(value = "HHH-12541") public void testCalcViewEntityCriteriaQuery() throws Exception { Session s = openSession(); CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder(); @@ -152,7 +152,7 @@ public class HANACalcViewTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12541") + @JiraKey(value = "HHH-12541") public void testCalcViewDTO() throws Exception { Session s = openSession(); Query query = s.createQuery( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java index 1ecf306538..297d9fce2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java @@ -20,7 +20,7 @@ import org.hibernate.Session; import org.hibernate.dialect.HANADialect; import org.hibernate.query.Query; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -64,7 +64,7 @@ public class HANADecimalTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12995") + @JiraKey(value = "HHH-12995") public void testDecimalTypeTrue() throws Exception { rebuildSessionFactory( configuration -> { configuration.setProperty( "hibernate.dialect.hana.treat_double_typed_fields_as_decimal", Boolean.TRUE.toString() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java index 345b1a6df9..936324e114 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java @@ -12,7 +12,7 @@ import org.hibernate.Transaction; import org.hibernate.dialect.HANADialect; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -86,7 +86,7 @@ public class HANASearchTest { } @Test - @TestForIssue(jiraKey = "HHH-13021") + @JiraKey(value = "HHH-13021") public void testTextType(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -118,7 +118,7 @@ public class HANASearchTest { } @Test - @TestForIssue(jiraKey = "HHH-13021") + @JiraKey(value = "HHH-13021") public void testTextTypeFalse(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -150,7 +150,7 @@ public class HANASearchTest { } @Test - @TestForIssue(jiraKey = "HHH-13021") + @JiraKey(value = "HHH-13021") public void testCharType(SessionFactoryScope scope) throws Exception { scope.inSession( session -> { @@ -187,7 +187,7 @@ public class HANASearchTest { } @Test - @TestForIssue(jiraKey = "HHH-13021") + @JiraKey(value = "HHH-13021") public void testCharTypeComplexQuery(SessionFactoryScope scope) { scope.inSession( session -> { @@ -224,7 +224,7 @@ public class HANASearchTest { } @Test - @TestForIssue(jiraKey = "HHH-13021") + @JiraKey(value = "HHH-13021") public void testFuzzy(SessionFactoryScope scope) { scope.inSession( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceInformationTest.java index 565a221c34..9bd5535a71 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceInformationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceInformationTest.java @@ -12,7 +12,7 @@ import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorMa import org.hibernate.tool.schema.extract.spi.ExtractionContext; import org.hibernate.tool.schema.extract.spi.SequenceInformation; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.transaction.TransactionUtil; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -42,7 +42,7 @@ public class MariaDBExtractSequenceInformationTest { } @Test - @TestForIssue(jiraKey = "HHH-15665") + @JiraKey(value = "HHH-15665") public void testExtractSequenceInformationForSqlServerWithCaseSensitiveCollation() { try (StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry()) { JdbcEnvironment jdbcEnvironment = ssr.getService( JdbcEnvironment.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceMetadataTest.java index 01e0a64c3e..0a2e8682f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceMetadataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceMetadataTest.java @@ -12,7 +12,7 @@ import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.testing.orm.junit.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -49,7 +49,7 @@ public class MariaDBExtractSequenceMetadataTest { } @Test - @TestForIssue(jiraKey = "HHH-13373") + @JiraKey(value = "HHH-13373") public void testHibernateLaunchedSuccessfully() { JdbcEnvironment jdbcEnvironment = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ) .getService( JdbcEnvironment.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleDialectSequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleDialectSequenceInformationTest.java index 9b85e8c96b..e74a8a0769 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleDialectSequenceInformationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleDialectSequenceInformationTest.java @@ -14,7 +14,7 @@ import java.util.Optional; import org.hibernate.dialect.OracleDialect; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.transaction.TransactionUtil; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @RequiresDialect(OracleDialect.class) -@TestForIssue(jiraKey = "HHH-13694") +@JiraKey(value = "HHH-13694") public class OracleDialectSequenceInformationTest extends BaseNonConfigCoreFunctionalTestCase { private static final String MIN_SEQUENCE_NAME = "SEQ_MIN_TEST"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java index 7a618bded4..0d1930da71 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java @@ -17,7 +17,7 @@ import org.hibernate.jpa.AvailableHints; import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInterceptor; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Before; @@ -46,7 +46,7 @@ import static org.junit.Assert.fail; * @author Vlad Mihalcea */ @RequiresDialect(OracleDialect.class) -@TestForIssue(jiraKey = "HHH-9486") +@JiraKey(value = "HHH-9486") public class OracleFollowOnLockingTest extends BaseNonConfigCoreFunctionalTestCase { @@ -280,7 +280,7 @@ public class OracleFollowOnLockingTest extends @Test - @TestForIssue(jiraKey = "HHH-16433") + @JiraKey(value = "HHH-16433") public void testPessimisticLockWithOrderByThenNoFollowOnLocking() { final Session session = openSession(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleSequenceInfoTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleSequenceInfoTest.java index 838a6fcbc9..c3d7dd3be9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleSequenceInfoTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleSequenceInfoTest.java @@ -10,7 +10,7 @@ import org.hibernate.dialect.OracleDialect; import org.hibernate.tool.schema.extract.spi.SequenceInformation; import org.hibernate.testing.orm.junit.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -18,7 +18,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @RequiresDialect(value = OracleDialect.class) public class OracleSequenceInfoTest extends SequenceInformationTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java index 6008c18d34..a5f8173777 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java @@ -23,7 +23,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -90,7 +90,7 @@ public class SQLServerDialectCollationTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7198") + @JiraKey(value = "HHH-7198") public void testMaxResultsSqlServerWithCaseSensitiveCollation() throws Exception { doInHibernate( this::sessionFactory, session -> { for ( int i = 1; i <= 20; i++ ) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java index d29502cb97..5a38fbb1e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java @@ -20,7 +20,7 @@ import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11642") +@JiraKey(value = "HHH-11642") @RequiresDialect(SQLServerDialect.class) public class SQLServerDialectPaginationTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectSequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectSequenceInformationTest.java index e63d40e9d1..f883fa116e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectSequenceInformationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectSequenceInformationTest.java @@ -25,7 +25,7 @@ import org.hibernate.tool.schema.extract.spi.ExtractionContext; import org.hibernate.tool.schema.extract.spi.SequenceInformation; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.orm.junit.DialectContext; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -42,7 +42,7 @@ import static org.junit.Assert.fail; * @author Frank Doherty */ @RequiresDialect(SQLServerDialect.class) -@TestForIssue(jiraKey = "HHH-13141") +@JiraKey(value = "HHH-13141") public class SQLServerDialectSequenceInformationTest extends BaseUnitTestCase { private final String DATABASE_NAME = "hibernate_orm_test_seq"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java index a23718824b..ee74fde7a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java @@ -22,7 +22,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProviderImpl; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.transaction.TransactionUtil; @@ -35,7 +35,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; * @author Nathan Xu */ @RequiresDialect( SQLServerDialect.class ) -@TestForIssue( jiraKey = "HHH-3326" ) +@JiraKey( value = "HHH-3326" ) public class SQLServerDialectTempTableCollationTest extends BaseCoreFunctionalTestCase { private String originalDBCollation; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java index f7c9079ab4..3b21e1d074 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java @@ -30,7 +30,7 @@ import org.hibernate.exception.LockTimeoutException; import org.hibernate.query.Query; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -54,7 +54,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8916") + @JiraKey(value = "HHH-8916") public void testPaginationWithCTEQueryNoOffset() { // This used to throw SQLServerException: Incorrect syntax near 'SEL' doInHibernate( this::sessionFactory, session -> { @@ -75,7 +75,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8916") + @JiraKey(value = "HHH-8916") public void testPaginationWithCTEQueryNoOffsetNewLine() { // This used to throw SQLServerException: Incorrect syntax near 'SEL' doInHibernate( this::sessionFactory, session -> { @@ -101,7 +101,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8916") + @JiraKey(value = "HHH-8916") public void testPaginationWithCTEQueryWithOffsetAndOrderBy() { // This used to throw a StringIndexOutOfBoundsException doInHibernate( this::sessionFactory, session -> { @@ -128,7 +128,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8916") + @JiraKey(value = "HHH-8916") public void testPaginationWithCTEQueryWithOffset() { // This used to throw a StringIndexOutOfBoundsException doInHibernate( this::sessionFactory, session -> { @@ -154,7 +154,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7369") + @JiraKey(value = "HHH-7369") public void testPaginationWithScalarQuery() throws Exception { doInHibernate( this::sessionFactory, session -> { for ( int i = 0; i < 10; i++ ) { @@ -176,7 +176,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7368") + @JiraKey(value = "HHH-7368") public void testPaginationWithTrailingSemicolon() throws Exception { doInHibernate( this::sessionFactory, session -> { session.createNativeQuery( "select id from Product2 where description like 'Kit%' order by id;" ) @@ -221,7 +221,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7370") + @JiraKey(value = "HHH-7370") public void testPaginationWithMaxOnly() { doInHibernate( this::sessionFactory, session -> { for ( int i = 30; i < 40; i++ ) { @@ -239,7 +239,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-6627") + @JiraKey(value = "HHH-6627") public void testPaginationWithAggregation() { doInHibernate( this::sessionFactory, session -> { // populating test data @@ -287,7 +287,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7752") + @JiraKey(value = "HHH-7752") public void testPaginationWithFormulaSubquery() { doInHibernate( this::sessionFactory, session -> { // populating test data @@ -315,7 +315,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7781") + @JiraKey(value = "HHH-7781") public void testPaginationWithCastOperator() { doInHibernate( this::sessionFactory, session -> { for ( int i = 40; i < 50; i++ ) { @@ -333,7 +333,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-3961") + @JiraKey(value = "HHH-3961") public void testLockNowaitSqlServer() throws Exception { Session s = openSession(); s.beginTransaction(); @@ -388,7 +388,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { @Test - @TestForIssue(jiraKey = "HHH-10879") + @JiraKey(value = "HHH-10879") public void testKeyReservedKeyword() { doInHibernate( this::sessionFactory, session -> { final KeyHolder keyHolder = new KeyHolder(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java index 5e5c3dd767..c1b8514662 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java @@ -22,7 +22,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.dialect.MariaDBDialect; import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl; import org.hibernate.internal.util.PropertiesHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @RequiresDialect(value = MariaDBDialect.class) @Jpa( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java index 8dd1f699b8..28bafc5ba3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java @@ -28,7 +28,7 @@ import org.hibernate.tool.schema.extract.spi.SequenceInformation; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.AfterAll; @@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSequences.class) public class SequenceInformationTest extends EntityManagerFactoryBasedFunctionalTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectResolverTest.java index 0f599fa9b5..db425a507a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectResolverTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/resolver/DialectResolverTest.java @@ -15,7 +15,7 @@ import org.hibernate.engine.jdbc.dialect.internal.DialectResolverSet; import org.hibernate.engine.jdbc.dialect.spi.BasicDialectResolver; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.engine.jdbc.dialect.spi.DialectResolver; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.Test; @@ -73,7 +73,7 @@ public class DialectResolverTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13225") + @JiraKey(value = "HHH-13225") public void testMinorVersion() { DialectResolverSet resolvers = new DialectResolverSet(); resolvers.addResolver( new BasicDialectResolver( "MyDatabase1", TestingDialects.MyDialect1.class ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java index ed9f49584d..6fb688c7b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java @@ -11,7 +11,7 @@ import org.hibernate.dialect.DatabaseVersion; import org.hibernate.dialect.Dialect; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.logger.LoggerInspectionExtension; import org.junit.jupiter.api.Assertions; @@ -46,7 +46,7 @@ public class CockroachDialectVersionTest { } @Test - @TestForIssue(jiraKey = "HHH-15511") + @JiraKey(value = "HHH-15511") public void testCockroachDialectVersionParsing() { String failMsg = "HHH000511: The database version version for the Cockroach Dialect could not be determined ... should have been logged"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java index 6b2df94a05..8700aab3fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java @@ -11,13 +11,13 @@ import org.hibernate.dialect.Dialect; import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11470") +@JiraKey(value = "HHH-11470") public class DB2iSequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java index 95925cd3be..d16c8817cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java @@ -11,12 +11,12 @@ import org.hibernate.dialect.Dialect; import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorDB2DatabaseImpl; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11470") +@JiraKey(value = "HHH-11470") public class DB2zSequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/distinct/SelectDistinctHqlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/distinct/SelectDistinctHqlTest.java index 468ec59894..f093b5ff56 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/distinct/SelectDistinctHqlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/distinct/SelectDistinctHqlTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.boot.SessionFactoryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInterceptor; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-10965") +@JiraKey(value = "HHH-10965") public class SelectDistinctHqlTest extends BaseNonConfigCoreFunctionalTestCase { private static final String DISTINCT_NAMED_QUERY = "distinct"; @@ -96,7 +96,7 @@ public class SelectDistinctHqlTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13780") + @JiraKey(value = "HHH-13780") public void testNamedQueryDistinctPassThroughTrueWhenNotSpecified() { doInHibernate( this::sessionFactory, session -> { sqlStatementInterceptor.getSqlQueries().clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/DynamicMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/DynamicMapTest.java index 7a4e0791fe..274763fabf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/DynamicMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/DynamicMapTest.java @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -20,7 +20,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; -@TestForIssue(jiraKey = "HHH-12539") +@JiraKey(value = "HHH-12539") @DomainModel( xmlMappings = "org/hibernate/orm/test/dynamicmap/Test.hbm.xml" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java index 2a3148916b..cf08546c8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -48,7 +48,7 @@ public class CompositeIdAssociationsWithEmbeddedCompositeIdTest { } @Test - @TestForIssue(jiraKey = "HHH-13114") + @JiraKey(value = "HHH-13114") public void testQueries(SessionFactoryScope scope) { Parent parent1 = new Parent( "Jane", 0 ); Parent parent2 = new Parent( "Jim", 1 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java index 8ab23a56ac..f3ece68459 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.Hibernate; import org.hibernate.proxy.HibernateProxy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -70,7 +70,7 @@ public class EmbeddedCompositeIdTest { } @Test - @TestForIssue(jiraKey = "HHH-799") + @JiraKey(value = "HHH-799") public void testMerging(SessionFactoryScope scope) { Course course = new Course( "EN-101", "BA", "preparatory english" ); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedIdWithMapsIdTargetingDerivedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedIdWithMapsIdTargetingDerivedEntityTest.java index 46774f0527..31535389e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedIdWithMapsIdTargetingDerivedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedIdWithMapsIdTargetingDerivedEntityTest.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ImplicitListAsBagProvider; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -61,7 +61,7 @@ import static org.hibernate.orm.test.util.SchemaUtil.getColumnNames; * at java.base/java.lang.reflect.Method.invoke(Method.java:566) * at org.hibernate.testing.junit4.TestClassMetadata.performCallbackInvocation(TestClassMetadata.java:205) */ -@TestForIssue(jiraKey = "HHH-13295") +@JiraKey(value = "HHH-13295") @ServiceRegistry( settingProviders = @SettingProvider( settingName = DEFAULT_LIST_SEMANTICS, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EagerOneToOneMappedByInDoubleEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EagerOneToOneMappedByInDoubleEmbeddedTest.java index 10dbf47427..a77c669314 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EagerOneToOneMappedByInDoubleEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EagerOneToOneMappedByInDoubleEmbeddedTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.embeddable; import java.io.Serializable; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -24,7 +24,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-15986") +@JiraKey( value = "HHH-15986") public class EagerOneToOneMappedByInDoubleEmbeddedTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionUpdateTest.java index e999ed76cc..25889daa38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsElementCollectionUpdateTest.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; @DomainModel(annotatedClasses = EmbeddableAsElementCollectionUpdateTest.Person.class) @SessionFactory -@TestForIssue(jiraKey = "HHH-16297") +@JiraKey(value = "HHH-16297") public class EmbeddableAsElementCollectionUpdateTest { private Person thePerson; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableQuerySelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableQuerySelectTest.java index 5acaf8000e..0eecbbf3f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableQuerySelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableQuerySelectTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.embeddable; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -36,7 +36,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16366") +@JiraKey(value = "HHH-16366") public class EmbeddableQuerySelectTest { private static final Integer ORGANISATION_ID = 1; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithNotOprionalAttributeAsElementCollectionUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithNotOprionalAttributeAsElementCollectionUpdateTest.java index cb5c7661b8..5a575e8462 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithNotOprionalAttributeAsElementCollectionUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithNotOprionalAttributeAsElementCollectionUpdateTest.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; @DomainModel(annotatedClasses = EmbeddableWithNotOprionalAttributeAsElementCollectionUpdateTest.Person.class) @SessionFactory -@TestForIssue(jiraKey = "HHH-16297") +@JiraKey(value = "HHH-16297") public class EmbeddableWithNotOprionalAttributeAsElementCollectionUpdateTest { private Person thePerson; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java index 5204057f7c..03b6da38ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java @@ -17,7 +17,7 @@ import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.EntityEntryExtraState; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -41,7 +41,7 @@ public class ExtraStateTest { private SessionImplementor sessionRef; @Test - @TestForIssue(jiraKey = "HHH-9451") + @JiraKey(value = "HHH-9451") public void shouldMaintainExtraStateWhenUsingIdentityIdGenerationStrategy(SessionFactoryScope scope) { scope.inSession( (nonTransactedSession) -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java index d19aee6153..2f7f67fb83 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java @@ -26,7 +26,7 @@ import org.hibernate.graph.GraphParser; import org.hibernate.graph.GraphSemantic; import org.hibernate.graph.RootGraph; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -52,7 +52,7 @@ import static org.hibernate.testing.hamcrest.InitializationCheckMatcher.isNotIni public class EntityGraphFunctionalTests { @Test - @TestForIssue( jiraKey = "HHH-13175") + @JiraKey( value = "HHH-13175") void testSubsequentSelectFromFind(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java index 26aeac68e1..d2e0eb0a49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java @@ -11,7 +11,7 @@ import java.util.Set; import org.hibernate.graph.GraphSemantic; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.fail; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-12476" ) +@JiraKey( value = "HHH-12476" ) public class EntityGraphNativeQueryTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java index 1aeec700d3..31bae23fb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java @@ -28,7 +28,7 @@ import jakarta.persistence.metamodel.Attribute; import org.hibernate.graph.GraphSemantic; import org.hibernate.metamodel.model.domain.EntityDomainType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -54,7 +54,7 @@ import static org.hibernate.testing.hamcrest.InitializationCheckMatcher.isInitia public class EntityGraphUsingFetchGraphTest { @Test - @TestForIssue( jiraKey = "HHH-9392") + @JiraKey( value = "HHH-9392") void fetchSubGraphFromSubgraph(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -102,7 +102,7 @@ public class EntityGraphUsingFetchGraphTest { } @Test - @TestForIssue( jiraKey = "HHH-9392") + @JiraKey( value = "HHH-9392") void fetchAttributeNodeByStringFromSubgraph(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -152,7 +152,7 @@ public class EntityGraphUsingFetchGraphTest { } @Test - @TestForIssue( jiraKey = "HHH-13233") + @JiraKey( value = "HHH-13233") @SuppressWarnings({ "unchecked", "rawtypes" }) void fetchAttributeNodeByAttributeFromSubgraph(SessionFactoryScope scope) { scope.inTransaction( @@ -213,7 +213,7 @@ public class EntityGraphUsingFetchGraphTest { } @Test - @TestForIssue( jiraKey = "HHH-9392") + @JiraKey( value = "HHH-9392") void fetchUsingHql(SessionFactoryScope scope) { // This test is here only for comparison with results from fetchAttributeNodeFromSubgraph. // At the time this was written, the generated SQL from the HQL is the same as that generated with the diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java index 4bf84c5796..d38a3def31 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java @@ -21,7 +21,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.graph.GraphSemantic; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -45,7 +45,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class EntityGraphWithFetchAnnotationTest { @Test - @TestForIssue(jiraKey = "HHH-10485") + @JiraKey(value = "HHH-10485") void testWithoutEntityGraph(SessionFactoryScope scope) { SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); statementInspector.clear(); @@ -71,7 +71,7 @@ public class EntityGraphWithFetchAnnotationTest { } @Test - @TestForIssue(jiraKey = "HHH-10485") + @JiraKey(value = "HHH-10485") void testWithEntityGraph(SessionFactoryScope scope) { SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); statementInspector.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java index 097677d039..b4a0bfd344 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java @@ -8,7 +8,7 @@ import jakarta.persistence.Table; import org.hibernate.graph.RootGraph; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -54,7 +54,7 @@ public class FetchWithRootGraphTest { } @Test - @TestForIssue(jiraKey = "HHH-13312") + @JiraKey(value = "HHH-13312") void hhh13312Test(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IdClassEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IdClassEntityGraphTest.java index abbd1ebc35..fad2319da0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IdClassEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IdClassEntityGraphTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.CascadeType; import org.hibernate.Hibernate; import org.hibernate.jpa.SpecHints; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -47,7 +47,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; IdClassEntityGraphTest.Child.class } ) -@TestForIssue( jiraKey = "HHH-15607") +@JiraKey( value = "HHH-15607") public class IdClassEntityGraphTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IncludeAllOrNoneGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IncludeAllOrNoneGraphTest.java index 89a363b1ec..dc924764fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IncludeAllOrNoneGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IncludeAllOrNoneGraphTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.hibernate.Hibernate; import org.hibernate.graph.GraphSemantic; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16175") +@JiraKey(value = "HHH-16175") public class IncludeAllOrNoneGraphTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java index 68ff40c116..0e433181ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java @@ -24,7 +24,7 @@ import jakarta.persistence.Subgraph; import org.hibernate.graph.GraphSemantic; import org.hibernate.internal.util.MutableLong; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -47,7 +47,7 @@ import static org.hibernate.testing.hamcrest.InitializationCheckMatcher.isInitia public class InheritedEntityGraphTest { @Test - @TestForIssue(jiraKey = "HHH-10261") + @JiraKey(value = "HHH-10261") void singleAttributeNodeInheritanceTest(SessionFactoryScope scope) { MutableLong fooId = new MutableLong(); @@ -84,7 +84,7 @@ public class InheritedEntityGraphTest { } @Test - @TestForIssue(jiraKey = "HHH-10261") + @JiraKey(value = "HHH-10261") void collectionAttributeNodeInheritanceTest(SessionFactoryScope scope) { MutableLong fooId = new MutableLong(); @@ -122,7 +122,7 @@ public class InheritedEntityGraphTest { @Test - @TestForIssue(jiraKey = "HHH-10261") + @JiraKey(value = "HHH-10261") void singleAttributeSubgraphInheritanceTest(SessionFactoryScope scope) { MutableLong foo2Id = new MutableLong(); @@ -165,7 +165,7 @@ public class InheritedEntityGraphTest { } @Test - @TestForIssue(jiraKey = "HHH-10261") + @JiraKey(value = "HHH-10261") void collectionAttributeSubgraphInheritanceTest(SessionFactoryScope scope) { MutableLong foo2Id = new MutableLong(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java index 25e579a4d9..4f63f8fe1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.TypedQuery; import org.hibernate.graph.GraphSemantic; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -44,7 +44,7 @@ import static org.hibernate.testing.hamcrest.InitializationCheckMatcher.isNotIni } ) @SessionFactory(useCollectingStatementInspector = true) -@TestForIssue(jiraKey = "HHH-14097") +@JiraKey(value = "HHH-14097") public class LoadAndFetchGraphTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadEntityWithIdClassEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadEntityWithIdClassEntityGraphTest.java index 1a11563205..b39530e9ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadEntityWithIdClassEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadEntityWithIdClassEntityGraphTest.java @@ -7,7 +7,7 @@ import java.util.Objects; import org.hibernate.Hibernate; import org.hibernate.jpa.SpecHints; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-15674") +@JiraKey( value = "HHH-15674") public class LoadEntityWithIdClassEntityGraphTest { private static final Long ORDER_ID = 1l; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java index 7ac5b08dea..2987ed69c7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java @@ -47,7 +47,7 @@ import org.hibernate.sql.results.graph.entity.EntityResult; import org.hibernate.sql.results.graph.entity.internal.EntityDelayedFetchImpl; import org.hibernate.sql.results.graph.entity.internal.EntityFetchJoinedImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -89,7 +89,7 @@ import static org.hibernate.testing.hamcrest.CollectionMatchers.isEmpty; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-13756" ) +@JiraKey( value = "HHH-13756" ) public class CriteriaEntityGraphTest implements SessionFactoryScopeAware { private SessionFactoryScope scope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java index d1f91fa5ea..1ff4109891 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java @@ -42,7 +42,7 @@ import org.hibernate.sql.results.graph.entity.EntityResult; import org.hibernate.sql.results.graph.entity.internal.EntityDelayedFetchImpl; import org.hibernate.sql.results.graph.entity.internal.EntityFetchJoinedImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -84,7 +84,7 @@ import static org.hibernate.testing.hamcrest.CollectionMatchers.isEmpty; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-13756" ) +@JiraKey( value = "HHH-13756" ) public class EntityGraphLoadPlanBuilderTest implements SessionFactoryScopeAware { private SessionFactoryScope scope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java index 3650402880..54e2ec469f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java @@ -47,7 +47,7 @@ import org.hibernate.sql.results.graph.entity.EntityResult; import org.hibernate.sql.results.graph.entity.internal.EntityDelayedFetchImpl; import org.hibernate.sql.results.graph.entity.internal.EntityFetchJoinedImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -87,7 +87,7 @@ import static org.hibernate.testing.hamcrest.CollectionMatchers.isEmpty; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-13756" ) +@JiraKey( value = "HHH-13756" ) public class HqlEntityGraphTest implements SessionFactoryScopeAware { private SessionFactoryScope scope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java index 758b270e9a..ab2e68268c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java @@ -23,7 +23,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.FixMethodOrder; import org.junit.Test; @@ -58,7 +58,7 @@ public class LoadGraphFindByIdTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10842") + @JiraKey(value = "HHH-10842") public void findByPrimaryKeyWithId() { doInJPA( this::entityManagerFactory, em -> { User result = em.find( User.class, 1L, createProperties( em ) ); @@ -67,7 +67,7 @@ public class LoadGraphFindByIdTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10842") + @JiraKey(value = "HHH-10842") public void findByPrimaryKeyWithQuery() { doInJPA( this::entityManagerFactory, em -> { User result = createTypedQuery( em ).getSingleResult(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/LoadFetchGraphWithEagerSelfReferencingEagerToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/LoadFetchGraphWithEagerSelfReferencingEagerToOneTest.java index ec071bc899..545c348bc8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/LoadFetchGraphWithEagerSelfReferencingEagerToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/LoadFetchGraphWithEagerSelfReferencingEagerToOneTest.java @@ -12,7 +12,7 @@ import java.util.List; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.SpecHints; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; annotatedClasses = LoadFetchGraphWithEagerSelfReferencingEagerToOneTest.Sample.class, properties = @Setting(name = AvailableSettings.MAX_FETCH_DEPTH, value = "") ) -@TestForIssue(jiraKey = "HHH-15391") +@JiraKey(value = "HHH-15391") public class LoadFetchGraphWithEagerSelfReferencingEagerToOneTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java index 46facf126b..ce9ce178be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java @@ -5,7 +5,7 @@ import jakarta.persistence.AttributeNode; import jakarta.persistence.EntityGraph; import jakarta.persistence.EntityManager; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -22,7 +22,7 @@ import static org.hibernate.testing.hamcrest.CollectionMatchers.hasSize; public class SubgraphOrmNamedEntityGraphTest { @Test - @TestForIssue( jiraKey = "HHH-10633" ) + @JiraKey( value = "HHH-10633" ) void testSubgraphsAreLoadedFromOrmXml(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/OrmXmlParseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/OrmXmlParseTest.java index fc23e25d51..37fabe3ad9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/OrmXmlParseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/OrmXmlParseTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.entitygraph.xml; import org.hibernate.cfg.Configuration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test; public class OrmXmlParseTest { @Test - @TestForIssue(jiraKey = "HHH-9247") + @JiraKey(value = "HHH-9247") void parseNamedAttributeNode() { final Configuration cfg = new Configuration(); cfg.addURL( getClass().getResource( "orm.xml" ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java index d88c0771bd..4269fc34ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.entitymode.map.compositeId; import java.util.HashMap; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; xmlMappings = "org/hibernate/orm/test/entitymode/map/compositeId/CompId.hbm.xml" ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15201") +@JiraKey(value = "HHH-15201") public class CompositeIdTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java index 7c64c20452..b10119984e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Table; import org.hibernate.DuplicateMappingException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -22,7 +22,7 @@ import static org.junit.Assert.fail; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-13060" ) +@JiraKey( value = "HHH-13060" ) public class DuplicateEntityNameTest extends BaseCoreFunctionalTestCase { protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java index a58bfbe7be..70c5f40fc2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.PrePersist; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -38,7 +38,7 @@ public class EmbeddableCallbackTest { } @Test - @TestForIssue(jiraKey = "HHH-12326") + @JiraKey(value = "HHH-12326") public void test(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { Employee employee = new Employee(); @@ -57,7 +57,7 @@ public class EmbeddableCallbackTest { } @Test - @TestForIssue(jiraKey = "HHH-13110") + @JiraKey(value = "HHH-13110") public void testNullEmbeddable(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { Employee employee = new Employee(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java index bf2a0225c0..827f0ca216 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java @@ -21,7 +21,7 @@ import org.hibernate.event.spi.PreInsertEventListener; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -33,7 +33,7 @@ import static org.junit.Assert.fail; * @author Chris Cranford */ @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) -@TestForIssue(jiraKey = "HHH-11721") +@JiraKey(value = "HHH-11721") public class PreInsertEventListenerVetoBidirectionalTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java index 7c38c9b582..520089636e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java @@ -20,7 +20,7 @@ import org.hibernate.event.spi.PreInsertEventListener; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -31,7 +31,7 @@ import static org.junit.Assert.fail; * @author Chris Cranford */ @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) -@TestForIssue( jiraKey = "HHH-11721" ) +@JiraKey( value = "HHH-11721" ) public class PreInsertEventListenerVetoUnidirectionalTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/BadMergeHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/BadMergeHandlingTest.java index ee7fe7c4ff..fb6e81bf80 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/BadMergeHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/BadMergeHandlingTest.java @@ -13,7 +13,7 @@ import org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl; import org.hibernate.cfg.Configuration; import org.hibernate.metamodel.CollectionClassification; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-7928" ) +@JiraKey( value = "HHH-7928" ) public class BadMergeHandlingTest extends BaseCoreFunctionalTestCase { @Override protected void configure(Configuration configuration) { @@ -38,7 +38,7 @@ public class BadMergeHandlingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7928" ) + @JiraKey( value = "HHH-7928" ) public void testMergeAndHold() { Session s = openSession(); s.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java index 49ef8c09ba..3b429af046 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java @@ -17,7 +17,7 @@ import org.hibernate.event.spi.PreCollectionRemoveEvent; import org.hibernate.event.spi.PreCollectionUpdateEvent; import org.hibernate.orm.test.event.collection.Entity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertSame; * * @author Erik-Berndt Scheper */ -@TestForIssue( jiraKey = "HHH-6361" ) +@JiraKey( value = "HHH-6361" ) public class DetachedMultipleCollectionChangeTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java index 4efa825bca..8e90753ebd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java @@ -22,7 +22,7 @@ import org.hibernate.event.spi.PreCollectionRemoveEvent; import org.hibernate.event.spi.PreCollectionUpdateEvent; import org.hibernate.metamodel.CollectionClassification; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-7928" ) +@JiraKey( value = "HHH-7928" ) public class MergeCollectionEventTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java index 1d5b79e8e1..ffc9cf09e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java @@ -23,7 +23,7 @@ import org.hibernate.event.spi.PreInsertEvent; import org.hibernate.event.spi.PreInsertEventListener; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; /** * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-9979") +@JiraKey( value = "HHH-9979") public class MergeListPreAndPostPersistTest extends BaseCoreFunctionalTestCase { protected Class[] getAnnotatedClasses() { @@ -43,7 +43,7 @@ public class MergeListPreAndPostPersistTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9979") + @JiraKey( value = "HHH-9979") public void testAllPropertiesCopied() { final Order order = new Order(); order.id = 1L; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java index d50e02e174..83eddfc0d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java @@ -30,7 +30,7 @@ import org.hibernate.testing.DialectCheck; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals; /** * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-9979") +@JiraKey( value = "HHH-9979") @RequiresDialectFeature( value = DialectChecks.SupportsIdentityColumns.class, jiraKey = "HHH-9918") public class MergeListPreAndPostPersistWithIdentityTest extends BaseCoreFunctionalTestCase { @@ -50,7 +50,7 @@ public class MergeListPreAndPostPersistWithIdentityTest extends BaseCoreFunction } @Test - @TestForIssue( jiraKey = "HHH-9979") + @JiraKey( value = "HHH-9979") @FailureExpected( jiraKey = "HHH-9979") public void testAllPropertiesCopied() { final Order order = new Order(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/CallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/CallbackTest.java index 41c79d40b6..12c1dc97a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/CallbackTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/CallbackTest.java @@ -22,8 +22,9 @@ import org.hibernate.event.spi.EventType; import org.hibernate.integrator.spi.Integrator; import org.hibernate.service.spi.SessionFactoryServiceRegistry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -35,7 +36,11 @@ import static org.junit.Assert.assertEquals; * * @author Steve Ebersole */ -@TestForIssue(jiraKey = {"HHH-2884", "HHH-10674", "HHH-14541"}) +@JiraKeyGroup( value = { + @JiraKey( value = "HHH-2884" ), + @JiraKey( value = "HHH-10674" ), + @JiraKey( value = "HHH-14541" ) +} ) public class CallbackTest extends BaseCoreFunctionalTestCase { private TestingObserver observer = new TestingObserver(); private TestingListener listener = new TestingListener(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java index d7fce33e10..150879b597 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java @@ -18,7 +18,7 @@ import org.hibernate.event.spi.EventEngineContributions; import org.hibernate.event.spi.EventEngineContributor; import org.hibernate.event.spi.EventType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -29,7 +29,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-13890") +@JiraKey( value = "HHH-13890") public class EventEngineContributionsTests extends BaseNonConfigCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java index 5feb8fa2fd..53fe302ab9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java @@ -25,9 +25,8 @@ import org.hibernate.integrator.spi.Integrator; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java index 1791eecc2a..c07e30a23b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java @@ -28,9 +28,8 @@ import org.hibernate.integrator.spi.Integrator; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java index 3ee1d22b62..49e1bd0ed9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.eviction; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -26,7 +26,7 @@ public class EvictionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7912" ) + @JiraKey( value = "HHH-7912" ) public void testNormalUsage() { Session session = openSession(); session.beginTransaction(); @@ -51,7 +51,7 @@ public class EvictionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7912" ) + @JiraKey( value = "HHH-7912" ) public void testEvictingNull() { Session session = openSession(); session.beginTransaction(); @@ -66,7 +66,7 @@ public class EvictionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7912" ) + @JiraKey( value = "HHH-7912" ) public void testEvictingTransientEntity() { Session session = openSession(); session.beginTransaction(); @@ -76,7 +76,7 @@ public class EvictionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7912" ) + @JiraKey( value = "HHH-7912" ) public void testEvictingDetachedEntity() { Session session = openSession(); session.beginTransaction(); @@ -105,7 +105,7 @@ public class EvictionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7912" ) + @JiraKey( value = "HHH-7912" ) public void testEvictingNonEntity() { Session session = openSession(); session.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java index ef4832f961..88c11a78cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java @@ -20,7 +20,7 @@ import org.hibernate.exception.ConstraintViolationException; import org.hibernate.exception.SQLGrammarException; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -109,7 +109,7 @@ public class SQLExceptionConversionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7357") + @JiraKey(value = "HHH-7357") public void testNotNullConstraint() { final Session session = openSession(); session.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java index 2f94ace61f..62cf3c088b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java @@ -19,10 +19,10 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; -@TestForIssue(jiraKey = "HHH-12666") +@JiraKey(value = "HHH-12666") @RequiresDialect(H2Dialect.class) public class ConstraintViolationExceptionHandlingTest extends BaseExceptionHandlingTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java index 9fce733352..c5d3a5ddf6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java @@ -20,10 +20,10 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; -@TestForIssue(jiraKey = "HHH-12666") +@JiraKey(value = "HHH-12666") @RequiresDialect(H2Dialect.class) public class IdentifierGenerationExceptionHandlingTest extends BaseExceptionHandlingTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java index d7ab1e14f9..291d1ee07a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java @@ -20,7 +20,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@TestForIssue( jiraKey = "HHH-13737") +@JiraKey( value = "HHH-13737") @RequiresDialect(H2Dialect.class) public class NonActiveTransactionSessionFindJdbcExceptionHandlingTest extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java index ade56e7777..587ff4362a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil2; import org.junit.Before; import org.junit.Test; @@ -49,7 +49,7 @@ public class QueryExceptionHandlingTest extends BaseExceptionHandlingTest { } @Test - @TestForIssue(jiraKey = "HHH-12666") + @JiraKey(value = "HHH-12666") public void testInvalidQuery() { try { TransactionUtil2.inSession( sessionFactory(), s -> { @@ -76,7 +76,7 @@ public class QueryExceptionHandlingTest extends BaseExceptionHandlingTest { } @Test - @TestForIssue(jiraKey = "HHH-13300") + @JiraKey(value = "HHH-13300") public void testGetSingleResultWithMultipleResults() { try { TransactionUtil2.inSession( sessionFactory(), s -> { @@ -90,7 +90,7 @@ public class QueryExceptionHandlingTest extends BaseExceptionHandlingTest { } @Test - @TestForIssue(jiraKey = "HHH-13300") + @JiraKey(value = "HHH-13300") public void testGetSingleResultWithNoResults() { try { TransactionUtil2.inSession( sessionFactory(), s -> { @@ -104,7 +104,7 @@ public class QueryExceptionHandlingTest extends BaseExceptionHandlingTest { } @Test - @TestForIssue(jiraKey = "HHH-13300") + @JiraKey(value = "HHH-13300") public void testExecuteUpdateWithConstraintViolation() { try { TransactionUtil2.inTransaction( sessionFactory(), s -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectMergeTest.java index 1f173b5ceb..ee3708740e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectMergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectMergeTest.java @@ -10,7 +10,7 @@ import java.sql.Timestamp; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; /** * @author Jan Schatteman */ -@TestForIssue( jiraKey = "HHH-1661") +@JiraKey( value = "HHH-1661") @RequiresDialect( H2Dialect.class ) public class StaleObjectMergeTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleVersionedObjectMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleVersionedObjectMergeTest.java index 26d0f3f7a6..30ab480dcb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleVersionedObjectMergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleVersionedObjectMergeTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import jakarta.persistence.OptimisticLockException; import jakarta.persistence.Version; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; /** * @author Jan Schatteman */ -@TestForIssue( jiraKey = "HHH-1661") +@JiraKey( value = "HHH-1661") @RequiresDialect( H2Dialect.class ) public class StaleVersionedObjectMergeTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java index b03d199187..cc68dc5d8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java @@ -15,13 +15,13 @@ import org.hibernate.Transaction; import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -@TestForIssue(jiraKey = "HHH-12666") +@JiraKey(value = "HHH-12666") @RequiresDialect(H2Dialect.class) public class TransactionExceptionHandlingTest extends BaseExceptionHandlingTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java index 20ff927458..152d4bba15 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java @@ -15,12 +15,12 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.fail; -@TestForIssue(jiraKey = "HHH-12666") +@JiraKey(value = "HHH-12666") @RequiresDialect(H2Dialect.class) public class TransientObjectExceptionHandlingTest extends BaseExceptionHandlingTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/ElementCollectionWithSubselectFetchModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/ElementCollectionWithSubselectFetchModeTest.java index 23fb63f427..32b1203168 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/ElementCollectionWithSubselectFetchModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/ElementCollectionWithSubselectFetchModeTest.java @@ -14,7 +14,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.query.spi.QueryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; } ) @SessionFactory(useCollectingStatementInspector = true) -@TestForIssue(jiraKey = "HHH-15640") +@JiraKey(value = "HHH-15640") public class ElementCollectionWithSubselectFetchModeTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectAndOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectAndOrderByTest.java index 7bbdad28d0..f00774ce15 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectAndOrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectAndOrderByTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -32,7 +32,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16202") +@JiraKey(value = "HHH-16202") public class FetchModeSubselectAndOrderByTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectTest.java index 632a5e335b..105a5cd091 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectTest.java @@ -13,7 +13,7 @@ import java.util.Set; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -43,7 +43,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15453") +@JiraKey(value = "HHH-15453") public class FetchModeSubselectTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java index 2dfb209746..22b199701f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java @@ -22,7 +22,7 @@ import org.hibernate.graph.spi.RootGraphImplementor; import org.hibernate.query.spi.QueryImplementor; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -34,7 +34,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-13152" ) +@JiraKey( value = "HHH-13152" ) public class RuntimeFetchFromManagedTest extends BaseNonConfigCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java index 56d636a486..703b443477 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java @@ -23,7 +23,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.metamodel.CollectionClassification; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Assert; import org.junit.Test; @@ -33,7 +33,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -@TestForIssue( jiraKey = "HHH-12297") +@JiraKey( value = "HHH-12297") public class CollectionLoadedInTwoPhaseLoadTest extends BaseCoreFunctionalTestCase { // NOTE diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java index e9461837ed..15d8a629fc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java @@ -20,7 +20,7 @@ import org.hibernate.annotations.FetchProfile; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -@TestForIssue( jiraKey = "HHH-12297") +@JiraKey( value = "HHH-12297") public class EntityLoadedInTwoPhaseLoadTest extends BaseCoreFunctionalTestCase { static final String FETCH_PROFILE_NAME = "fp1"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java index 09c68aacde..74b73a188f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java @@ -27,7 +27,7 @@ import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.ParamDef; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -48,7 +48,7 @@ import static org.junit.Assert.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-10991") +@JiraKey(value = "HHH-10991") public class CriteriaQueryWithAppliedFilterTest extends AbstractStatefulStatelessFilterTest { private final static Identifier STUDENT_ID = new Identifier( 2, new Identifier2( 4, 5L ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java index 16dacf1f9b..e779fe4925 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java @@ -30,7 +30,7 @@ import org.hibernate.query.Query; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.transform.ResultTransformer; import org.junit.After; @@ -247,7 +247,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-14567") + @JiraKey(value = "HHH-14567") public void testHqlFiltersAppliedAfterQueryCreation() { inTransaction( session -> { Query query = session.createQuery( @@ -611,7 +611,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-5932") + @JiraKey(value = "HHH-5932") public void testHqlQueryWithColons() { inSession( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java index 6aaea042c1..3f7fd308bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java @@ -19,7 +19,7 @@ import org.hibernate.annotations.FilterDefs; import org.hibernate.annotations.Filters; import org.hibernate.annotations.ParamDef; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; @@ -47,7 +47,7 @@ import static org.junit.Assert.assertThat; FilterDotNameTest.PurchaseItem.class } ) -@TestForIssue(jiraKey = "HHH-11250") +@JiraKey(value = "HHH-11250") public class FilterDotNameTest extends AbstractStatefulStatelessFilterTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java index 02f79350d8..372b035c1f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java @@ -19,7 +19,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.stat.SessionStatistics; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -56,7 +56,7 @@ import static org.junit.Assert.assertThat; @Setting( name = AvailableSettings.GENERATE_STATISTICS, value = "true" ) } ) -@TestForIssue(jiraKey = "HHH-7119") +@JiraKey(value = "HHH-7119") public class FilterWitSubSelectFetchModeTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java index b0e23992f1..18c880c3b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java @@ -22,7 +22,7 @@ import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; import org.hibernate.internal.util.collections.CollectionHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -69,7 +69,7 @@ public class ManyToManyWithDynamicFilterTest { } @Test - @TestForIssue(jiraKey = "HHH-11410") + @JiraKey(value = "HHH-11410") void testManyToManyCollectionWithActiveFilterOnJoin(SessionFactoryScope scope) { scope.inTransaction( session -> { session.enableFilter( "activeUserFilter" ); @@ -82,7 +82,7 @@ public class ManyToManyWithDynamicFilterTest { } @Test - @TestForIssue(jiraKey = "HHH-11410") + @JiraKey(value = "HHH-11410") void testManyToManyCollectionWithNoFilterOnJoin(SessionFactoryScope scope) { scope.inTransaction( session -> { final User user = session.get( User.class, 1 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/FilterWithDifferentConditionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/FilterWithDifferentConditionsTest.java index 3b7816139a..9a23d0ab45 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/FilterWithDifferentConditionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/FilterWithDifferentConditionsTest.java @@ -14,7 +14,7 @@ import java.util.Map; import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.FilterJoinTable; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -37,7 +37,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory(exportSchema = true) -@TestForIssue(jiraKey = "HHH-13485") +@JiraKey(value = "HHH-13485") public class FilterWithDifferentConditionsTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/FilterInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/FilterInheritanceTest.java index dfc4cd1bd9..210136e823 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/FilterInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/FilterInheritanceTest.java @@ -15,7 +15,7 @@ import java.util.function.Consumer; import org.hibernate.SharedSessionContract; import org.hibernate.orm.test.filter.AbstractStatefulStatelessFilterTest; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; @@ -60,7 +60,7 @@ public class FilterInheritanceTest extends AbstractStatefulStatelessFilterTest { @ParameterizedTest @MethodSource("transactionKind") - @TestForIssue(jiraKey = "HHH-8895") + @JiraKey(value = "HHH-8895") public void testSelectFromHuman( BiConsumer> inTransaction) { inTransaction.accept( scope, session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/JoinedInheritanceFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/JoinedInheritanceFilterTest.java index 0403ff62e0..70a8905890 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/JoinedInheritanceFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined2/JoinedInheritanceFilterTest.java @@ -13,7 +13,7 @@ import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.ParamDef; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -24,7 +24,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.assertj.core.util.TriFunction; -@TestForIssue(jiraKey = "HHH-9646") +@JiraKey(value = "HHH-9646") @SessionFactory @DomainModel(annotatedClasses = { Animal.class, Dog.class, Owner.class, JoinedInheritanceFilterTest.class }) @FilterDef(name = "companyFilter", parameters = @ParamDef(name = "companyIdParam", type = long.class)) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableInheritanceFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableInheritanceFilterTest.java index ecd0390425..aa7a87888b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableInheritanceFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/SingleTableInheritanceFilterTest.java @@ -20,7 +20,7 @@ import org.hibernate.annotations.FilterDef; import org.hibernate.orm.test.filter.AbstractStatefulStatelessFilterTest; import org.hibernate.query.MutationQuery; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -36,7 +36,7 @@ import java.util.function.Consumer; /** * @author Jan Schatteman */ -@TestForIssue( jiraKey = "HHH-16435") +@JiraKey( value = "HHH-16435") @DomainModel( annotatedClasses = { SingleTableInheritanceFilterTest.AbstractSuperClass.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java index f9d1d61422..08ccda163e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java @@ -16,7 +16,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; import org.hibernate.orm.test.hql.SimpleEntityWithAssociation; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -30,7 +30,7 @@ public class NativeCriteriaSyncTest extends BaseCoreFunctionalTestCase { * query. */ @Test - @TestForIssue( jiraKey = "HHH-3813" ) + @JiraKey( value = "HHH-3813" ) public void test() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java index 601ed06917..53836af173 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java @@ -19,7 +19,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.query.sqm.internal.QuerySqmImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Test; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10877") +@JiraKey(value = "HHH-10877") public class NonTransactionalDataAccessTest extends BaseCoreFunctionalTestCase { private String allowUpdateOperationOutsideTransaction = "true"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java index 448a7bd4ff..2af6202a6c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java @@ -28,7 +28,7 @@ import org.hibernate.integrator.spi.Integrator; import org.hibernate.internal.SessionImpl; import org.hibernate.service.spi.SessionFactoryServiceRegistry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue; /** * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-6960" ) +@JiraKey( value = "HHH-6960" ) public class TestAutoFlushBeforeQueryExecution extends BaseCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java index 7008892701..7b9218bbdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java @@ -12,7 +12,7 @@ import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -22,7 +22,7 @@ import org.junit.Test; * * @author Guillaume Smet */ -@TestForIssue(jiraKey = "HHH-7821") +@JiraKey(value = "HHH-7821") public class TestClearBatchFetchQueueAfterFlush extends BaseCoreFunctionalTestCase { public void configure(Configuration cfg) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java index 01c9a96192..b9cba67f82 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java @@ -16,7 +16,7 @@ import org.hibernate.event.spi.PreUpdateEvent; import org.hibernate.event.spi.PreUpdateEventListener; import org.hibernate.integrator.spi.Integrator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BootstrapServiceRegistry; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-2763") +@JiraKey(value = "HHH-2763") @DomainModel( annotatedClasses = { Author.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java index 80048d80fc..4d8550ef1a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java @@ -14,7 +14,7 @@ import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; @@ -24,7 +24,7 @@ import static org.junit.Assert.fail; /** * @author Michiel Hendriks */ -@TestForIssue(jiraKey = "HHH-13936") +@JiraKey(value = "HHH-13936") public class TestFlushJoinTransaction extends BaseNonConfigCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java index 9deec2d99a..7096e63295 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-13042") +@JiraKey(value = "HHH-13042") @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) public class TestFlushModeWithIdentitySelfReferenceTest extends BaseCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java index b5550f0583..f6250fc543 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java @@ -10,7 +10,7 @@ import org.hibernate.FlushMode; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -19,7 +19,7 @@ import org.junit.Test; * * @author Luca Domenichini */ -@TestForIssue(jiraKey = "HHH-13663") +@JiraKey(value = "HHH-13663") public class TestHibernateFlushModeOnThreadLocalInactiveTransaction extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java index 6c52f0c705..da7bc1d78b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java @@ -22,14 +22,14 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.mapping.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; /** * @author Yanming Zhou */ -@TestForIssue(jiraKey = "HHH-14230") +@JiraKey(value = "HHH-14230") public class HHH14230 { private static final String TABLE_NAME = "test_entity"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.java index 9c4bb4009e..5f0372dfa5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.java @@ -20,7 +20,7 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertFalse; public class DisabledForeignKeyTest extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-9704" ) + @JiraKey( value = "HHH-9704" ) public void basicTests() { StandardServiceRegistry standardRegistry = ServiceRegistryUtil.serviceRegistry(); try { @@ -74,7 +74,7 @@ public class DisabledForeignKeyTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9704" ) + @JiraKey( value = "HHH-9704" ) public void expandedTests() { StandardServiceRegistry standardRegistry = ServiceRegistryUtil.serviceRegistry(); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java index 7266b1b0c5..dbc5ff05ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java @@ -24,7 +24,7 @@ import org.hibernate.Transaction; import org.hibernate.dialect.SybaseDialect; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-9306") +@JiraKey(value = "HHH-9306") public class InheritanceManyToManyForeignKeyTest extends BaseNonConfigCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java index 895978f1e7..15b887321e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java @@ -29,7 +29,7 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.mapping.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -38,7 +38,7 @@ import org.junit.Test; * * @author Yanming Zhou */ -@TestForIssue(jiraKey = "HHH-14229") +@JiraKey(value = "HHH-14229") public class OneToManyBidirectionalForeignKeyTest { private static final String TABLE_NAME_PLAIN = "plain"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedFormWithBeanValidationNotNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedFormWithBeanValidationNotNullTest.java index 987bb2b89a..ece66758e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedFormWithBeanValidationNotNullTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/formulajoin/AnnotatedFormWithBeanValidationNotNullTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.formulajoin; import org.hibernate.cfg.Configuration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; @BaseUnitTest public class AnnotatedFormWithBeanValidationNotNullTest { @Test - @TestForIssue( jiraKey = "HHH-8167" ) + @JiraKey( value = "HHH-8167" ) public void testAnnotatedFormWithBeanValidationNotNull() { Configuration cfg = new Configuration(); ServiceRegistryUtil.applySettings( cfg.getStandardServiceRegistryBuilder() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java index 84c2c9d031..6dfdade91b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java @@ -13,7 +13,7 @@ import org.hibernate.graph.EntityGraphs; import org.hibernate.graph.spi.RootGraphImplementor; import org.hibernate.metamodel.model.domain.EntityDomainType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -196,7 +196,7 @@ public class EntityGraphsTest extends AbstractEntityGraphTest { } @Test - @TestForIssue( jiraKey = "HHH-14264" ) + @JiraKey( value = "HHH-14264" ) public void testRootGraphAppliesToChildEntityClass() { RootGraphImplementor rootGraphImplementor = parseGraph( GraphParsingTestEntity.class, "name, description" ); EntityDomainType entity = entityManagerFactory().getJpaMetamodel().entity( (Class) GraphParsingTestSubentity.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/HHH15065Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/HHH15065Test.java index 73db7b229c..96f1684bf8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/HHH15065Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/HHH15065Test.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.*; import java.util.List; import org.hibernate.graph.RootGraph; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -22,7 +22,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; -@TestForIssue(jiraKey = "HHH-15065") +@JiraKey(value = "HHH-15065") @DomainModel( annotatedClasses = { HHH15065Test.Book.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java index d0f9b5a276..1d89d80793 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java @@ -14,7 +14,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.tool.schema.internal.SchemaCreatorImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-10206" ) +@JiraKey( value = "HHH-10206" ) public class CollectionPkTest extends BaseUnitTestCase { private StandardServiceRegistry ssr; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.java index b56295455e..7c9c5fd909 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.java @@ -13,7 +13,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.tool.schema.internal.SchemaCreatorImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -43,7 +43,7 @@ public class CollectionKeyFkNameTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-10207" ) + @JiraKey( value = "HHH-10207" ) public void testExplicitFkNameOnCollectionKey() { verifyFkNameUsed( "org/hibernate/orm/test/hbm/fk/person_set.hbm.xml", @@ -72,7 +72,7 @@ public class CollectionKeyFkNameTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-10207" ) + @JiraKey( value = "HHH-10207" ) public void testExplicitFkNameOnManyToOne() { verifyFkNameUsed( "org/hibernate/orm/test/hbm/fk/person_set.hbm.xml", diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/IndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/IndexTest.java index fe195a95f9..48ecad39fb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/IndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/IndexTest.java @@ -12,7 +12,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.tool.schema.internal.SchemaCreatorImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-10208" ) +@JiraKey( value = "HHH-10208" ) public class IndexTest extends BaseUnitTestCase { private StandardServiceRegistry ssr; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/JoinedSubclassesWithSameFieldNamesButDifferentTypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/JoinedSubclassesWithSameFieldNamesButDifferentTypesTest.java index 8c59de5b5f..7938ba7c74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/JoinedSubclassesWithSameFieldNamesButDifferentTypesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/inheritance/JoinedSubclassesWithSameFieldNamesButDifferentTypesTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.hbm.inheritance; import org.hibernate.boot.MetadataSources; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; import org.junit.jupiter.api.Test; @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test; public class JoinedSubclassesWithSameFieldNamesButDifferentTypesTest { @Test - @TestForIssue(jiraKey = "HHH-15369") + @JiraKey(value = "HHH-15369") public void testNoExceptionIsThrown(ServiceRegistryScope scope) { try (final SessionFactoryImplementor sessionFactory = (SessionFactoryImplementor) new MetadataSources( scope.getRegistry() ) .addResource( "org/hibernate/orm/test/hbm/inheritance/AnimalReport.hbm.xml" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedAssociationExceptioTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedAssociationExceptioTest.java index f2fc11e3ba..67d3a2f710 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedAssociationExceptioTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedAssociationExceptioTest.java @@ -5,7 +5,7 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; public class UnmappedAssociationExceptioTest { @Test - @TestForIssue( jiraKey = "HHH-15354") + @JiraKey( value = "HHH-15354") public void mappingExceptionTest() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedCollectionExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedCollectionExceptionTest.java index 37242950f4..0f0defc9c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedCollectionExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/mappingexception/UnmappedCollectionExceptionTest.java @@ -5,7 +5,7 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; public class UnmappedCollectionExceptionTest { @Test - @TestForIssue(jiraKey = "HHH-15379") + @JiraKey(value = "HHH-15379") public void mappingExceptionTest() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java index 1c444390e9..b3f4a87cf5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java @@ -8,7 +8,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.jdbc.ReaderInputStream; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -16,7 +16,7 @@ import org.junit.Test; /** * @author Koen Aers */ -@TestForIssue( jiraKey = "HHH-10223" ) +@JiraKey( value = "HHH-10223" ) @RequiresDialect( H2Dialect.class ) public class NamedQueryTest extends BaseUnitTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/QueryReturnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/QueryReturnTest.java index 292e6a199b..6a2f432f98 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/QueryReturnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/QueryReturnTest.java @@ -13,7 +13,7 @@ import org.hibernate.query.results.ResultSetMappingImpl; import org.hibernate.query.results.complete.CompleteResultBuilderEntityValued; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Assert; @@ -23,7 +23,7 @@ import org.junit.Test; /** * @author Koen Aers */ -@TestForIssue( jiraKey = "HHH-10405" ) +@JiraKey( value = "HHH-10405" ) @RequiresDialect( H2Dialect.class ) public class QueryReturnTest extends BaseUnitTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/uk/UniqueDelegateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/uk/UniqueDelegateTest.java index 80fc50c965..9836572163 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/uk/UniqueDelegateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/uk/UniqueDelegateTest.java @@ -22,7 +22,7 @@ import org.hibernate.mapping.UniqueKey; import org.hibernate.tool.schema.internal.SchemaCreatorImpl; import org.hibernate.tool.schema.internal.SchemaDropperImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -60,7 +60,7 @@ public class UniqueDelegateTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-10203" ) + @JiraKey( value = "HHH-10203" ) public void testUniqueDelegateConsulted() { final Metadata metadata = new MetadataSources( ssr ) .addResource( "org/hibernate/orm/test/hbm/uk/person_unique.hbm.xml" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java index 2b06ce48ac..e5d2e2be79 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java @@ -64,7 +64,7 @@ import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.orm.test.cid.Customer; @@ -251,7 +251,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8432" ) + @JiraKey( value = "HHH-8432" ) public void testExpandListParameter() { final Object[] namesArray = new Object[] { "ZOO 1", "ZOO 2", "ZOO 3", "ZOO 4", "ZOO 5", "ZOO 6", "ZOO 7", @@ -283,7 +283,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8699") + @JiraKey(value = "HHH-8699") public void testBooleanPredicate() { final Constructor created = fromTransaction( (session) -> { @@ -388,7 +388,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9642") + @JiraKey( value = "HHH-9642") public void testLazyAssociationInComponent() { inTransaction( (session) -> { @@ -685,7 +685,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-2045" ) + @JiraKey( value = "HHH-2045" ) @RequiresDialect( H2Dialect.class ) public void testEmptyInList() { Session session = openSession(); @@ -712,7 +712,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8901" ) + @JiraKey( value = "HHH-8901" ) public void testEmptyInListForDialectsNotSupportsEmptyInList() { Session session = openSession(); session.beginTransaction(); @@ -740,7 +740,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-2851") + @JiraKey( value = "HHH-2851") public void testMultipleRefsToSameParam() { Session s = openSession(); s.beginTransaction(); @@ -867,7 +867,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-4150" ) + @JiraKey( value = "HHH-4150" ) public void testSelectClauseCaseWithSum() { Session s = openSession(); Transaction t = s.beginTransaction(); @@ -899,7 +899,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-4150" ) + @JiraKey( value = "HHH-4150" ) public void testSelectClauseCaseWithCountDistinct() { Session s = openSession(); Transaction t = s.beginTransaction(); @@ -1107,7 +1107,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-2257" ) + @JiraKey( value = "HHH-2257" ) public void testImplicitJoinsInDifferentClauses() { // both the classic and ast translators output the same syntactically valid sql // for all of these cases; the issue is that shallow (iterate) and @@ -1206,7 +1206,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-2257" ) + @JiraKey( value = "HHH-2257" ) public void testImplicitSelectEntityAssociationInShallowQuery() { // both the classic and ast translators output the same syntactically valid sql. // the issue is that shallow and non-shallow queries return different @@ -1250,7 +1250,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-6714" ) + @JiraKey( value = "HHH-6714" ) public void testUnaryMinus(){ Session s = openSession(); s.beginTransaction(); @@ -1297,7 +1297,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9305") + @JiraKey( value = "HHH-9305") public void testExplicitToOneInnerJoin() { final Employee employee1 = new Employee(); employee1.setFirstName( "Jane" ); @@ -1450,7 +1450,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-939" ) + @JiraKey( value = "HHH-939" ) public void testSpecialClassPropertyReference() { // this is a long standing bug in Hibernate when applied to joined-subclasses; // see HHH-939 for details and history @@ -1462,7 +1462,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-2376" ) + @JiraKey( value = "HHH-2376" ) public void testSpecialClassPropertyReferenceFQN() { new SyntaxChecker( "from Zoo zoo where zoo.class = org.hibernate.orm.test.hql.PettingZoo" ).checkAll(); new SyntaxChecker( "select a.description from Animal a where a.class = org.hibernate.orm.test.hql.Mammal" ).checkAll(); @@ -1471,7 +1471,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-1631" ) + @JiraKey( value = "HHH-1631" ) public void testSubclassOrSuperclassPropertyReferenceInJoinedSubclass() { // this is a long standing bug in Hibernate; see HHH-1631 for details and history // @@ -1601,7 +1601,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-1774" ) + @JiraKey( value = "HHH-1774" ) @RequiresDialectFeature( DialectChecks.SupportsSubqueryInSelect.class ) public void testComponentParameterBinding() { Session s = openSession(); @@ -1719,7 +1719,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-1248" ) + @JiraKey( value = "HHH-1248" ) public void testCollectionJoinsInSubselect() { // HHH-1248 : initially FromElementFactory treated any explicit join // as an implied join so that theta-style joins would always be used. @@ -1831,7 +1831,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-1830") + @JiraKey(value = "HHH-1830") @SkipForDialect(value = DerbyDialect.class, comment = "Derby doesn't see that the subquery is functionally dependent") public void testAggregatedJoinAlias() { Session s = openSession(); @@ -1847,7 +1847,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-1464" ) + @JiraKey( value = "HHH-1464" ) public void testQueryMetadataRetrievalWithFetching() { // HHH-1464 : there was a problem due to the fact they we polled // the shallow version of the query plan to get the metadata. @@ -1867,7 +1867,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-429" ) + @JiraKey( value = "HHH-429" ) @SuppressWarnings( {"unchecked"}) public void testSuperclassPropertyReferenceAfterCollectionIndexedAccess() { // note: simply performing syntax checking in the db @@ -2186,7 +2186,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9305") + @JiraKey( value = "HHH-9305") @SuppressWarnings( {"unchecked"}) public void testSelectClauseImplicitJoinOrderByJoinedProperty() { Session s = openSession(); @@ -3304,7 +3304,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9305") + @JiraKey( value = "HHH-9305") public void testDynamicInstantiationWithToOneQueries() throws Exception { final Employee employee1 = new Employee(); employee1.setFirstName( "Jane" ); @@ -3729,7 +3729,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-11942" ) + @JiraKey( value = "HHH-11942" ) public void testOrderByExtraParenthesis() throws Exception { try { doInHibernate( this::sessionFactory, session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java index 3bd31fa9ff..fb18ff4043 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java @@ -31,7 +31,7 @@ import org.hibernate.query.Query; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.generator.Generator; import org.junit.Test; @@ -277,7 +277,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-15161") + @JiraKey( value = "HHH-15161") public void testInsertWithNullParamValue() { TestData data = new TestData(); data.prepare(); @@ -302,7 +302,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-15161") + @JiraKey( value = "HHH-15161") public void testInsertWithNullParamValueSetOperation() { TestData data = new TestData(); data.prepare(); @@ -1411,7 +1411,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8476") + @JiraKey(value = "HHH-8476") public void testManyToManyBulkDelete() { Session s = openSession(); Transaction t = s.beginTransaction(); @@ -1448,7 +1448,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-1917") + @JiraKey(value = "HHH-1917") public void testManyToManyBulkDeleteMultiTable() { Session s = openSession(); Transaction t = s.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java index 76acfa0141..27b0f53d3b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.TypedQuery; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertThat; /** * @author Johannes Buehler */ -@TestForIssue( jiraKey = "HHH-10463") +@JiraKey( value = "HHH-10463") public class CoalesceTest extends BaseCoreFunctionalTestCase { private Person person; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java index c5170892ff..4b9da6e369 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java @@ -15,7 +15,7 @@ import java.util.Set; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -109,7 +109,7 @@ public class CollectionMapWithComponentValueTest { } @Test - @TestForIssue(jiraKey = "HHH-10577") + @JiraKey(value = "HHH-10577") public void testMapValueExpressionInWhere(SessionFactoryScope scope) { scope.inTransaction( s -> { // JPA form @@ -183,7 +183,7 @@ public class CollectionMapWithComponentValueTest { } @Test - @TestForIssue(jiraKey = "HHH-10577") + @JiraKey(value = "HHH-10577") public void testMapKeyExpressionDereferenceInSelect(SessionFactoryScope scope) { scope.inTransaction( s -> { List keyValueNames = s.createQuery( @@ -197,7 +197,7 @@ public class CollectionMapWithComponentValueTest { } @Test - @TestForIssue(jiraKey = "HHH-10537") + @JiraKey(value = "HHH-10537") public void testLeftJoinMapAndUseKeyExpression(SessionFactoryScope scope) { scope.inTransaction( s -> { // Assert that a left join is used for joining the map key entity table @@ -209,7 +209,7 @@ public class CollectionMapWithComponentValueTest { } @Test - @TestForIssue(jiraKey = "HHH-11433") + @JiraKey(value = "HHH-11433") public void testJoinMapValue(SessionFactoryScope scope) { scope.inTransaction( s -> { // Assert that a left join is used for joining the map key entity table @@ -221,7 +221,7 @@ public class CollectionMapWithComponentValueTest { } @Test - @TestForIssue(jiraKey = "HHH-11433") + @JiraKey(value = "HHH-11433") public void testJoinMapKey(SessionFactoryScope scope) { scope.inTransaction( s -> { // Assert that a left join is used for joining the map key entity table @@ -234,7 +234,7 @@ public class CollectionMapWithComponentValueTest { } @Test - @TestForIssue(jiraKey = "HHH-11433") + @JiraKey(value = "HHH-11433") public void testJoinMapKeyAssociation(SessionFactoryScope scope) { scope.inTransaction( s -> { List keyValues = s.createQuery( @@ -246,7 +246,7 @@ public class CollectionMapWithComponentValueTest { } @Test - @TestForIssue(jiraKey = "HHH-11433") + @JiraKey(value = "HHH-11433") public void testJoinMapKeyAssociationImplicit(SessionFactoryScope scope) { scope.inTransaction( s -> { List keyValues = s.createQuery( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DB297SubStringFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DB297SubStringFunctionsTest.java index 370d186838..620076afd0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DB297SubStringFunctionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DB297SubStringFunctionsTest.java @@ -19,7 +19,7 @@ import org.hibernate.exception.SQLGrammarException; import org.hibernate.resource.jdbc.spi.StatementInspector; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; @@ -75,7 +75,7 @@ public class DB297SubStringFunctionsTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-11957") + @JiraKey( value = "HHH-11957") public void testSubstringWithStringUnits() { mostRecentStatementInspector.clear(); @@ -95,7 +95,7 @@ public class DB297SubStringFunctionsTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-11957") + @JiraKey( value = "HHH-11957") public void testSubstringWithoutStringUnits() { mostRecentStatementInspector.clear(); @@ -113,7 +113,7 @@ public class DB297SubStringFunctionsTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-11957") + @JiraKey( value = "HHH-11957") public void testSubstrWithStringUnits() { try { @@ -134,7 +134,7 @@ public class DB297SubStringFunctionsTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-11957") + @JiraKey( value = "HHH-11957") public void testSubstrWithoutStringUnits() { mostRecentStatementInspector.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteAllWithTablePerClassAndDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteAllWithTablePerClassAndDefaultSchemaTest.java index ed441bff4c..901a23a5a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteAllWithTablePerClassAndDefaultSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteAllWithTablePerClassAndDefaultSchemaTest.java @@ -11,7 +11,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; @@ -23,7 +23,7 @@ import jakarta.persistence.InheritanceType; import static org.assertj.core.api.Assertions.assertThat; -@TestForIssue(jiraKey = "HHH-15022") +@JiraKey(value = "HHH-15022") @RequiresDialect(PostgreSQLDialect.class) public class DeleteAllWithTablePerClassAndDefaultSchemaTest extends BaseCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java index 9ab884afa9..87c4f87564 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java @@ -10,13 +10,13 @@ import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; -@TestForIssue(jiraKey = "HHH-12492") +@JiraKey(value = "HHH-12492") public class DeleteQuerySubqueryReferencingTargetPropertyTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWithSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWithSubqueryTest.java index b114b9af9f..d56c851c62 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWithSubqueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWithSubqueryTest.java @@ -15,7 +15,7 @@ import org.hibernate.orm.test.annotations.query.Employeegroup; import org.hibernate.orm.test.hql.Panel; import org.hibernate.orm.test.hql.TrtPanel; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -37,7 +37,7 @@ public class DeleteWithSubqueryTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8318" ) + @JiraKey( value = "HHH-8318" ) @SkipForDialect( value = MySQLDialect.class, comment = "Cannot use Attrvalue in the delete and from clauses simultaneously." ) public void testDeleteMemberOf() { final String qry = "delete Attrvalue aval where aval.id in ( " @@ -52,7 +52,7 @@ public class DeleteWithSubqueryTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8447" ) + @JiraKey( value = "HHH-8447" ) public void testDeleteMultipleWhereIns() { Session s = openSession(); s.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EmbeddableSubqueryWithSameAliasOfRootQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EmbeddableSubqueryWithSameAliasOfRootQueryTest.java index 9c70ffd5a2..72ee4bdb9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EmbeddableSubqueryWithSameAliasOfRootQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/EmbeddableSubqueryWithSameAliasOfRootQueryTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.hql; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-16396") +@JiraKey( value = "HHH-16396") public class EmbeddableSubqueryWithSameAliasOfRootQueryTest { private static final Long ENTITY_WITH_ASSOCIATION_ID = 1L; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlSubselectParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlSubselectParameterTest.java index 33ece4066d..9be6a8404b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlSubselectParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlSubselectParameterTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.hql; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -31,7 +31,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15647") +@JiraKey(value = "HHH-15647") public class HqlSubselectParameterTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java index e1e015f5b1..53eac5af5d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.MapKeyJoinColumn; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import static org.hamcrest.core.Is.is; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import org.junit.Before; @@ -21,7 +21,7 @@ import static org.junit.Assert.assertThat; /** * @author Burkhard Graves */ -@TestForIssue(jiraKey = "HHH-14475") +@JiraKey(value = "HHH-14475") public class IndicesTest extends BaseNonConfigCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/JoinOnClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/JoinOnClauseTest.java index c1d2c53d32..25901eee65 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/JoinOnClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/JoinOnClauseTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.hql; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -53,7 +53,7 @@ public class JoinOnClauseTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11437") + @JiraKey(value = "HHH-11437") public void testOnClauseUsesSuperclassAttribute() { doInJPA( this::entityManagerFactory, entityManager -> { List result = entityManager.createQuery( "SELECT DISTINCT b1 FROM Book b1 JOIN Book b2 ON b1.price = b2.price", Book.class ) @@ -63,7 +63,7 @@ public class JoinOnClauseTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11435") + @JiraKey(value = "HHH-11435") public void testOnClauseUsesNonDrivingTableAlias() { doInJPA( this::entityManagerFactory, entityManager -> { try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ManyToOneJoinReuseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ManyToOneJoinReuseTest.java index 4722974bc7..cbb45ee8b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ManyToOneJoinReuseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ManyToOneJoinReuseTest.java @@ -11,7 +11,7 @@ import org.hibernate.query.criteria.HibernateCriteriaBuilder; import org.hibernate.query.criteria.JpaCriteriaQuery; import org.hibernate.query.criteria.JpaRoot; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class ManyToOneJoinReuseTest { @Test - @TestForIssue(jiraKey = "HHH-15648") + @JiraKey(value = "HHH-15648") public void fetchAndImplicitPath(SessionFactoryScope scope) { SQLStatementInspector sqlStatementInterceptor = scope.getCollectingStatementInspector(); scope.inTransaction( @@ -64,7 +64,7 @@ public class ManyToOneJoinReuseTest { } @Test - @TestForIssue(jiraKey = "HHH-15645") + @JiraKey(value = "HHH-15645") public void joinAndImplicitPath(SessionFactoryScope scope) { SQLStatementInspector sqlStatementInterceptor = scope.getCollectingStatementInspector(); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MetamodelBoundedCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MetamodelBoundedCacheTest.java index 0c09c6140e..09c44ca5b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MetamodelBoundedCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MetamodelBoundedCacheTest.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.model.domain.JpaMetamodel; import org.hibernate.metamodel.model.domain.internal.JpaMetamodelImpl; import org.hibernate.metamodel.model.domain.internal.MappingMetamodelImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; public class MetamodelBoundedCacheTest extends BaseNonConfigCoreFunctionalTestCase { @Test - @TestForIssue(jiraKey = "HHH-14948") + @JiraKey(value = "HHH-14948") public void testMemoryConsumptionOfFailedImportsCache() throws NoSuchFieldException, IllegalAccessException { MappingMetamodel mappingMetamodel = sessionFactory().getMappingMetamodel(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java index 1b8f698a7c..1f84cdbd85 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NaturalIdDereferenceTest.java @@ -10,7 +10,7 @@ package org.hibernate.orm.test.hql; import org.hibernate.annotations.NaturalId; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -330,7 +330,7 @@ public class NaturalIdDereferenceTest { } @Test - @TestForIssue(jiraKey = "HHH-13752") + @JiraKey(value = "HHH-13752") public void deleteWithNaturalIdBasedJoinTable(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NestedSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NestedSubqueryTest.java index 6dde6fb994..9e233b8cca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NestedSubqueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/NestedSubqueryTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -27,7 +27,7 @@ import jakarta.persistence.Tuple; ) @SkipForDialect(dialectClass = H2Dialect.class, majorVersion = 1, reason = "It seems that selecting two columns in a subquery with the same name doesn't work for H2 1.x even with aliasing at table alias level") @SessionFactory -@TestForIssue(jiraKey = "HHH-15731") +@JiraKey(value = "HHH-15731") public class NestedSubqueryTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java index 75dbc2019f..625bd82e6c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java @@ -18,7 +18,7 @@ import org.hibernate.query.Query; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.hamcrest.CoreMatchers.is; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10893") +@JiraKey(value = "HHH-10893") public class ParameterCollectionTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectNewEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectNewEmbeddedIdTest.java index 4eba200137..2e576447fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectNewEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectNewEmbeddedIdTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.Query; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -56,37 +56,37 @@ public class SelectNewEmbeddedIdTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-4712") + @JiraKey(value = "HHH-4712") public void testSelectNewListEntity() { assertQueryRowCount( "select new list(e) FROM Simple e", 1 ); } @Test - @TestForIssue(jiraKey = "HHH-4712") + @JiraKey(value = "HHH-4712") public void testSelectNewListEmbeddedIdValue() { assertQueryRowCount( "select new list(e.simpleId) FROM Simple e", 1 ); } @Test - @TestForIssue(jiraKey = "HHH-4712") + @JiraKey(value = "HHH-4712") public void testSelectNewMapEntity() { assertQueryRowCount( "select new map(e.id, e) FROM Simple e", 1 ); } @Test - @TestForIssue(jiraKey = "HHH-4712") + @JiraKey(value = "HHH-4712") public void testSelectNewMapEmbeddedIdValue() { assertQueryRowCount( "select new map(e.simpleId, e.simpleId) FROM Simple e", 1 ); } @Test - @TestForIssue(jiraKey = "HHH-4712") + @JiraKey(value = "HHH-4712") public void testSelectNewObjectEntity() { assertQueryRowCount( "select new " + Wrapper.class.getName() + "(e) FROM Simple e", 1 ); } @Test - @TestForIssue(jiraKey = "HHH-4712") + @JiraKey(value = "HHH-4712") public void testSelectNewObjectEmbeddedIdValue() { assertQueryRowCount( "select new " + Wrapper.class.getName() + "(e.simpleId) FROM Simple e", 1 ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java index d207382e77..9bf6ca5dcd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java @@ -17,8 +17,9 @@ import jakarta.persistence.Table; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -71,7 +72,7 @@ public class SubQueryTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9090" ) + @JiraKey( value = "HHH-9090" ) public void testCorrelatedJoin() { Session s = openSession(); s.beginTransaction(); @@ -157,7 +158,10 @@ public class SubQueryTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-1689, SQM-30" ) + @JiraKeyGroup( value = { + @JiraKey( value = "HHH-1689" ), + @JiraKey( value = "SQM-30" ) + } ) public void testSubQueryAsSearchedCaseResultExpression() { final String query = "SELECT CASE WHEN l.id IS NOT NULL THEN (SELECT COUNT(r.id) FROM Root r) ELSE 0 END FROM Leaf l"; // simple syntax check @@ -169,7 +173,10 @@ public class SubQueryTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-1689, SQM-30" ) + @JiraKeyGroup( value = { + @JiraKey( value = "HHH-1689" ), + @JiraKey( value = "SQM-30" ) + } ) public void testSubQueryAsSearchedCaseExpression() { final String query = "SELECT CASE WHEN (SELECT COUNT(r.id) FROM Root r) > 1 THEN 1 ELSE 0 END FROM Leaf l"; // simple syntax check @@ -181,7 +188,10 @@ public class SubQueryTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-1689, SQM-30" ) + @JiraKeyGroup( value = { + @JiraKey( value = "HHH-1689" ), + @JiraKey( value = "SQM-30" ) + } ) public void testSubQueryAsCaseElseResultExpression() { final String query = "SELECT CASE WHEN l.id > 1 THEN 1 ELSE (SELECT COUNT(r.id) FROM Root r) END FROM Leaf l"; // simple syntax check @@ -193,7 +203,10 @@ public class SubQueryTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-1689, SQM-30" ) + @JiraKeyGroup( value = { + @JiraKey( value = "HHH-1689" ), + @JiraKey( value = "SQM-30" ) + } ) public void testSubQueryAsSimpleCaseTestExpression() { final String query = "SELECT CASE (SELECT COUNT(r.id) FROM Root r) WHEN 1 THEN 1 ELSE 0 END FROM Leaf l"; // simple syntax check @@ -205,7 +218,10 @@ public class SubQueryTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-1689, SQM-30" ) + @JiraKeyGroup( value = { + @JiraKey( value = "HHH-1689" ), + @JiraKey( value = "SQM-30" ) + } ) public void testSubQueryAsSimpleCaseWhenExpression() { final String query = "SELECT CASE l.id WHEN (SELECT COUNT(r.id) FROM Root r) THEN 1 ELSE 0 END FROM Leaf l"; // simple syntax check diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubqueryWithSameAliasOfRootQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubqueryWithSameAliasOfRootQueryTest.java index ce211f2d4f..f161d4a966 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubqueryWithSameAliasOfRootQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubqueryWithSameAliasOfRootQueryTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.hql; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -26,7 +26,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-16396") +@JiraKey( value = "HHH-16396") public class SubqueryWithSameAliasOfRootQueryTest { private static final Long ENTITY_WITH_ASSOCIATION_ID = 1L; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java index 94ed9bbe65..e537321aae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.query.Query; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -37,7 +37,7 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9342" ) + @JiraKey( value = "HHH-9342" ) public void memberOfTreatTest() { // prepare test data Session s = openSession(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/UpdateJoinedSubclassCorrelationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/UpdateJoinedSubclassCorrelationTest.java index 4e15fa83e8..56673cb085 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/UpdateJoinedSubclassCorrelationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/UpdateJoinedSubclassCorrelationTest.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.hql; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -14,7 +14,7 @@ import java.util.List; import static jakarta.persistence.InheritanceType.JOINED; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; -@TestForIssue(jiraKey = "HHH-13169") +@JiraKey(value = "HHH-13169") public class UpdateJoinedSubclassCorrelationTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java index bc50524ab1..ebe062d535 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java @@ -15,7 +15,7 @@ import org.hibernate.QueryException; import org.hibernate.community.dialect.DerbyDialect; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SkipForDialect; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -123,7 +123,7 @@ public class WithClauseTest { } @Test - @TestForIssue(jiraKey = "HHH-2772") + @JiraKey(value = "HHH-2772") public void testWithJoinRHS(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -161,7 +161,7 @@ public class WithClauseTest { } @Test - @TestForIssue(jiraKey = "HHH-9329") + @JiraKey(value = "HHH-9329") public void testWithClauseAsSubquery(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -175,7 +175,7 @@ public class WithClauseTest { } @Test - @TestForIssue(jiraKey = "HHH-11230") + @JiraKey(value = "HHH-11230") public void testWithClauseAsSubqueryWithEqualOperator(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -188,7 +188,7 @@ public class WithClauseTest { } @Test - @TestForIssue(jiraKey = "HHH-9329") + @JiraKey(value = "HHH-9329") public void testWithClauseAsSubqueryWithKey(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -202,7 +202,7 @@ public class WithClauseTest { } @Test - @TestForIssue(jiraKey = "HHH-11401") + @JiraKey(value = "HHH-11401") @SkipForDialect(dialectClass = DerbyDialect.class, reason = "Derby does not support cast from INTEGER to VARCHAR") public void testWithClauseAsSubqueryWithKeyAndOtherJoinReference(SessionFactoryScope scope) { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/ToManyFetchAndJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/ToManyFetchAndJoinTest.java index 36ab75097d..805b91df6d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/ToManyFetchAndJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/fetchAndJoin/ToManyFetchAndJoinTest.java @@ -33,7 +33,7 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; @@ -83,7 +83,7 @@ public class ToManyFetchAndJoinTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9637") + @JiraKey( value = "HHH-9637") public void testExplicitJoinBeforeFetchJoins() { Session s = openSession(); @@ -121,7 +121,7 @@ public class ToManyFetchAndJoinTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9637") + @JiraKey( value = "HHH-9637") public void testExplicitJoinBetweenFetchJoins() { Session s = openSession(); @@ -159,7 +159,7 @@ public class ToManyFetchAndJoinTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9637") + @JiraKey( value = "HHH-9637") public void testExplicitJoinAfterFetchJoins() { Session s = openSession(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java index 1d39b830f1..d78bdfa88a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.hql.joinedSubclass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; public class JoinedSubclassBulkManipTest { @Test - @TestForIssue(jiraKey = "HHH-1657") + @JiraKey(value = "HHH-1657") public void testHqlDeleteOnJoinedSubclass(SessionFactoryScope scope) { scope.inTransaction( s -> { @@ -53,7 +53,7 @@ public class JoinedSubclassBulkManipTest { } @Test - @TestForIssue(jiraKey = "HHH-1657") + @JiraKey(value = "HHH-1657") public void testHqlUpdateOnJoinedSubclass(SessionFactoryScope scope) { scope.inTransaction( s -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassNativeQueryTest.java index 53855f18ed..0635228ff7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassNativeQueryTest.java @@ -10,7 +10,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.type.SqlTypes; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -58,7 +58,7 @@ public class JoinedSubclassNativeQueryTest { } @Test - @TestForIssue( jiraKey = "HHH-16180") + @JiraKey( value = "HHH-16180") public void testJoinedInheritanceNativeQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java index 93594b5e24..97fe42ac31 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.hql.joinedSubclass; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -41,7 +41,7 @@ import jakarta.persistence.Table; public class JoinedSubclassSubQueryTest { @Test - @TestForIssue(jiraKey = "HHH-11182") + @JiraKey(value = "HHH-11182") public void testSubQueryConstraintPropertyInSuperclassTable(SessionFactoryScope scope) { scope.inTransaction( @@ -58,7 +58,7 @@ public class JoinedSubclassSubQueryTest { } @Test - @TestForIssue(jiraKey = "HHH-11182") + @JiraKey(value = "HHH-11182") public void testSubQueryConstraintPropertyInEntityTable(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java index 543af736c2..53d42085a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java @@ -19,7 +19,7 @@ import org.hibernate.jdbc.Expectation; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.CascadeType; @@ -34,7 +34,7 @@ import jakarta.persistence.TypedQuery; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; -@TestForIssue(jiraKey = "HHH-14585") +@JiraKey(value = "HHH-14585") @RequiresDialect(value = PostgreSQLDialect.class, comment = "Other databases may not support boolean data types") @RequiresDialect(value = H2Dialect.class, comment = "Other databases may not support boolean data types") public class WhereClauseOrderBySizeTest extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/WhereAnnotatedOneToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/WhereAnnotatedOneToManySizeTest.java index 557105877d..5a78032c47 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/WhereAnnotatedOneToManySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/filter/WhereAnnotatedOneToManySizeTest.java @@ -17,13 +17,13 @@ import org.hibernate.dialect.TiDBDialect; import org.hibernate.query.spi.QueryImplementor; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; -@TestForIssue(jiraKey = "HHH-14585") +@JiraKey(value = "HHH-14585") public class WhereAnnotatedOneToManySizeTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java index 1cec69ab51..20db74d906 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java @@ -16,7 +16,7 @@ import java.util.Set; import org.hibernate.Hibernate; import org.hibernate.ScrollableResults; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -90,7 +90,7 @@ public class HQLScrollFetchTest { } @Test - @TestForIssue(jiraKey = "HHH-1283") + @JiraKey(value = "HHH-1283") public void testIncompleteScrollSecondResult(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -120,7 +120,7 @@ public class HQLScrollFetchTest { } @Test - @TestForIssue(jiraKey = "HHH-1283") + @JiraKey(value = "HHH-1283") public void testIncompleteScrollSecondResultInTransaction(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -137,7 +137,7 @@ public class HQLScrollFetchTest { } @Test - @TestForIssue(jiraKey = "HHH-1283") + @JiraKey(value = "HHH-1283") public void testIncompleteScroll(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -179,7 +179,7 @@ public class HQLScrollFetchTest { } @Test - @TestForIssue(jiraKey = "HHH-1283") + @JiraKey(value = "HHH-1283") public void testIncompleteScrollLast(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -225,7 +225,7 @@ public class HQLScrollFetchTest { } @Test - @TestForIssue(jiraKey = "HHH-1283") + @JiraKey(value = "HHH-1283") public void testScrollOrderParentAsc(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -241,7 +241,7 @@ public class HQLScrollFetchTest { } @Test - @TestForIssue(jiraKey = "HHH-1283") + @JiraKey(value = "HHH-1283") public void testScrollOrderParentDesc(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -257,7 +257,7 @@ public class HQLScrollFetchTest { } @Test - @TestForIssue(jiraKey = "HHH-1283") + @JiraKey(value = "HHH-1283") public void testScrollOrderParentAscChildrenAsc(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -274,7 +274,7 @@ public class HQLScrollFetchTest { } @Test - @TestForIssue(jiraKey = "HHH-1283") + @JiraKey(value = "HHH-1283") public void testScrollOrderParentAscChildrenDesc(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java index 4ad57f2de5..97882e36d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.id; import org.hibernate.FlushMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test; @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class) @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsNoColumnInsert.class) -@TestForIssue(jiraKey = "HHH-12464") +@JiraKey(value = "HHH-12464") @DomainModel( annotatedClasses = { RootEntity.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/FlushIdGenTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/FlushIdGenTest.java index 2847717329..71f73b8a3d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/FlushIdGenTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/FlushIdGenTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.id; import org.hibernate.Transaction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DialectFeatureChecks.SupportsIdentityColumns; import org.hibernate.testing.orm.junit.DomainModel; @@ -18,7 +18,7 @@ import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.Test; -@TestForIssue(jiraKey = "HHH-8611") +@JiraKey(value = "HHH-8611") @RequiresDialectFeature(feature = SupportsIdentityColumns.class) @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsNoColumnInsert.class) @DomainModel( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java index acdd5ed601..7047e04ccf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java @@ -6,7 +6,7 @@ import jakarta.persistence.Id; import jakarta.persistence.MapsId; import jakarta.persistence.OneToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; public class ForeignGeneratorTest { @Test - @TestForIssue(jiraKey = "HHH-13456") + @JiraKey(value = "HHH-13456") public void testForeignGeneratorInStatelessSession(SessionFactoryScope scope) { scope.inStatelessTransaction( statelessSession -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java index a6499b2456..a42ef4b487 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.ManyToOne; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-12251" ) +@JiraKey( value = "HHH-12251" ) public class IdClassManyToOneCascadeTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdentityIdEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdentityIdEntityTest.java index 6a6cb10270..4711190a1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdentityIdEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdentityIdEntityTest.java @@ -16,7 +16,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.OracleDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -43,7 +43,7 @@ public class IdentityIdEntityTest { } @Test - @TestForIssue(jiraKey = "HHH-15561") + @JiraKey(value = "HHH-15561") @ServiceRegistry( settings = { @Setting( name = AvailableSettings.USE_GET_GENERATED_KEYS, value = "false") } ) @@ -66,7 +66,7 @@ public class IdentityIdEntityTest { } @Test - @TestForIssue(jiraKey = "HHH-15561") + @JiraKey(value = "HHH-15561") @ServiceRegistry( settings = { @Setting( name = "use_jdbc_metadata_defaults", value = "false") } ) @@ -89,7 +89,7 @@ public class IdentityIdEntityTest { } @Test - @TestForIssue(jiraKey = "HHH-16418") + @JiraKey(value = "HHH-16418") @ServiceRegistry( settings = { @Setting( name = AvailableSettings.USE_GET_GENERATED_KEYS, value = "false") } ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java index 0a4e283c3b..7490083ee3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Table; import org.hibernate.HibernateException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -71,7 +71,7 @@ public class NonUniqueIdTest { } @Test - @TestForIssue(jiraKey = "HHH-12802") + @JiraKey(value = "HHH-12802") public void testLoadEntityWithNonUniqueId(SessionFactoryScope scope) { try { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java index a84fea70ff..c898a388ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java @@ -37,7 +37,7 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.generator.BeforeExecutionGenerator; import org.hibernate.generator.EventType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -49,7 +49,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-9287") +@JiraKey(value = "HHH-9287") @DomainModel( annotatedClasses = PooledHiLoSequenceIdentifierTest.SequenceIdentifier.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java index 5c378d9eec..b739934207 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.SequenceGenerator; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -45,7 +45,7 @@ public class SQLServer2012SequenceGeneratorAnnotationTest { * For this test, the sequence is initialized to 10. */ @Test - @TestForIssue(jiraKey = "HHH-8814") + @JiraKey(value = "HHH-8814") @RequiresDialect(value = SQLServerDialect.class, majorVersion = 11) public void testStartOfSequence(SessionFactoryScope scope) { final Person person = scope.fromTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorTest.java index c999190a2d..069778c2c7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.id; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -38,7 +38,7 @@ public class SQLServer2012SequenceGeneratorTest { * For this test, the sequence is initialized to 10. */ @Test - @TestForIssue(jiraKey = "HHH-8814") + @JiraKey(value = "HHH-8814") @RequiresDialect(value = SQLServerDialect.class, majorVersion = 11) public void testStartOfSequence(SessionFactoryScope scope) { final Person person = scope.fromTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceGeneratorTest.java index cb38a1376d..192419c802 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceGeneratorTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.id; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; @@ -31,7 +31,7 @@ public class SequenceGeneratorTest { * This seems a little trivial, but we need to guarantee that all Dialects start their sequences on a non-0 value. */ @Test - @TestForIssue(jiraKey = "HHH-8814") + @JiraKey(value = "HHH-8814") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSequences.class) @SkipForDialect( dialectClass = SQLServerDialect.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java index 8c86b0177b..19b34e97e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java @@ -19,7 +19,7 @@ import org.hibernate.dialect.OracleDialect; import org.hibernate.query.Query; import org.hibernate.type.descriptor.java.ByteArrayJavaType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -74,7 +74,7 @@ public class ByteArrayIdTest { * Removes two records from database. */ @Test - @TestForIssue(jiraKey = "HHH-8999") + @JiraKey(value = "HHH-8999") public void testMultipleDeletions(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -97,7 +97,7 @@ public class ByteArrayIdTest { * Updates two records from database. */ @Test - @TestForIssue(jiraKey = "HHH-8999") + @JiraKey(value = "HHH-8999") public void testMultipleUpdates(SessionFactoryScope scope) { final String lastResultName = scope.fromTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java index dc0247efe6..c689f53eca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java @@ -17,7 +17,7 @@ import org.hibernate.annotations.JavaType; import org.hibernate.query.Query; import org.hibernate.type.descriptor.java.CharacterArrayJavaType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -69,7 +69,7 @@ public class CharacterArrayIdTest { * Removes two records from database. */ @Test - @TestForIssue(jiraKey = "HHH-8999") + @JiraKey(value = "HHH-8999") public void testMultipleDeletions(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -92,7 +92,7 @@ public class CharacterArrayIdTest { * Updates two records from database. */ @Test - @TestForIssue(jiraKey = "HHH-8999") + @JiraKey(value = "HHH-8999") public void testMultipleUpdates(SessionFactoryScope scope) { final String lastResultName = scope.fromTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java index e25001b056..c6bffee0b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java @@ -17,7 +17,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.OracleDialect; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -72,7 +72,7 @@ public class PrimitiveByteArrayIdTest { * Removes two records from database. */ @Test - @TestForIssue(jiraKey = "HHH-8999") + @JiraKey(value = "HHH-8999") public void testMultipleDeletions(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -95,7 +95,7 @@ public class PrimitiveByteArrayIdTest { * Updates two records from database. */ @Test - @TestForIssue(jiraKey = "HHH-8999") + @JiraKey(value = "HHH-8999") public void testMultipleUpdates(SessionFactoryScope scope) { final String lastResultName = scope.fromTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java index 59561e4da0..11dbcbeb27 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Table; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -67,7 +67,7 @@ public class PrimitiveCharacterArrayIdTest { * Removes two records from database. */ @Test - @TestForIssue(jiraKey = "HHH-8999") + @JiraKey(value = "HHH-8999") public void testMultipleDeletions(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -90,7 +90,7 @@ public class PrimitiveCharacterArrayIdTest { * Updates two records from database. */ @Test - @TestForIssue(jiraKey = "HHH-8999") + @JiraKey(value = "HHH-8999") public void testMultipleUpdates(SessionFactoryScope scope) { final String lastResultName = scope.fromTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java index 3f2166311b..907ddc3ae5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.MappedSuperclass; import org.hibernate.dialect.MySQLDialect; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; * * @author Yanming Zhou */ -@TestForIssue(jiraKey = "HHH-14219") +@JiraKey(value = "HHH-14219") @DomainModel( annotatedClasses = { SharedSequenceTest.BaseEntity.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java index 2a6898ef67..f847389168 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java @@ -29,7 +29,7 @@ import org.hibernate.id.SequenceMismatchStrategy; import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; @@ -47,7 +47,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @RequiresDialect(value = PostgreSQLDialect.class) public class PostgreSQLSequenceGeneratorWithSerialTest extends EntityManagerFactoryBasedFunctionalTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java index 3afe347ded..7ccc824283 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java @@ -24,7 +24,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSequences.class) public class SequenceMismatchStrategyDefaultExceptionTest extends EntityManagerFactoryBasedFunctionalTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyExceptionEnumTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyExceptionEnumTest.java index d85e334651..b32b591686 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyExceptionEnumTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyExceptionEnumTest.java @@ -11,14 +11,14 @@ import java.util.Map; import org.hibernate.cfg.AvailableSettings; import org.hibernate.id.SequenceMismatchStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.RequiresDialectFeature; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSequences.class) public class SequenceMismatchStrategyExceptionEnumTest extends SequenceMismatchStrategyDefaultExceptionTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java index 15a8301ba3..00aa9e0ed6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java @@ -27,7 +27,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; @@ -47,7 +47,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSequences.class) public class SequenceMismatchStrategyFixWithSequenceGeneratorTest extends EntityManagerFactoryBasedFunctionalTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java index c0791bde46..1d782739a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java @@ -26,7 +26,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; @@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSequences.class) public class SequenceMismatchStrategyLogTest extends EntityManagerFactoryBasedFunctionalTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLowerCaseStringValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLowerCaseStringValueTest.java index 5f0520a644..10a9d5ccdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLowerCaseStringValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLowerCaseStringValueTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.id.hhh12973; import org.hibernate.id.SequenceMismatchStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @BaseUnitTest public class SequenceMismatchStrategyLowerCaseStringValueTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyNullValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyNullValueTest.java index d0c61ffe1d..a69a105839 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyNullValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyNullValueTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.id.hhh12973; import org.hibernate.id.SequenceMismatchStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.junit.jupiter.api.Test; @@ -18,7 +18,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @BaseUnitTest public class SequenceMismatchStrategyNullValueTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUnknownEnumValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUnknownEnumValueTest.java index bae1ac80c8..a86c27d461 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUnknownEnumValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUnknownEnumValueTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.id.hhh12973; import org.hibernate.HibernateException; import org.hibernate.id.SequenceMismatchStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ExceptionUtil; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @BaseUnitTest public class SequenceMismatchStrategyUnknownEnumValueTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUpperCaseStringValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUpperCaseStringValueTest.java index 9f1ed8ad52..e736aca4bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUpperCaseStringValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyUpperCaseStringValueTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.id.hhh12973; import org.hibernate.id.SequenceMismatchStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @BaseUnitTest public class SequenceMismatchStrategyUpperCaseStringValueTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java index 66067c8338..db1fb912a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java @@ -27,7 +27,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; @@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12973") +@JiraKey(value = "HHH-12973") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSequences.class) public class SequenceMismatchStrategyWithoutSequenceGeneratorTest extends EntityManagerFactoryBasedFunctionalTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassNamingStrategyTest.java index 2b71de3576..b118e42ba9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassNamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassNamingStrategyTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.id.idClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -36,7 +36,7 @@ import static org.hibernate.cfg.AvailableSettings.IMPLICIT_NAMING_STRATEGY; public class IdClassNamingStrategyTest { @Test - @TestForIssue(jiraKey = "HHH-14241") + @JiraKey(value = "HHH-14241") public void test(SessionFactoryScope scope) { scope.inTransaction( (session) -> { MyEntity entity = new MyEntity(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java index c0631e7bc4..42fd4e34dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java @@ -26,7 +26,7 @@ import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -52,7 +52,7 @@ public class NegativeValueSequenceTest { ); @Test - @TestForIssue( jiraKey = "HHH-5933") + @JiraKey( value = "HHH-5933") public void testNegativeOneAllocationSizeNoopOptimizer() { ServiceRegistryImplementor serviceRegistry = null; SessionFactoryImplementor sessionFactory = null; @@ -100,7 +100,7 @@ public class NegativeValueSequenceTest { } @Test - @TestForIssue( jiraKey = "HHH-5933") + @JiraKey( value = "HHH-5933") public void testNegativeTwoAllocationSizeNoopOptimizer() { ServiceRegistryImplementor serviceRegistry = null; SessionFactoryImplementor sessionFactory = null; @@ -149,7 +149,7 @@ public class NegativeValueSequenceTest { } @Test - @TestForIssue( jiraKey = "HHH-11709" ) + @JiraKey( value = "HHH-11709" ) public void testPositiveOneAllocationSizeNoopOptimizer() { ServiceRegistryImplementor serviceRegistry = null; SessionFactoryImplementor sessionFactory = null; @@ -197,7 +197,7 @@ public class NegativeValueSequenceTest { } @Test - @TestForIssue( jiraKey = "HHH-11709" ) + @JiraKey( value = "HHH-11709" ) public void testPositiveTwoAllocationSizeNoopOptimizer() { ServiceRegistryImplementor serviceRegistry = null; SessionFactoryImplementor sessionFactory = null; @@ -248,7 +248,7 @@ public class NegativeValueSequenceTest { } @Test - @TestForIssue( jiraKey = "HHH-11709" ) + @JiraKey( value = "HHH-11709" ) public void testPositiveTwoAllocationSizePooledOptimizer() { ServiceRegistryImplementor serviceRegistry = null; SessionFactoryImplementor sessionFactory = null; @@ -298,7 +298,7 @@ public class NegativeValueSequenceTest { } @Test - @TestForIssue( jiraKey = "HHH-11712" ) + @JiraKey( value = "HHH-11712" ) public void testNegativeTwoAllocationSizePositiveStartNoopOptimizer() { ServiceRegistryImplementor serviceRegistry = null; SessionFactoryImplementor sessionFactory = null; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java index 3cb21415d3..5709098dcf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -32,7 +32,7 @@ import static org.hamcrest.core.IsNull.notNullValue; public class OptimizerTest { @Test - @TestForIssue(jiraKey = "HHH-10166") + @JiraKey(value = "HHH-10166") public void testGenerationPastBound(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java index a63d9a5d59..4c5545f168 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Vlad Mhalcea */ -@TestForIssue(jiraKey = "HHH-13202") +@JiraKey(value = "HHH-13202") @RequiresDialect(value = PostgreSQLDialect.class) @Jpa( annotatedClasses = PostgreSQLIdentitySupportTest.Role.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceExportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceExportTest.java index 087563303c..d044763f73 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceExportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceExportTest.java @@ -15,7 +15,7 @@ import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -48,7 +48,7 @@ public class SequenceExportTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9936" ) + @JiraKey( value = "HHH-9936" ) public void testMultipleUsesOfDefaultSequenceName() { final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr ) .addAnnotatedClass( Entity1.class ) @@ -72,7 +72,7 @@ public class SequenceExportTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9936" ) + @JiraKey( value = "HHH-9936" ) public void testMultipleUsesOfExplicitSequenceName() { final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr ) .addAnnotatedClass( Entity3.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java index 0afd461271..990d744c25 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java @@ -20,7 +20,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.usertype.EnhancedUserType; import org.hibernate.usertype.UserType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -43,7 +43,7 @@ import jakarta.persistence.Table; public class UserTypeComparableIdTest { @Test - @TestForIssue(jiraKey = "HHH-8999") + @JiraKey(value = "HHH-8999") public void testUserTypeId(SessionFactoryScope scope) { SomeEntity e1 = new SomeEntity(); SomeEntity e2 = new SomeEntity(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java index 3986412e1b..36f54b94aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java @@ -23,7 +23,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.usertype.EnhancedUserType; import org.hibernate.usertype.UserType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test; public class UserTypeNonComparableIdTest { @Test - @TestForIssue(jiraKey = "HHH-8999") + @JiraKey(value = "HHH-8999") public void testUserTypeId(SessionFactoryScope scope) { SomeEntity e1 = new SomeEntity(); SomeEntity e2 = new SomeEntity(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java index 4c6c858e5b..9ef821fd04 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java @@ -15,7 +15,7 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue; * @author Vlad Mihalcea */ @RequiresDialect( SQLServerDialect.class ) -@TestForIssue( jiraKey = "HHH-12943" ) +@JiraKey( value = "HHH-12943" ) public class UUID2GeneratorStringUniqueIdentifierIdTest extends BaseEntityManagerFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassEagerQuerySelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassEagerQuerySelectTest.java index 33aac7f57b..8063f60a5d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassEagerQuerySelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassEagerQuerySelectTest.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.List; import java.util.Objects; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -38,7 +38,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16366") +@JiraKey(value = "HHH-16366") public class IdClassEagerQuerySelectTest { private static final Integer ORGANISATION_ID = 1; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassForNestedIdWithAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassForNestedIdWithAssociationTest.java index 43d278292f..e7ea0a8518 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassForNestedIdWithAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassForNestedIdWithAssociationTest.java @@ -10,7 +10,7 @@ import java.io.Serializable; import org.hibernate.boot.spi.MetadataImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -52,7 +52,7 @@ import static org.hibernate.orm.test.util.SchemaUtil.getColumnNames; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-14918") +@JiraKey(value = "HHH-14918") public class IdClassForNestedIdWithAssociationTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQuerySelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQuerySelectTest.java index bd92d95ff1..31ec1684eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQuerySelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQuerySelectTest.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.List; import java.util.Objects; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -38,7 +38,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16366") +@JiraKey(value = "HHH-16366") public class IdClassQuerySelectTest { private static final Integer ORGANISATION_ID = 1; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQueryTest.java index a1f2c523f5..f808d2a397 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassQueryTest.java @@ -6,7 +6,7 @@ import java.util.Objects; import org.hibernate.Transaction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -30,7 +30,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16387") +@JiraKey(value = "HHH-16387") public class IdClassQueryTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java index dd7af0a8de..352e094792 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.idclass; import java.io.Serializable; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; annotatedClasses = IdClassWithOneAttributeTest.SystemUser.class ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15286") +@JiraKey(value = "HHH-15286") public class IdClassWithOneAttributeTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorZeroScaleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorZeroScaleTest.java index 3a5d33ed5b..93e6cfb8bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorZeroScaleTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorZeroScaleTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.idgen.biginteger.sequence; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSequences.class ) public class BigIntegerSequenceGeneratorZeroScaleTest extends BigIntegerSequenceGeneratorTest { @Test - @TestForIssue( jiraKey = "HHH-9250") + @JiraKey( value = "HHH-9250") public void testBasics(SessionFactoryScope scope) { super.testBasics( scope ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java index 10be7c3d81..f50c4ec49e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java @@ -27,7 +27,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.exception.ConstraintViolationException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -42,7 +42,7 @@ import static org.junit.Assert.fail; * * @author Richard Barnes 4 May 2016 */ -@TestForIssue(jiraKey = "HHH-3628") +@JiraKey(value = "HHH-3628") public class HiloOptimizerConcurrencyTest extends BaseNonConfigCoreFunctionalTestCase { private boolean createSchema = true; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java index 04f3cdea8a..b8bc85600b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java @@ -10,7 +10,7 @@ import org.hibernate.id.IdentifierGeneratorHelper.BasicHolder; import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -64,7 +64,7 @@ public class BasicSequenceTest { } @Test - @TestForIssue(jiraKey = "HHH-6790") + @JiraKey(value = "HHH-6790") public void testSequencePerEntity(SessionFactoryScope scope) { final String overriddenEntityName = "SpecialEntity"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java index 9e6814e279..a33f5c1d1f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java @@ -25,7 +25,7 @@ import org.hibernate.id.enhanced.Optimizer; import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -45,7 +45,7 @@ import static org.junit.Assert.fail; /** * @author Nathan Xu */ -@TestForIssue(jiraKey = "HHH-13783") +@JiraKey(value = "HHH-13783") @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSequences.class ) @ServiceRegistry( settings = @Setting( name = AvailableSettings.SEQUENCE_INCREMENT_SIZE_MISMATCH_STRATEGY, value = "EXCEPTION" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Db2GenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Db2GenerationTest.java index 504dcb8d10..75ca07615e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Db2GenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/Db2GenerationTest.java @@ -28,7 +28,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.Type; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.hibernate.testing.util.uuid.IdGeneratorCreationContext; import org.junit.jupiter.api.Test; @@ -39,7 +39,7 @@ import static org.junit.Assert.assertThat; public class Db2GenerationTest { @Test - @TestForIssue( jiraKey = "HHH-9850" ) + @JiraKey( value = "HHH-9850" ) public void testNewGeneratorTableCreationOnDb2() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( AvailableSettings.DIALECT, DB2Dialect.class.getName() ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorJtaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorJtaTest.java index c9ffdc7869..768d956fb9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorJtaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorJtaTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.idgen.foreign; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12738") +@JiraKey(value = "HHH-12738") @Jpa( annotatedClasses = { ForeignGeneratorResourceLocalTest.Contract.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java index e13847d3eb..163094a2da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java @@ -28,7 +28,7 @@ import jakarta.persistence.Table; import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -38,7 +38,7 @@ import org.jboss.logging.Logger; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12738") +@JiraKey(value = "HHH-12738") @Jpa( annotatedClasses = { ForeignGeneratorResourceLocalTest.Contract.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java index d656d44870..a0bb805e52 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java @@ -18,7 +18,7 @@ import org.junit.Test; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertNotNull; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-13104") +@JiraKey(value = "HHH-13104") @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) @SkipForDialect(value=HANADialect.class, comment="SAP HANA requires at least value in insert value-list clause.") public class IdentityInsertSoleColumnTest extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java index 1f3cd8a858..ba32c38653 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java @@ -20,7 +20,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.mapping.KeyValue; import org.hibernate.mapping.PersistentClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; import org.junit.jupiter.api.Test; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertTrue; /** * @author Matthew Morrissette */ -@TestForIssue(jiraKey = "HHH-10429") +@JiraKey(value = "HHH-10429") @DomainModel( annotatedClasses = IdentityGeneratorExtendsTest.EntityBean.class ) public class IdentityGeneratorExtendsTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java index 21e94f2e3b..11dd0241fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Table; import org.hibernate.dialect.OracleDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-9983") +@JiraKey(value = "HHH-9983") @RequiresDialect( OracleDialect.class ) @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsIdentityColumns.class ) @DomainModel( annotatedClasses = SaveEntityTest.Company.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java index 7b6473ab42..6519612aa7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java @@ -27,7 +27,7 @@ import org.hibernate.resource.beans.container.spi.BeanContainer.LifecycleOptions import org.hibernate.resource.beans.container.spi.ContainedBean; import org.hibernate.resource.beans.internal.FallbackBeanInstanceProducer; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -51,7 +51,7 @@ import static org.mockito.Mockito.times; /** * @author Yanming Zhou */ -@TestForIssue(jiraKey = "HHH-14688") +@JiraKey(value = "HHH-14688") @FailureExpected(reason = "functionality has been removed for now") @BaseUnitTest public class UserDefinedGeneratorsTests { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java index 8227f55948..9a254a1dee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -53,7 +53,7 @@ public class IdPropertyInJoinedSubclassTest { } @Test - @TestForIssue(jiraKey = "HHH-13114") + @JiraKey(value = "HHH-13114") public void testHql(SessionFactoryScope scope) { scope.inTransaction( session -> { assertEquals( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java index 6b80f95108..7fd44ddaed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -54,7 +54,7 @@ public class IdPropertyInSingleTableSubclassTest { } @Test - @TestForIssue(jiraKey = "HHH-13114") + @JiraKey(value = "HHH-13114") public void testHql(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java index b30c22f113..a65af3c19f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; import jakarta.persistence.MappedSuperclass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -55,7 +55,7 @@ public class IdPropertyInSubclassIdInMappedSuperclassTest { } @Test - @TestForIssue(jiraKey = "HHH-13114") + @JiraKey(value = "HHH-13114") public void testHql(SessionFactoryScope scope) { scope.inTransaction( session -> { assertEquals( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java index baf4bd990f..d00ff0b034 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -54,7 +54,7 @@ public class IdPropertyInTablePerClassSubclassTest { } @Test - @TestForIssue(jiraKey = "HHH-13114") + @JiraKey(value = "HHH-13114") public void testHql(SessionFactoryScope scope) { scope.inTransaction( session -> { assertEquals( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java index 866c49c8d6..c389bb9815 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Embeddable; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -48,7 +48,7 @@ public class PropertyNamedIdInEmbeddedIdTest { } @Test - @TestForIssue(jiraKey = "HHH-13084") + @JiraKey(value = "HHH-13084") public void testHql(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java index b5bbc35c91..fbd7f926ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.IdClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -48,7 +48,7 @@ public class PropertyNamedIdInIdClassTest { } @Test - @TestForIssue(jiraKey = "HHH-13084") + @JiraKey(value = "HHH-13084") public void testHql(SessionFactoryScope scope) { scope.inTransaction( session -> { assertEquals( 2, session.createQuery( "from Person p where p.id = 0", Person.class ).list().size() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java index c2868c2b62..a6706b5593 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java @@ -10,7 +10,7 @@ import java.io.Serializable; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -47,7 +47,7 @@ public class PropertyNamedIdInNonJpaCompositeIdTest { } @Test - @TestForIssue(jiraKey = "HHH-13084") + @JiraKey(value = "HHH-13084") public void testHql(SessionFactoryScope scope) { scope.inTransaction( session -> { assertEquals( 2, session.createQuery( "from Person p where p.id = 0", Person.class ).list().size() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java index 8dac18f70d..013dac3eb0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Embeddable; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -49,7 +49,7 @@ public class PropertyNamedIdOutOfEmbeddedIdTest { } @Test - @TestForIssue(jiraKey = "HHH-13084") + @JiraKey(value = "HHH-13084") public void testHql(SessionFactoryScope scope) { scope.inTransaction( session -> { assertEquals( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java index 7e8e642f03..5e5fe65a1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.IdClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -49,7 +49,7 @@ public class PropertyNamedIdOutOfIdClassTest { } @Test - @TestForIssue(jiraKey = "HHH-13084") + @JiraKey(value = "HHH-13084") public void testHql(SessionFactoryScope scope) { scope.inTransaction( session -> { assertEquals( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java index 42ea4d570c..414bfec6de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.immutable.entitywithmutablecollection.inverse; import org.hibernate.orm.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -17,7 +17,7 @@ import org.hibernate.testing.orm.junit.RequiresDialectFeature; /** * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-4992") +@JiraKey(value = "HHH-4992") @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsTemporaryTable.class) @DomainModel( xmlMappings = "org/hibernate/orm/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml" diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java index d3d8817d27..d229256846 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.UniqueConstraint; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; * @author Vlad Paln * @author Nathan Xu */ -@TestForIssue(jiraKey = "HHH-14234") +@JiraKey(value = "HHH-14234") @RequiresDialect( value = H2Dialect.class, comment = "This test relies on 'hibernate.hbm2ddl.halt_on_error', only tested on h2; " + diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceDeleteBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceDeleteBatchTest.java index f31aea105f..490a7196a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceDeleteBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/InheritanceDeleteBatchTest.java @@ -10,7 +10,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.query.sqm.mutation.internal.inline.InlineMutationStrategy; import org.hibernate.stat.spi.StatisticsImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -32,7 +32,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-13214") +@JiraKey(value = "HHH-13214") @DomainModel( annotatedClasses = { InheritanceDeleteBatchTest.TestEntity.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java index f5bad23b60..2bb42e5b74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java @@ -1,6 +1,6 @@ package org.hibernate.orm.test.inheritance; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -20,7 +20,7 @@ import jakarta.persistence.InheritanceType; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15115") +@JiraKey(value = "HHH-15115") public class JoinedInheritanceDeletionTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java index 2cd7bc8394..271b4bff6e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.inheritance; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -30,7 +30,7 @@ import jakarta.persistence.InheritanceType; @ServiceRegistry( settings = @Setting( name = AvailableSettings.DEFAULT_SCHEMA,value = "public") ) -@TestForIssue(jiraKey = "HHH-15115") +@JiraKey(value = "HHH-15115") public class JoinedInheritanceWithDefaultSchemaDeletionTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyAbstractTablePerClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyAbstractTablePerClassTest.java index 32e67a0345..3ac6180465 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyAbstractTablePerClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/ManyToManyAbstractTablePerClassTest.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -33,7 +33,7 @@ import jakarta.persistence.Table; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestForIssue(jiraKey = "HHH-16358") +@JiraKey(value = "HHH-16358") @DomainModel( annotatedClasses = { ManyToManyAbstractTablePerClassTest.TablePerClassBase.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyAbstractTablePerClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyAbstractTablePerClassTest.java index 5b5e02b241..46167af321 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyAbstractTablePerClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/OneToManyAbstractTablePerClassTest.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -37,7 +37,7 @@ import jakarta.persistence.Table; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestForIssue(jiraKey = "HHH-16358") +@JiraKey(value = "HHH-16358") @DomainModel( annotatedClasses = { OneToManyAbstractTablePerClassTest.TablePerClassBase.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceAndShareCacheModeAllTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceAndShareCacheModeAllTest.java index d6314c4ad2..e7927369c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceAndShareCacheModeAllTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceAndShareCacheModeAllTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.inheritance; import java.util.ArrayList; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeEach; @@ -33,7 +33,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; }, sharedCacheMode = SharedCacheMode.ALL ) -@TestForIssue(jiraKey = "HHH-15699") +@JiraKey(value = "HHH-15699") public class SingleTableInheritanceAndShareCacheModeAllTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.java index 044b005db3..018c782cdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -39,7 +39,7 @@ import static org.hibernate.orm.test.inheritance.SingleTableInheritanceWithShare }, sharedCacheMode = SharedCacheMode.ALL ) -@TestForIssue(jiraKey = "HHH-15840") +@JiraKey(value = "HHH-15840") public class SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java index 69a9f40809..2bac4df395 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java @@ -30,7 +30,7 @@ import jakarta.persistence.criteria.ParameterExpression; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -47,7 +47,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; -@TestForIssue(jiraKey = "HHH-14103") +@JiraKey(value = "HHH-14103") @DomainModel( annotatedClasses = { TransientOverrideAsPersistentMappedSuperclass.Employee.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java index 527c7bf81a..75b09d4939 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java @@ -29,7 +29,7 @@ import jakarta.persistence.criteria.ParameterExpression; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; -@TestForIssue(jiraKey = "HHH-14103") +@JiraKey(value = "HHH-14103") @DomainModel( annotatedClasses = { TransientOverrideAsPersistentSingleTable.Employee.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java index 19bb8b55eb..0118fdd854 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java @@ -30,7 +30,7 @@ import jakarta.persistence.criteria.ParameterExpression; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; -@TestForIssue(jiraKey = "HHH-14103") +@JiraKey(value = "HHH-14103") @DomainModel( annotatedClasses = { TransientOverrideAsPersistentTablePerClass.Employee.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddable.java index 3967485f64..7c8dd4b955 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddable.java @@ -10,7 +10,7 @@ import java.util.List; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -47,7 +47,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; -@TestForIssue(jiraKey = "HHH-14103") +@JiraKey(value = "HHH-14103") @DomainModel( annotatedClasses = { TransientOverrideAsPersistentWithEmbeddable.Employee.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java index bc4581aa1f..9df0f06fe4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java @@ -35,7 +35,7 @@ import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -104,7 +104,7 @@ public class JoinedInheritanceEagerTest { } @Test - @TestForIssue(jiraKey = "HHH-12375") + @JiraKey(value = "HHH-12375") public void joinFindEntity(SessionFactoryScope scope) { scope.inTransaction( session -> { EntityA entityA = session.get( EntityA.class, 4L ); @@ -114,7 +114,7 @@ public class JoinedInheritanceEagerTest { } @Test - @TestForIssue(jiraKey = "HHH-12375") + @JiraKey(value = "HHH-12375") public void joinFindParenEntity(SessionFactoryScope scope) { scope.inTransaction( session -> { BaseEntity baseEntity = session.get( BaseEntity.class, 4L ); @@ -134,7 +134,7 @@ public class JoinedInheritanceEagerTest { } @Test - @TestForIssue(jiraKey = "HHH-12375") + @JiraKey(value = "HHH-12375") public void selectBaseType(SessionFactoryScope scope) { scope.inTransaction( session -> { List result = session.createQuery( "from BaseEntity" ).list(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java index 0dd98521e8..34c8570519 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java @@ -34,7 +34,7 @@ import jakarta.persistence.Inheritance; import jakarta.persistence.ManyToMany; import jakarta.persistence.MappedSuperclass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -58,7 +58,7 @@ import org.junit.jupiter.api.Test; public class MappedSuperclassExtendsEntityTest { @Test - @TestForIssue(jiraKey = "HHH-12332") + @JiraKey(value = "HHH-12332") public void testQueryingSingle(SessionFactoryScope scope) { // Make sure that the produced query for th scope.inTransaction( @@ -70,7 +70,7 @@ public class MappedSuperclassExtendsEntityTest { } @Test - @TestForIssue(jiraKey = "HHH-12332") + @JiraKey(value = "HHH-12332") public void testHql(SessionFactoryScope scope) { // Make sure that the produced query for th scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java index e633bfd1b1..55e897fdd7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.Table; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -75,7 +75,7 @@ public class MultiSingleTableLoadTest { } @Test - @TestForIssue(jiraKey = "HHH-5954") + @JiraKey(value = "HHH-5954") public void testEagerLoadMultipleHoldersWithDifferentSubtypes(SessionFactoryScope scope) { scope.inTransaction( session -> { Holder task1 = session.find( Holder.class, 1L ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/OneToManySubSelectFetchAndInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/OneToManySubSelectFetchAndInheritanceTest.java index 890dc07d32..4218bb0708 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/OneToManySubSelectFetchAndInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/OneToManySubSelectFetchAndInheritanceTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16258") +@JiraKey(value = "HHH-16258") public class OneToManySubSelectFetchAndInheritanceTest { public static final String ANOTHER_PARENT_NAME = "another parent"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/PersistChildEntitiesWithDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/PersistChildEntitiesWithDiscriminatorTest.java index 0b3ba9693d..0faf74f7c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/PersistChildEntitiesWithDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/PersistChildEntitiesWithDiscriminatorTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.inheritance.discriminator; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; @DomainModel(annotatedClasses = { ParentEntity.class, InheritingEntity.class }) -@TestForIssue(jiraKey = "HHH-6580") +@JiraKey(value = "HHH-6580") public class PersistChildEntitiesWithDiscriminatorTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java index c586a3cdeb..86de4cc6c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java @@ -12,7 +12,7 @@ import java.util.List; import org.hibernate.query.spi.QueryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Davide D'Alto */ -@TestForIssue(jiraKey = "HHH-12332") +@JiraKey(value = "HHH-12332") @DomainModel( annotatedClasses = { SingleTableInheritancePersistTest.Family.class, @@ -112,7 +112,7 @@ public class SingleTableInheritancePersistTest { } @Test - @TestForIssue(jiraKey = "HHH-15497") + @JiraKey(value = "HHH-15497") public void testFetchChildrenCountTwiceFails(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNotNullDiscriminatorSuperClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNotNullDiscriminatorSuperClassTest.java index dbf750b627..35b62c0681 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNotNullDiscriminatorSuperClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNotNullDiscriminatorSuperClassTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.InheritanceType; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author lrobot.qq@gmail.com * how to run this test case: ./gradlew :hibernate-core:test --tests '*DiscriminatorSuperClassTest' */ -@TestForIssue(jiraKey = "HHH-18282") +@JiraKey(value = "HHH-18282") @DomainModel( annotatedClasses = { SingleTableNotNullDiscriminatorSuperClassTest.RootEntity.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java index c1f738c838..4668b3bf8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -@TestForIssue(jiraKey = "HHH-12445") +@JiraKey(value = "HHH-12445") @DomainModel( annotatedClasses = { SingleTableNullNotNullDiscriminatorTest.RootEntity.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java index 61643bfacb..352fbd85f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -75,7 +75,7 @@ public class SingleTableRelationsTest { } @Test - @TestForIssue(jiraKey = "HHH-11375") + @JiraKey(value = "HHH-11375") public void testLazyInitialization(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -87,7 +87,7 @@ public class SingleTableRelationsTest { } @Test - @TestForIssue(jiraKey = "HHH-11375") + @JiraKey(value = "HHH-11375") public void testJoinFetch(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java index 0edc74b1d6..5d6574299e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ImplicitListAsBagProvider; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Davide D'Alto */ -@TestForIssue(jiraKey = "HHH-12332") +@JiraKey(value = "HHH-12332") @ServiceRegistry( settingProviders = @SettingProvider( settingName = DEFAULT_LIST_SEMANTICS, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java index 5a52059d78..e8461c76ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Davide D'Alto */ -@TestForIssue(jiraKey = "HHH-12332") +@JiraKey(value = "HHH-12332") @DomainModel( annotatedClasses = { TablePerClassInheritanceTest.Person.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java index ee438bcab8..1e7b42bee7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java @@ -30,7 +30,7 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.OrderColumn; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11037") +@JiraKey(value = "HHH-11037") @DomainModel( annotatedClasses = { JoinedSubclassWithEmbeddableTest.Person.class, JoinedSubclassWithEmbeddableTest.Employee.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java index c1f0d92c8d..81905f3b19 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java @@ -30,7 +30,7 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.OrderColumn; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11037") +@JiraKey(value = "HHH-11037") @DomainModel( annotatedClasses = { SingleTableWithEmbeddableTest.Person.class, SingleTableWithEmbeddableTest.Employee.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java index ceec7101f8..bdea3c443b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java @@ -30,7 +30,7 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.OrderColumn; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11037") +@JiraKey(value = "HHH-11037") @DomainModel( annotatedClasses = { TablePerClassWithEmbeddableTest.Person.class, TablePerClassWithEmbeddableTest.Employee.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java index f9f5346d6c..fcaf5c8e8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -@TestForIssue(jiraKey = "HHH-12445") +@JiraKey(value = "HHH-12445") @DomainModel( annotatedClasses = { JoinedNullNotNullDiscriminatorTest.RootEntity.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java index 6764a555a2..729d5dc23f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-9302") +@JiraKey(value = "HHH-9302") @DomainModel( annotatedClasses = { RootEntity.class, SubEntity.class, SubSubEntity.class, SubSubSubEntity.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java index c3c23738ea..2902ca9256 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; public class JoinedSubclassWithRootInterfaceTest { @Test - @TestForIssue(jiraKey = "HHH-11554") + @JiraKey(value = "HHH-11554") public void testIt(SessionFactoryScope scope) { scope.inTransaction( session -> { final TestEntityImpl testEntity = new TestEntityImpl(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java index dd932721ff..8713780a2d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.InheritanceType; import jakarta.persistence.PrimaryKeyJoinColumn; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Christian Beikov */ -@TestForIssue(jiraKey = "HHH-7406") +@JiraKey(value = "HHH-7406") @DomainModel( annotatedClasses = { JoinedInheritancePropertyNameConflictTest.Country.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/AlternativeToRepeatedTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/AlternativeToRepeatedTableTest.java index 73fb75417f..259246452b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/AlternativeToRepeatedTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/AlternativeToRepeatedTableTest.java @@ -17,7 +17,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.annotations.SecondaryRow; import org.hibernate.cfg.Configuration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -32,7 +32,7 @@ import static junit.framework.TestCase.assertTrue; import static org.hibernate.cfg.AvailableSettings.FORMAT_SQL; import static org.hibernate.cfg.AvailableSettings.SHOW_SQL; -@TestForIssue(jiraKey = "HHH-15932") +@JiraKey(value = "HHH-15932") public class AlternativeToRepeatedTableTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedTableTest.java index 7c9583ef58..d7e8751c1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/repeatedtable/RepeatedTableTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.inheritance.repeatedtable; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -19,7 +19,7 @@ import static junit.framework.TestCase.assertTrue; import static org.hibernate.cfg.AvailableSettings.FORMAT_SQL; import static org.hibernate.cfg.AvailableSettings.SHOW_SQL; -@TestForIssue(jiraKey = "HHH-14526") +@JiraKey(value = "HHH-14526") public class RepeatedTableTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java index 988104e710..f9c45cc6e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /* @@ -34,7 +34,7 @@ public class BatchSortingTest extends BaseInsertOrderingTest { } @Test - @TestForIssue(jiraKey = "HHH-13410") + @JiraKey(value = "HHH-13410") public void batchInsertTest() { sessionFactoryScope().inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java index fd0bcc61e7..9e0c387e39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java @@ -20,13 +20,13 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11216") +@JiraKey(value = "HHH-11216") public class ElementCollectionTest extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingCircularDependencyFalsePositiveTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingCircularDependencyFalsePositiveTest.java index 0b829fa835..eae1d0ae51 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingCircularDependencyFalsePositiveTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingCircularDependencyFalsePositiveTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.insertordering; import org.hibernate.cfg.Environment; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Test; @@ -30,7 +30,7 @@ import java.util.Set; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; -@TestForIssue(jiraKey = "HHH-16485") +@JiraKey(value = "HHH-16485") @RequiresDialectFeature(DialectChecks.SupportsJdbcDriverProxying.class) public class InsertOrderingCircularDependencyFalsePositiveTest extends BaseNonConfigCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java index 426ce2d52f..9662380710 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java @@ -18,13 +18,13 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-11634") +@JiraKey(value = "HHH-11634") public class InsertOrderingDuplicateTest extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java index 292fa7f091..d529f4caa1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java @@ -18,13 +18,13 @@ import jakarta.persistence.ManyToMany; import jakarta.persistence.OneToOne; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-12380") +@JiraKey(value = "HHH-12380") public class InsertOrderingHasParentTest extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java index 6dcaaa907d..58975e8af7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java @@ -9,14 +9,14 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.MappedSuperclass; import jakarta.persistence.OneToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Normunds Gavars * @author Nathan Xu */ -@TestForIssue(jiraKey = "HHH-14227") +@JiraKey(value = "HHH-14227") public class InsertOrderingReferenceDifferentSubclassTest extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRootEntityNameDependencyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRootEntityNameDependencyTest.java index 82c7d6ab5a..3b98ca0917 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRootEntityNameDependencyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRootEntityNameDependencyTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.insertordering; import org.hibernate.cfg.Environment; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Test; @@ -29,7 +29,7 @@ import java.util.Set; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; -@TestForIssue(jiraKey = "HHH-16485") +@JiraKey(value = "HHH-16485") @RequiresDialectFeature(DialectChecks.SupportsJdbcDriverProxying.class) public class InsertOrderingRootEntityNameDependencyTest extends BaseNonConfigCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java index f21c66e692..fa771396df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java @@ -20,7 +20,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test; * @author Harikant Verma * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-13068") +@JiraKey(value = "HHH-13068") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJdbcDriverProxying.class) @Jpa( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java index bbcd18f4f9..fee0ec122f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.SQLRestriction; import org.hibernate.annotations.SortNatural; import org.hibernate.community.dialect.AltibaseDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SkipForDialect; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ import jakarta.persistence.OneToMany; * @author Normunds Gavars * @author Nathan Xu */ -@TestForIssue(jiraKey = "HHH-14227") +@JiraKey(value = "HHH-14227") @SkipForDialect( dialectClass = AltibaseDialect.class, reason = "'TYPE' is not escaped even though autoQuoteKeywords is enabled") public class InsertOrderingSelfReferenceTest extends BaseInsertOrderingTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java index 096040fae6..936afb91fb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java @@ -15,7 +15,7 @@ import jakarta.persistence.ManyToOne; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12407") +@JiraKey(value = "HHH-12407") @SessionFactory @DomainModel( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java index b2481c23a7..c68e8d783d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java @@ -17,13 +17,13 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToMany; import jakarta.persistence.SequenceGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-9864") +@JiraKey(value = "HHH-9864") public class InsertOrderingWithBidirectionalManyToMany extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java index b152224503..44ae2b7170 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java @@ -16,13 +16,13 @@ import jakarta.persistence.MapsId; import jakarta.persistence.OneToOne; import jakarta.persistence.SequenceGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-9864") +@JiraKey(value = "HHH-9864") public class InsertOrderingWithBidirectionalMapsIdOneToOne extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java index e3460ade85..0d5fa33c74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java @@ -18,13 +18,13 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.SequenceGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-9864") +@JiraKey(value = "HHH-9864") public class InsertOrderingWithBidirectionalOneToMany extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java index 0fd825635e..fa2d80ef60 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java @@ -16,13 +16,13 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.SequenceGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; import static jakarta.persistence.CascadeType.PERSIST; import static jakarta.persistence.GenerationType.SEQUENCE; -@TestForIssue(jiraKey = "HHH-12074") +@JiraKey(value = "HHH-12074") public class InsertOrderingWithBidirectionalOneToManyFlushProblem extends BaseInsertOrderingTest { @Test @@ -81,7 +81,7 @@ public class InsertOrderingWithBidirectionalOneToManyFlushProblem extends BaseIn } @Test - @TestForIssue(jiraKey = "HHH-12086") + @JiraKey(value = "HHH-12086") public void testBatchingWithFlush2() { sessionFactoryScope().inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java index bfd9e388fb..d167f31f9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java @@ -15,13 +15,13 @@ import jakarta.persistence.Id; import jakarta.persistence.OneToOne; import jakarta.persistence.SequenceGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-9864") +@JiraKey(value = "HHH-9864") public class InsertOrderingWithBidirectionalOneToOne extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java index e6ffe6e946..412ccfb160 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java @@ -15,11 +15,11 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; -@TestForIssue(jiraKey = "HHH-12105") +@JiraKey(value = "HHH-12105") public class InsertOrderingWithBidirectionalOneToOneFlushProblem extends BaseInsertOrderingTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java index a0d034ec27..97fe493a6d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java @@ -21,7 +21,7 @@ import jakarta.persistence.TableGenerator; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -49,7 +49,7 @@ import org.junit.jupiter.api.Test; public class InsertOrderingWithCascadeOnPersist { @Test - @TestForIssue(jiraKey = "HHH-11768") + @JiraKey(value = "HHH-11768") public void testInsertOrderingAvoidingForeignKeyConstraintViolation(SessionFactoryScope scope) { Long bidId = scope.fromTransaction( session -> { // create MarketBid and Group diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java index b868fce20c..f7a245c5b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java @@ -21,7 +21,7 @@ import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12355") +@JiraKey(value = "HHH-12355") @Jpa( annotatedClasses = { InsertOrderingWithCompositeTypeAssociation.Book.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java index 9e48e69d95..df55a8c594 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java @@ -11,7 +11,7 @@ import java.util.Set; import org.hibernate.annotations.BatchSize; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-9864") +@JiraKey(value = "HHH-9864") public class InsertOrderingWithJoinedTableInheritance extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java index 8872cefc73..8fe73d0262 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java @@ -12,7 +12,7 @@ import java.util.Set; import org.hibernate.annotations.BatchSize; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.After; import org.junit.jupiter.api.Test; @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-9864") +@JiraKey(value = "HHH-9864") public class InsertOrderingWithJoinedTableMultiLevelInheritance extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java index bb3bca2017..cf52d07b13 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java @@ -14,13 +14,13 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.SequenceGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-9864") +@JiraKey(value = "HHH-9864") public class InsertOrderingWithManyToOne extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java index 205e9ded2d..cb83f1a873 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java @@ -11,13 +11,13 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-11996") +@JiraKey(value = "HHH-11996") public class InsertOrderingWithMultipleManyToOne extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java index 8bca2b78db..598c69a848 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java @@ -28,13 +28,13 @@ import jakarta.persistence.SecondaryTable; import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11714") +@JiraKey(value = "HHH-11714") public class InsertOrderingWithSecondaryTable extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java index f3643e7ee4..9736b27780 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java @@ -11,7 +11,7 @@ import java.util.Set; import org.hibernate.annotations.BatchSize; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -36,7 +36,7 @@ import jakarta.persistence.Table; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-9864") +@JiraKey(value = "HHH-9864") public class InsertOrderingWithSingleTableInheritance extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java index 7da90e16b6..22aaf1dd2c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java @@ -11,7 +11,7 @@ import java.util.Set; import org.hibernate.annotations.BatchSize; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -34,7 +34,7 @@ import jakarta.persistence.Table; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-9864") +@JiraKey(value = "HHH-9864") public class InsertOrderingWithTablePerClassInheritance extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java index 71498fe4ee..9ad94807b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java @@ -15,14 +15,14 @@ import jakarta.persistence.Id; import jakarta.persistence.OneToOne; import jakarta.persistence.SequenceGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-9864") +@JiraKey(value = "HHH-9864") public class InsertOrderingWithUnidirectionalOneToOne extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java index ad1ece9740..afea1a0a61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java @@ -16,7 +16,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; import jakarta.persistence.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12569") +@JiraKey(value = "HHH-12569") public class InsertOrderingWithUnidirectionalOneToOneJoinColumn extends BaseInsertOrderingTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java index 608b99262f..d2182b7628 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java @@ -25,7 +25,7 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test; * @author Chris Cranford */ @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class) -@TestForIssue(jiraKey = "HHH-13053") +@JiraKey(value = "HHH-13053") @Jpa( annotatedClasses = { UpdateOrderingIdentityIdentifierTest.Animal.class, UpdateOrderingIdentityIdentifierTest.Zoo.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java index 951279e663..7266c7da22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java @@ -21,7 +21,7 @@ import org.hibernate.Interceptor; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.TransactionException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.resource.jdbc.internal.EmptyStatementInspector; @@ -96,7 +96,7 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase { * causes EntityPersister.findDirty() to return no dirty properties. */ @Test - @TestForIssue(jiraKey = "HHH-1921") + @JiraKey(value = "HHH-1921") public void testPropertyIntercept2() { Session s = openSession(); Transaction t = s.beginTransaction(); @@ -300,7 +300,7 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-6594") + @JiraKey(value = "HHH-6594") public void testPrepareStatementIntercept() { final Queue expectedSQLs = new LinkedList<>(); // Transaction 1 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/FlushModeConfigTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/FlushModeConfigTest.java index 5badc03a8f..3aa53f2fff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/FlushModeConfigTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/FlushModeConfigTest.java @@ -14,7 +14,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.jpa.HibernateHints; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.params.ParameterizedTest; @@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Nathan Xu */ -@TestForIssue( jiraKey = "HHH-13677" ) +@JiraKey( value = "HHH-13677" ) @BaseUnitTest public class FlushModeConfigTest { @ParameterizedTest diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java index 5117e1fc99..4d1a6c02ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java @@ -16,7 +16,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -136,7 +136,7 @@ public class ReflectHelperTest { assertNotNull( ReflectHelper.findSetterMethod( C.class, "id", Integer.class ) ); } - @TestForIssue(jiraKey = "HHH-12090") + @JiraKey(value = "HHH-12090") @Test public void test_getMethod_nestedInterfaces_on_superclasses() throws InvocationTargetException, IllegalAccessException { @@ -149,7 +149,7 @@ public class ReflectHelperTest { assertEquals( OFF, statusMethodFClass.invoke( new F() ) ); } - @TestForIssue(jiraKey = "HHH-12090") + @JiraKey(value = "HHH-12090") @Test public void test_setMethod_nestedInterfaces_on_superclasses() { assertNotNull( ReflectHelper.findSetterMethod( E.class, "id", String.class ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java index 31409ea73c..7ef41bf70d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Lob; import jakarta.persistence.TypedQuery; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; * @author Dragoş Haiduc * @author Nathan Xu */ -@TestForIssue( jiraKey = "HHH-14231" ) +@JiraKey( value = "HHH-14231" ) @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsExpectedLobUsagePattern.class ) @Jpa( annotatedClasses = ScrollableResultsObjectArrayCastingTest.Product.class ) public class ScrollableResultsObjectArrayCastingTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/SessionBuilderFlushModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/SessionBuilderFlushModeTest.java index d67291a211..22af9735a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/SessionBuilderFlushModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/SessionBuilderFlushModeTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.internal.util; import org.hibernate.FlushMode; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Michael Spahn */ -@TestForIssue(jiraKey = "HHH-13974") +@JiraKey(value = "HHH-13974") @DomainModel @SessionFactory public class SessionBuilderFlushModeTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/NoDatabaseMetaDataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/NoDatabaseMetaDataTest.java index 32f3d9d172..1060baa7f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/NoDatabaseMetaDataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/NoDatabaseMetaDataTest.java @@ -14,7 +14,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue; public class NoDatabaseMetaDataTest extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-10515" ) + @JiraKey( value = "HHH-10515" ) public void testNoJdbcMetadataDefaultDialect() { final StandardServiceRegistry serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( "hibernate.temp.use_jdbc_metadata_defaults", "false" ) @@ -54,7 +54,7 @@ public class NoDatabaseMetaDataTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-10515" ) + @JiraKey( value = "HHH-10515" ) public void testNoJdbcMetadataDialectOverride() { final StandardServiceRegistry serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( "hibernate.temp.use_jdbc_metadata_defaults", "false" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/TestKeywordRecognition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/TestKeywordRecognition.java index 3a9dcf1cb8..abb31d91aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/TestKeywordRecognition.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/TestKeywordRecognition.java @@ -12,7 +12,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -42,7 +42,7 @@ public class TestKeywordRecognition extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH_9768" ) + @JiraKey( value = "HHH-9768" ) public void testAnsiSqlKeyword() { // END is ANSI SQL keyword diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/refcursor/StandardRefCursorSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/refcursor/StandardRefCursorSupportTest.java index f8a74f1d6f..446580b24e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/refcursor/StandardRefCursorSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/refcursor/StandardRefCursorSupportTest.java @@ -11,7 +11,7 @@ import java.sql.SQLException; import org.hibernate.engine.jdbc.cursor.internal.StandardRefCursorSupport; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import org.mockito.Mockito; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat; * * @author Daniel Heinrich */ -@TestForIssue(jiraKey = "HHH-10612") +@JiraKey(value = "HHH-10612") public class StandardRefCursorSupportTest { interface TestDatabaseMetaData extends DatabaseMetaData { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java index 9c96ae6708..acbb03ea06 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-11241") +@JiraKey(value = "HHH-11241") @DomainModel( xmlMappings = "org/hibernate/orm/test/join/Reportable.hbm.xml" ) @@ -57,7 +57,7 @@ public class SubclassesWithSamePropertyNameTest { } @Test - @TestForIssue(jiraKey = "HHH-11241") + @JiraKey(value = "HHH-11241") public void testGetSuperclass(SessionFactoryScope scope) { scope.inTransaction( s -> { @@ -69,7 +69,7 @@ public class SubclassesWithSamePropertyNameTest { } @Test - @TestForIssue(jiraKey = "HHH-11241") + @JiraKey(value = "HHH-11241") public void testQuerySuperclass(SessionFactoryScope scope) { scope.inTransaction( s -> { @@ -84,7 +84,7 @@ public class SubclassesWithSamePropertyNameTest { } @Test - @TestForIssue(jiraKey = "HHH-11241") + @JiraKey(value = "HHH-11241") public void testCriteriaSuperclass(SessionFactoryScope scope) { scope.inTransaction( s -> { @@ -105,7 +105,7 @@ public class SubclassesWithSamePropertyNameTest { } @Test - @TestForIssue(jiraKey = "HHH-11241") + @JiraKey(value = "HHH-11241") public void testQuerySubclass(SessionFactoryScope scope) { scope.inTransaction( s -> { @@ -120,7 +120,7 @@ public class SubclassesWithSamePropertyNameTest { } @Test - @TestForIssue(jiraKey = "HHH-11241") + @JiraKey(value = "HHH-11241") public void testCriteriaSubclass(SessionFactoryScope scope) { scope.inTransaction( s -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java index 3bcd8c757a..d4830cbd19 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -50,7 +50,7 @@ public class JoinedSubclassWithEmbeddableTest { } @Test - @TestForIssue(jiraKey = "HHH-10920") + @JiraKey(value = "HHH-10920") public void testEmbeddedFieldIsNotNull(SessionFactoryScope scope) { scope.inTransaction( session -> { final ConcreteEntity entity = session.get( ConcreteEntity.class, 1L ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java index 4e7b9f0d1b..7436c3bbf2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java @@ -19,7 +19,7 @@ import org.hibernate.community.dialect.AltibaseDialect; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.JoinedSubclassEntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-6911") +@JiraKey(value = "HHH-6911") @DomainModel( annotatedClasses = { JoinedSubclassWithExplicitDiscriminatorTest.Animal.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java index 69139fa9df..eb208d50d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java @@ -19,7 +19,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.JoinedSubclassEntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-6911") +@JiraKey(value = "HHH-6911") @DomainModel( annotatedClasses = { JoinedSubclassWithIgnoredExplicitDiscriminatorTest.Animal.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java index 0b4e47140e..38da0c9363 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java @@ -11,7 +11,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.JoinedSubclassEntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-6911") +@JiraKey(value = "HHH-6911") @DomainModel( annotatedClasses = { JoinedSubclassWithImplicitDiscriminatorTest.Animal.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java index dbb362fa71..bde63c48fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java @@ -13,7 +13,7 @@ import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * * @author dcebotarenco */ -@TestForIssue(jiraKey = "HHH-2558") +@JiraKey(value = "HHH-2558") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class) @DomainModel( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java index daf66609e1..612e7debc0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java @@ -13,7 +13,7 @@ import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12968\n") +@JiraKey(value = "HHH-12968\n") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSequences.class) @DomainModel( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java index a699ab1306..b97ab0e0cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.jpa; import jakarta.persistence.EntityManager; import jakarta.persistence.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -@TestForIssue( jiraKey = "HHH-9029") +@JiraKey( value = "HHH-9029") @Jpa(annotatedClasses = { EntityWithCompositeId.class, CompositeId.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CriteriaWithWhereClauseAndColumnDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CriteriaWithWhereClauseAndColumnDefinitionTest.java index e7ab641823..c4b673e34c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CriteriaWithWhereClauseAndColumnDefinitionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CriteriaWithWhereClauseAndColumnDefinitionTest.java @@ -7,7 +7,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.SybaseDialect; import org.hibernate.dialect.TiDBDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -35,7 +35,7 @@ import jakarta.persistence.criteria.Subquery; CriteriaWithWhereClauseAndColumnDefinitionTest.Task.class } ) -@TestForIssue(jiraKey = "HHH-15805") +@JiraKey(value = "HHH-15805") @RequiresDialects({ @RequiresDialect(MariaDBDialect.class), @RequiresDialect(MySQLDialect.class), diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java index 345ec52de3..bd22d100ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Parameter; import jakarta.persistence.Query; import jakarta.persistence.TemporalType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertFalse; @@ -30,7 +30,7 @@ import static org.junit.Assert.fail; public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase { @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testGetMetamodel() { EntityManager em = getOrCreateEntityManager(); em.close(); @@ -44,7 +44,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testGetMetamodelWithTransaction () { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -66,7 +66,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testGetCriteriaBuilder() { EntityManager em = getOrCreateEntityManager(); em.close(); @@ -80,7 +80,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testGetCriteriaBuilderWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -102,7 +102,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testGetEntityManagerFactory() { EntityManager em = getOrCreateEntityManager(); em.close(); @@ -116,7 +116,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testGetEntityManagerFactoryWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -138,7 +138,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testCreateNamedQuery() { EntityManager em = getOrCreateEntityManager(); em.close(); @@ -152,7 +152,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testCreateNamedQueryWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -174,7 +174,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testGetFlushMode() { EntityManager em = getOrCreateEntityManager(); em.close(); @@ -188,7 +188,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testSetFlushMode() { EntityManager em = getOrCreateEntityManager(); em.close(); @@ -202,7 +202,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testGetDelegate() { EntityManager em = getOrCreateEntityManager(); em.close(); @@ -216,7 +216,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryGetParametersWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -240,7 +240,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryGetParameterByPositionWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -264,7 +264,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryGetParameterByNameWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -287,7 +287,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryGetParameterValueByParameterWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -312,7 +312,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryGetParameterValueByStringWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -336,7 +336,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryIsBound() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where name = :name" ); @@ -353,7 +353,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetFirstResult() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where name = :name" ); @@ -369,7 +369,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetFlushMode() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where name = :name" ); @@ -385,7 +385,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetLockMode() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where name = :name" ); @@ -401,7 +401,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetCalendarDateParameterByPosition() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where birthDay = ?1" ); @@ -416,7 +416,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetDateParameterByPosition() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where birthDay = ?1" ); @@ -431,7 +431,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetIntParameterByPosition() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where intValue = ?1" ); @@ -446,7 +446,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetCalendarDateParameterByParameter() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where birthDay = ?1" ); @@ -462,7 +462,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetDateParameterByParameter() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where birthDay = ?1" ); @@ -478,7 +478,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetIntParameterByParameter() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where intValue = ?1" ); @@ -494,7 +494,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetCalendarParameterByName() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where birthDay = :bday" ); @@ -509,7 +509,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryGetSingleResult() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity" ); @@ -524,7 +524,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetDateParameterByName() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where birthDay = :bday" ); @@ -539,7 +539,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQuerySetIntParameterByName() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity where intValue = :ival" ); @@ -554,7 +554,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryGetFlushMode() { EntityManager em = getOrCreateEntityManager(); Query query = em.createQuery( "from AnEntity" ); @@ -569,7 +569,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryGetFlushModeWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -591,7 +591,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryGetLockModeWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -614,7 +614,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryGetMaxResultsWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -636,7 +636,7 @@ public class EntityManagerClosedTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-12110") + @JiraKey( value = "HHH-12110") public void testQueryGetFirstResultWithTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java index b818afa386..86e8e988e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java @@ -13,7 +13,7 @@ import org.hibernate.SessionFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.SessionFactoryImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * Test various unwrap scenarios for {@code EntityManagerFactory}. */ -@TestForIssue(jiraKey = "HHH-9665") +@JiraKey(value = "HHH-9665") @Jpa public class EntityManagerFactoryUnwrapTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java index 0229adcb38..28d3011e60 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java @@ -23,7 +23,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.jpa.HibernateHints; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.EntityExistsException; @@ -299,7 +299,7 @@ public class EntityManagerTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "EJB-9" ) + @JiraKey( value = "EJB-9" ) public void testGet() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -489,7 +489,7 @@ public class EntityManagerTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-11958" ) + @JiraKey( value = "HHH-11958" ) public void testReadonlyHibernateQueryHint() { EntityManager em = getOrCreateEntityManager(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java index 1095343887..6a080dbbd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java @@ -23,7 +23,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -38,7 +38,7 @@ import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.LoggerConfig; -@TestForIssue(jiraKey = "HHH-13244") +@JiraKey(value = "HHH-13244") @Jpa( annotatedClasses = { JpaProxyComplianceWithDebugTest.MvnoBillingAgreement.class, @@ -77,7 +77,7 @@ public class JpaProxyComplianceWithDebugTest { @Test - @TestForIssue(jiraKey = "HHH-13244") + @JiraKey(value = "HHH-13244") public void testJpaComplianceProxyWithDebug(EntityManagerFactoryScope scope) { LoggerContext context = (LoggerContext) LogManager.getContext( false ); Configuration configuration = context.getConfiguration(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NamedQueryTransactionFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NamedQueryTransactionFailureTest.java index 30b607139b..df83260bbb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NamedQueryTransactionFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NamedQueryTransactionFailureTest.java @@ -17,7 +17,7 @@ import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; import org.hibernate.resource.transaction.spi.TransactionCoordinator; import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import org.mockito.Mockito; @@ -77,7 +77,7 @@ public class NamedQueryTransactionFailureTest extends BaseEntityManagerFunctiona } @Test - @TestForIssue( jiraKey = "HHH-11997" ) + @JiraKey( value = "HHH-11997" ) public void testNamedQueryWithMarkForRollbackOnlyFailure() { try { doInJPA( this::entityManagerFactory, entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaQueryTest.java index a1170cc442..f1befe102f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/toone/CriteriaQueryTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; CriteriaQueryTest.Order.class, } ) -@TestForIssue( jiraKey = "HHH-15167") +@JiraKey( value = "HHH-15167") public class CriteriaQueryTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java index dcd9756672..0e8b9d8fdc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java @@ -26,7 +26,7 @@ import org.hibernate.annotations.DynamicUpdate; import org.hibernate.cfg.AvailableSettings; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@TestForIssue(jiraKey = "HHH-12718") +@JiraKey(value = "HHH-12718") public class PreUpdateCustomEntityDirtinessStrategyTest extends BaseNonConfigCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java index 92b3d0a8b2..b50d3d5069 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java @@ -24,7 +24,7 @@ import org.hibernate.SessionBuilder; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.type.Type; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -33,7 +33,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernateSes import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -@TestForIssue(jiraKey = "HHH-12718") +@JiraKey(value = "HHH-12718") public class PreUpdateDirtyCheckingInterceptorTest extends BaseNonConfigCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java index 7ec202c903..c6799a8f95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.PreUpdate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestForIssue(jiraKey = "HHH-13466") +@JiraKey(value = "HHH-13466") @Jpa(annotatedClasses = { PreUpdateNewBidirectionalBagTest.Person.class, PreUpdateNewBidirectionalBagTest.Tag.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java index 3272debd40..4ae86ca7ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.Id; import jakarta.persistence.OneToMany; import jakarta.persistence.PreUpdate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestForIssue(jiraKey = "HHH-13466") +@JiraKey(value = "HHH-13466") @Jpa(annotatedClasses = { PreUpdateNewUnidirectionalBagTest.Person.class, PreUpdateNewUnidirectionalBagTest.Tag.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java index 9e977207e0..757ecfb4ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java @@ -17,7 +17,7 @@ import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.CollectionIdJdbcTypeCode; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -35,7 +35,7 @@ import jakarta.persistence.PreUpdate; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestForIssue(jiraKey = "HHH-13466") +@JiraKey(value = "HHH-13466") @Jpa(annotatedClasses = { PreUpdateNewUnidirectionalIdBagTest.Person.class, PreUpdateNewUnidirectionalIdBagTest.Tag.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java index 6e9ab19423..3734aba797 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java @@ -21,7 +21,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.proxy.ProxyFactory; import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyFactory; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; @@ -39,7 +39,7 @@ import java.lang.invoke.MethodHandles; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -@TestForIssue(jiraKey = "HHH-13020") +@JiraKey(value = "HHH-13020") @Jpa(annotatedClasses = { PrivateConstructorTest.Parent.class, PrivateConstructorTest.Child.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java index 94c6b5b2e9..6ca84d493c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -@TestForIssue( jiraKey = "HHH-13020" ) +@JiraKey( value = "HHH-13020" ) @Jpa(annotatedClasses = { ProtectedConstructorTest.Parent.class, ProtectedConstructorTest.Child.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java index 11383f3ca4..89707aa91c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.callbacks.hbmxml; import jakarta.persistence.EntityManagerFactory; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -25,7 +25,7 @@ public class MappingClassMoreThanOnceTest { * Tests that an entity manager can be created when a class is mapped more than once. */ @Test - @TestForIssue(jiraKey = "HHH-8775") + @JiraKey(value = "HHH-8775") public void testBootstrapWithClassMappedMOreThanOnce(EntityManagerFactoryScope scope) { EntityManagerFactory emf = null; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/EntityListenerViaXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/EntityListenerViaXmlTest.java index 34c5c75ef9..861dab5af6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/EntityListenerViaXmlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/xml/EntityListenerViaXmlTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.callbacks.xml; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -33,7 +33,7 @@ public class EntityListenerViaXmlTest { } @Test - @TestForIssue(jiraKey = "HHH-9771") + @JiraKey(value = "HHH-9771") public void testUsage(EntityManagerFactoryScope scope) { JournalingListener.reset(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java index 4394d7ddb9..bc26bcf011 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java @@ -27,7 +27,7 @@ import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.ImplicitListAsBagProvider; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; @@ -92,7 +92,7 @@ public class MultiLevelCascadeCollectionEmbeddableTest { } @Test - @TestForIssue( jiraKey = "HHH-12294" ) + @JiraKey( value = "HHH-12294" ) public void testHibernateDeleteEntityInitializeCollections(EntityManagerFactoryScope scope) { if ( !initialized ) { initialize(scope); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java index 0185adea00..f18e72ff13 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java @@ -26,7 +26,7 @@ import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.ImplicitListAsBagProvider; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; @@ -94,7 +94,7 @@ public class MultiLevelCascadeCollectionIdClassTest { } @Test - @TestForIssue( jiraKey = "HHH-12294" ) + @JiraKey( value = "HHH-12294" ) public void testHibernateDeleteEntityInitializeCollections(EntityManagerFactoryScope scope) { if ( !initialized ) { initialize(scope); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java index f8fff50c74..ea7c885900 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -74,7 +74,7 @@ public class MultiLevelCascadeRegularIdBasedParentChildAssociationTest { } @Test - @TestForIssue( jiraKey = "HHH-12291" ) + @JiraKey( value = "HHH-12291" ) public void testHibernateDeleteEntityWithoutInitializingCollections(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeTest.java index 5018771536..add0c7501a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.cascade.multilevel; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -35,7 +35,7 @@ public class MultiLevelCascadeTest { ); } - @TestForIssue(jiraKey = "HHH-5299") + @JiraKey(value = "HHH-5299") @Test public void test(EntityManagerFactoryScope scope) { final Top top = new Top(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/FetchEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/FetchEmbeddedIdTest.java index 824e4413fe..1911bf595a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/FetchEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/FetchEmbeddedIdTest.java @@ -6,7 +6,7 @@ import java.util.Objects; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; FetchEmbeddedIdTest.UserGroup.class } ) -@TestForIssue( jiraKey = "HHH-15875") +@JiraKey( value = "HHH-15875") public class FetchEmbeddedIdTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EmbeddableInQueryResultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EmbeddableInQueryResultTest.java index cb14ef457b..41d9648b62 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EmbeddableInQueryResultTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/EmbeddableInQueryResultTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.jpa.compliance; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeEach; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotSame; EmbeddableInQueryResultTest.Person.class, } ) -@TestForIssue( jiraKey = "HHH-15223") +@JiraKey( value = "HHH-15223") public class EmbeddableInQueryResultTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JtaIllegalArgumentExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JtaIllegalArgumentExceptionTest.java index 2a3a00e36f..99d78a576a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JtaIllegalArgumentExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/JtaIllegalArgumentExceptionTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.jpa.compliance; import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.jpa.transaction.JtaPlatformSettingProvider; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -27,7 +27,7 @@ import jakarta.persistence.Id; ) } ) -@TestForIssue( jiraKey = "HHH-15225") +@JiraKey( value = "HHH-15225") public class JtaIllegalArgumentExceptionTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedFactoryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedFactoryTests.java index e6f179c9ea..00f221e52a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedFactoryTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/ClosedFactoryTests.java @@ -15,7 +15,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.spi.SessionFactoryBuilderImplementor; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -26,7 +26,7 @@ import static org.junit.Assert.fail; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "12097") +@JiraKey( value = "12097") public class ClosedFactoryTests extends BaseUnitTestCase { @Test public void testClosedChecks() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java index 571f2a8ae8..2f65f2b01e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java @@ -12,7 +12,7 @@ import jakarta.persistence.OneToOne; import org.hibernate.boot.MetadataSources; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -20,7 +20,7 @@ import org.junit.Test; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "12096") +@JiraKey( value = "12096") public class GetterAndIsMethodChecks extends BaseUnitTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java index efa4185e48..2dd6d9da9a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java @@ -17,7 +17,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -25,7 +25,7 @@ import org.junit.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-12157") +@JiraKey(value = "HHH-12157") public class TableGeneratorMultipleDefinitionTest extends BaseUnitTestCase { @Test(expected = IllegalArgumentException.class) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java index acf825cb1a..f520fca233 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.TableGenerator; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -23,7 +23,7 @@ import org.junit.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-12157") +@JiraKey(value = "HHH-12157") public class TableGeneratorVisibilityTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java index 2c7fb986c9..2570e433d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -32,7 +32,7 @@ import static junit.framework.Assert.assertEquals; public class MapKeyColumnBiDiOneToManyFKTest extends BaseNonConfigCoreFunctionalTestCase { @Test - @TestForIssue( jiraKey = "HHH-12150" ) + @JiraKey( value = "HHH-12150" ) public void testReferenceToAlreadyMappedColumn() { inTransaction( session -> { @@ -67,7 +67,7 @@ public class MapKeyColumnBiDiOneToManyFKTest extends BaseNonConfigCoreFunctional } @Test - @TestForIssue( jiraKey = "HHH-12150" ) + @JiraKey( value = "HHH-12150" ) public void testReferenceToNonMappedColumn() { inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java index 53c52193d4..e4f1b9c824 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -31,7 +31,7 @@ import static junit.framework.Assert.assertEquals; public class MapKeyColumnElementCollectionTest extends BaseNonConfigCoreFunctionalTestCase { @Test - @TestForIssue( jiraKey = "HHH-12150" ) + @JiraKey( value = "HHH-12150" ) public void testReferenceToAlreadyMappedColumn() { inTransaction( session -> { @@ -64,7 +64,7 @@ public class MapKeyColumnElementCollectionTest extends BaseNonConfigCoreFunction } @Test - @TestForIssue( jiraKey = "HHH-12150" ) + @JiraKey( value = "HHH-12150" ) public void testReferenceToNonMappedColumn() { inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java index 70e5e4a223..b7a5cfd218 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -30,7 +30,7 @@ import static junit.framework.Assert.assertEquals; public class MapKeyColumnManyToManyTest extends BaseNonConfigCoreFunctionalTestCase { @Test - @TestForIssue( jiraKey = "HHH-12150" ) + @JiraKey( value = "HHH-12150" ) public void testReferenceToAlreadyMappedColumn() { inTransaction( session -> { @@ -64,7 +64,7 @@ public class MapKeyColumnManyToManyTest extends BaseNonConfigCoreFunctionalTestC } @Test - @TestForIssue( jiraKey = "HHH-12150" ) + @JiraKey( value = "HHH-12150" ) public void testReferenceToNonMappedColumn() { inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java index 0be636ceaf..dc6d0e480c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -31,7 +31,7 @@ import static junit.framework.Assert.assertEquals; public class MapKeyColumnOneToManyFKTest extends BaseNonConfigCoreFunctionalTestCase { @Test - @TestForIssue( jiraKey = "HHH-12150" ) + @JiraKey( value = "HHH-12150" ) public void testReferenceToAlreadyMappedColumn() { inTransaction( session -> { @@ -65,7 +65,7 @@ public class MapKeyColumnOneToManyFKTest extends BaseNonConfigCoreFunctionalTest } @Test - @TestForIssue( jiraKey = "HHH-12150" ) + @JiraKey( value = "HHH-12150" ) public void testReferenceToNonMappedColumn() { inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java index 6ca3c2bff1..2e0a85a168 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -30,7 +30,7 @@ import static junit.framework.Assert.assertEquals; public class MapKeyColumnOneToManyJoinTableTest extends BaseNonConfigCoreFunctionalTestCase { @Test - @TestForIssue( jiraKey = "HHH-12150" ) + @JiraKey( value = "HHH-12150" ) public void testReferenceToAlreadyMappedColumn() { inTransaction( session -> { @@ -64,7 +64,7 @@ public class MapKeyColumnOneToManyJoinTableTest extends BaseNonConfigCoreFunctio } @Test - @TestForIssue( jiraKey = "HHH-12150" ) + @JiraKey( value = "HHH-12150" ) public void testReferenceToNonMappedColumn() { inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java index 2bb7d40fe4..b5175723d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java @@ -12,7 +12,7 @@ import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.orm.test.util.connections.ConnectionCheckingConnectionProvider; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12197") +@JiraKey(value = "HHH-12197") @RequiresDialect(H2Dialect.class) @Jpa( annotatedClasses = { ConnectionsReleaseAutoCommitTest.Thing.class }, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/JdbcTypeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/JdbcTypeConverterTest.java index 2364869902..f782599817 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/JdbcTypeConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/JdbcTypeConverterTest.java @@ -13,7 +13,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class JdbcTypeConverterTest { @Test - @TestForIssue(jiraKey = "HHH-12586") + @JiraKey(value = "HHH-12586") public void testJava8TimeObjectsUsingJdbcSqlTypeDescriptors(EntityManagerFactoryScope scope) { // Because some databases do not support millisecond values in timestamps, we clear it here. // This will serve sufficient for our test to verify that the retrieved values match persisted. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/ZonedDateTimeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/ZonedDateTimeConverterTest.java index 2b33d7c130..2ecb9497a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/ZonedDateTimeConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/convert/ZonedDateTimeConverterTest.java @@ -10,7 +10,7 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class ZonedDateTimeConverterTest { @Test - @TestForIssue(jiraKey = "HHH-15605") + @JiraKey(value = "HHH-15605") public void testConvertedTemporalJavaType(EntityManagerFactoryScope scope) { // Because some databases do not support millisecond values in timestamps, we clear it here. // This will serve sufficient for our test to verify that the retrieved values match persisted. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CoalesceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CoalesceTest.java index 1f0c10c106..26a703a8df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CoalesceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CoalesceTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.criteria; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -26,7 +26,7 @@ import jakarta.persistence.criteria.Root; * @author Will Dazy */ @Jpa(annotatedClasses = CoalesceTest.HHH15291Entity.class) -@TestForIssue( jiraKey = "HHH-15291") +@JiraKey( value = "HHH-15291") public class CoalesceTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java index bff46d479d..4aea91f7ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java @@ -43,7 +43,7 @@ import org.hibernate.orm.test.jpa.metamodel.Product; import org.hibernate.orm.test.jpa.metamodel.ShelfLife; import org.hibernate.orm.test.jpa.metamodel.Spouse; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Assert; import org.junit.Before; @@ -130,7 +130,7 @@ public class CriteriaCompilingTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11393") + @JiraKey(value = "HHH-11393") public void testTrimAChar() { TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> { final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); @@ -206,7 +206,7 @@ public class CriteriaCompilingTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10960") + @JiraKey(value = "HHH-10960") public void testDeprecation() { TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java index 829346105d..8c7a321f7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java @@ -32,7 +32,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.SemanticException; import org.hibernate.query.spi.QueryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; public class CriteriaQueryTypeQueryAdapterTest extends BaseEntityManagerFunctionalTestCase { @@ -46,7 +46,7 @@ public class CriteriaQueryTypeQueryAdapterTest extends BaseEntityManagerFunction } @Test - @TestForIssue(jiraKey = "HHH-12685") + @JiraKey(value = "HHH-12685") public void testCriteriaQueryParameterIsBoundCheckNotFails() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder builder = entityManager.getCriteriaBuilder(); @@ -63,7 +63,7 @@ public class CriteriaQueryTypeQueryAdapterTest extends BaseEntityManagerFunction } @Test - @TestForIssue(jiraKey = "HHH-12685") + @JiraKey(value = "HHH-12685") public void testCriteriaQueryGetParameters() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder builder = entityManager.getCriteriaBuilder(); @@ -83,7 +83,7 @@ public class CriteriaQueryTypeQueryAdapterTest extends BaseEntityManagerFunction } ); } - @TestForIssue(jiraKey = "HHH-12685") + @JiraKey(value = "HHH-12685") @Test(expected = IllegalArgumentException.class) public void testCriteriaQueryGetParameterOfWrongType() { doInJPA( this::entityManagerFactory, entityManager -> { @@ -98,7 +98,7 @@ public class CriteriaQueryTypeQueryAdapterTest extends BaseEntityManagerFunction } ); } - @TestForIssue(jiraKey = "HHH-12685") + @JiraKey(value = "HHH-12685") @Test(expected = IllegalArgumentException.class) public void testCriteriaQueryGetNonExistingParameter() { doInJPA( this::entityManagerFactory, entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWhereTest.java index b323a19971..eea285d236 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaWhereTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeEach; @@ -19,7 +19,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @Jpa( annotatedClasses = CriteriaWhereTest.TestEntity.class ) -@TestForIssue(jiraKey = "HHH-15716") +@JiraKey(value = "HHH-15716") public class CriteriaWhereTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java index 3e959e8853..2b8616b1a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -39,7 +39,7 @@ public class ElementCollectionConverterTest { } @Test - @TestForIssue(jiraKey = "HHH-12581") + @JiraKey(value = "HHH-12581") public void testCriteriaQueryWithElementCollectionUsingConverter(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java index cc28654a84..36cc0bfdbb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; @@ -42,7 +42,7 @@ public class EntitySuperclassCollectionTest } @Test - @TestForIssue(jiraKey = "HHH-10556") + @JiraKey(value = "HHH-10556") public void testPerson() { String address = "super-address"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/GroupByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/GroupByTest.java index 45786b8964..4276091d9a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/GroupByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/GroupByTest.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.jpa.criteria; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ import jakarta.persistence.criteria.Root; GroupByTest.Person.class } ) -@TestForIssue( jiraKey = "HHH-15749") +@JiraKey( value = "HHH-15749") public class GroupByTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/InPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/InPredicateTest.java index 9301a67ac4..9c213c5f6c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/InPredicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/InPredicateTest.java @@ -19,7 +19,7 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.SybaseDialect; import org.hibernate.query.spi.QueryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -41,7 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @implNote Skipped for Dialects which do not support at lease */ -@TestForIssue(jiraKey = "HHH-15895") +@JiraKey(value = "HHH-15895") @DomainModel(annotatedClasses = InPredicateTest.Event.class) @SessionFactory(exportSchema = false) public class InPredicateTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java index d10662f52b..7217b70f57 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java @@ -21,7 +21,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.orm.test.jpa.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.orm.test.jpa.metamodel.Customer; import org.hibernate.orm.test.jpa.metamodel.Customer_; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SkipForDialect; import org.junit.jupiter.api.Test; @@ -127,7 +127,7 @@ public class ManipulationCriteriaTest extends AbstractMetamodelSpecificTest { } @Test - @TestForIssue(jiraKey = "HHH-8434") + @JiraKey(value = "HHH-8434") public void basicMultipleAssignments() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java index b60bc1e3eb..7e8701e1e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.jpa.criteria; import org.hibernate.query.QueryArgumentException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; ObjectParameterTypeForEmbeddableTest.TestEntity.class } ) -@TestForIssue(jiraKey = "HHH-16247") +@JiraKey(value = "HHH-16247") public class ObjectParameterTypeForEmbeddableTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/PowerFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/PowerFunctionTest.java index fc777f3acc..8c9bafca8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/PowerFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/PowerFunctionTest.java @@ -8,7 +8,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeEach; @@ -25,7 +25,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @Jpa( annotatedClasses = PowerFunctionTest.Person.class ) -@TestForIssue(jiraKey = "HHH-15395") +@JiraKey(value = "HHH-15395") public class PowerFunctionTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java index 8c0abed818..0abe2a0914 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java @@ -39,7 +39,7 @@ import org.hibernate.query.sqm.tree.predicate.SqmComparisonPredicate; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -208,7 +208,7 @@ public class QueryBuilderTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8699") + @JiraKey(value = "HHH-8699") public void testMultiselectWithPredicates() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -280,7 +280,7 @@ public class QueryBuilderTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10737") + @JiraKey(value = "HHH-10737") @FailureExpected(jiraKey = "HHH-10737") public void testMissingDialectFunction() { doInJPA( this::entityManagerFactory, em -> { @@ -315,7 +315,7 @@ public class QueryBuilderTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12314") + @JiraKey(value = "HHH-12314") public void testJoinUsingNegatedPredicate() { // Write test data doInJPA( this::entityManagerFactory, entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryPredicateAndParameterComparableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryPredicateAndParameterComparableTest.java index 70bba1ea8d..213153f629 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryPredicateAndParameterComparableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryPredicateAndParameterComparableTest.java @@ -6,7 +6,7 @@ import java.util.Set; import org.hibernate.query.SemanticException; import org.hibernate.type.descriptor.java.CoercionException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Assertions; @@ -32,7 +32,7 @@ import jakarta.persistence.criteria.Subquery; QueryPredicateAndParameterComparableTest.Submission.class } ) -@TestForIssue(jiraKey = "HHH-15802") +@JiraKey(value = "HHH-15802") public class QueryPredicateAndParameterComparableTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java index bff3bf4c41..e16d6755d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java @@ -23,7 +23,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; @@ -62,7 +62,7 @@ public class SuperclassCollectionTest extends BaseEntityManagerFunctionalTestCas } @Test - @TestForIssue( jiraKey = "HHH-10556") + @JiraKey( value = "HHH-10556") public void testOtherPerson() { String address = "other-person-super-address"; String localAddress = "other-person-local-address"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatDisjunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatDisjunctionTest.java index 2d753db263..52c741d25e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatDisjunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatDisjunctionTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class TreatDisjunctionTest { @Test - @TestForIssue( jiraKey = "HHH-15726") + @JiraKey( value = "HHH-15726") public void testQuery(SessionFactoryScope scope) { SQLStatementInspector sqlStatementInterceptor = scope.getCollectingStatementInspector(); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java index 42db05daf0..8197d582a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java @@ -24,7 +24,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -61,7 +61,7 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8488") + @JiraKey(value = "HHH-8488") public void testTreatJoin() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder cb = entityManager.getCriteriaBuilder(); @@ -77,7 +77,7 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8488") + @JiraKey(value = "HHH-8488") public void testTreatJoin2() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder cb = entityManager.getCriteriaBuilder(); @@ -96,7 +96,7 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8488") + @JiraKey(value = "HHH-8488") public void testJoinMethodOnATreatedJoin() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder cb = entityManager.getCriteriaBuilder(); @@ -118,7 +118,7 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-11081") + @JiraKey( value = "HHH-11081") public void testTreatedJoinInWhereClause() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder cb = entityManager.getCriteriaBuilder(); @@ -135,7 +135,7 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10561") + @JiraKey(value = "HHH-10561") public void testJoinOnTreatedRoot() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder cb = entityManager.getCriteriaBuilder(); @@ -154,7 +154,7 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10561") + @JiraKey(value = "HHH-10561") public void testJoinOnTreatedRootWithJoin() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder cb = entityManager.getCriteriaBuilder(); @@ -171,7 +171,7 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10767") + @JiraKey(value = "HHH-10767") public void testJoinOnTreatedJoin() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder cb = entityManager.getCriteriaBuilder(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java index 661e80b77e..28c0f86c8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java @@ -30,7 +30,7 @@ import org.hibernate.orm.test.jpa.ql.TreatKeywordTest.JoinedEntitySubSubclass2; import org.hibernate.orm.test.jpa.ql.TreatKeywordTest.JoinedEntitySubclass; import org.hibernate.orm.test.jpa.ql.TreatKeywordTest.JoinedEntitySubclass2; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -160,7 +160,7 @@ public class TreatKeywordTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9549" ) + @JiraKey( value = "HHH-9549" ) public void treatRoot() { EntityManager em = getOrCreateEntityManager(); @@ -190,7 +190,7 @@ public class TreatKeywordTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9549" ) + @JiraKey( value = "HHH-9549" ) public void treatRootReturnSuperclass() { EntityManager em = getOrCreateEntityManager(); @@ -234,7 +234,7 @@ public class TreatKeywordTest extends BaseEntityManagerFunctionalTestCase { @Test - @TestForIssue(jiraKey = "HHH-9411") + @JiraKey(value = "HHH-9411") public void testTreatWithRestrictionOnAbstractClass() { EntityManager em = getOrCreateEntityManager(); EntityTransaction entityTransaction = em.getTransaction(); @@ -265,7 +265,7 @@ public class TreatKeywordTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-16657") + @JiraKey(value = "HHH-16657") public void testTypeFilterInSubquery() { EntityManager em = getOrCreateEntityManager(); EntityTransaction entityTransaction = em.getTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatTest.java index d9ae93c926..69fcbcaba6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeEach; @@ -36,7 +36,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; TreatTest.EntityB.class } ) -@TestForIssue(jiraKey = "HHH-15721") +@JiraKey(value = "HHH-15721") public class TreatTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java index 4761a91d20..997666d3f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.transform.Transformers; import org.junit.Before; import org.junit.Test; @@ -48,7 +48,7 @@ public class CriteriaMultiselectAliasTest extends BaseEntityManagerFunctionalTes } @Test - @TestForIssue(jiraKey = "HHH-13140") + @JiraKey(value = "HHH-13140") public void testAlias() { doInJPA( this::entityManagerFactory, entityManager -> { final CriteriaBuilder cb = entityManager.getCriteriaBuilder(); @@ -74,7 +74,7 @@ public class CriteriaMultiselectAliasTest extends BaseEntityManagerFunctionalTes } @Test - @TestForIssue(jiraKey = "HHH-13192") + @JiraKey(value = "HHH-13192") public void testNoAliasInWhereClause() { doInJPA( this::entityManagerFactory, entityManager -> { final CriteriaBuilder cb = entityManager.getCriteriaBuilder(); @@ -102,7 +102,7 @@ public class CriteriaMultiselectAliasTest extends BaseEntityManagerFunctionalTes } @Test - @TestForIssue(jiraKey = "HHH-13192") + @JiraKey(value = "HHH-13192") public void testNoAliasInWhereClauseSimplified() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder cb = entityManager.getCriteriaBuilder(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java index 1c962032b4..0ece555b70 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java @@ -13,7 +13,7 @@ import java.util.List; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.EntityManager; @@ -66,7 +66,7 @@ public class BasicCriteriaUsageTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-8283") + @JiraKey(value = "HHH-8283") public void testDateCompositeCustomType() { final Date date = Date.from( Instant.now() ); final Payment payment = new Payment(); @@ -92,7 +92,7 @@ public class BasicCriteriaUsageTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-8373") + @JiraKey(value = "HHH-8373") public void testFunctionCriteria() { Wall wall = new Wall(); wall.setColor( "yellow" ); @@ -114,7 +114,7 @@ public class BasicCriteriaUsageTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue( jiraKey = "HHH-8914" ) + @JiraKey( value = "HHH-8914" ) public void testDoubleNegation() { Wall wall1 = new Wall(); wall1.setColor( "yellow" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java index 1b46ca196a..652b8bf4d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java @@ -22,7 +22,7 @@ import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10843") +@JiraKey(value = "HHH-10843") public class ConcatTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java index 069666bd4b..e32de3d2ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java @@ -31,7 +31,7 @@ import org.hibernate.query.criteria.JpaDerivedRoot; import org.hibernate.query.criteria.JpaSubQuery; import org.hibernate.query.sqm.TemporalUnit; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.Jira; import org.hibernate.testing.orm.junit.SkipForDialect; import org.junit.jupiter.api.AfterEach; @@ -103,7 +103,7 @@ public class ExpressionsTest extends AbstractMetamodelSpecificTest { } @Test - @TestForIssue( jiraKey = "HHH-15452") + @JiraKey( value = "HHH-15452") public void testGetConjunctionExpressionsAndAddPredicate(){ inTransaction( entityManager -> { @@ -124,7 +124,7 @@ public class ExpressionsTest extends AbstractMetamodelSpecificTest { } @Test - @TestForIssue(jiraKey = "HHH-6876") + @JiraKey(value = "HHH-6876") public void testEmptyInList() { doInJPA( this::entityManagerFactory, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java index 75369577ed..bba08c1a0a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java @@ -23,7 +23,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Assert; import org.junit.Before; @@ -33,7 +33,7 @@ import org.junit.Test; * @author Jeremy Carnus * @author Guillaume Smet */ -@TestForIssue(jiraKey = "HHH-12989") +@JiraKey(value = "HHH-12989") public class InWithHeterogeneousCollectionTest extends BaseCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java index 8bc84690eb..654ede7dda 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java @@ -18,7 +18,7 @@ import org.hibernate.orm.test.jpa.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.orm.test.jpa.metamodel.Address; import org.hibernate.orm.test.jpa.metamodel.Address_; import org.hibernate.orm.test.jpa.metamodel.Phone; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -44,7 +44,7 @@ public class ListIndexTest extends AbstractMetamodelSpecificTest { } @Test - @TestForIssue(jiraKey = "HHH-8404") + @JiraKey(value = "HHH-8404") public void testListIndex() { EntityManager em = getOrCreateEntityManager(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java index b40fe48021..5fccf9a621 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java @@ -22,7 +22,7 @@ import org.hibernate.orm.test.jpa.metamodel.CreditCard_; import org.hibernate.orm.test.jpa.metamodel.Customer_; import org.hibernate.orm.test.jpa.metamodel.Order; import org.hibernate.orm.test.jpa.metamodel.Order_; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SkipForDialect; @@ -261,7 +261,7 @@ public class PredicateTest extends AbstractMetamodelSpecificTest { } @Test - @TestForIssue( jiraKey = "HHH-5803" ) + @JiraKey( value = "HHH-5803" ) @SkipForDialect( dialectClass = CockroachDialect.class, reason = "https://github.com/cockroachdb/cockroach/issues/41943") public void testQuotientConversion() { EntityManager em = getOrCreateEntityManager(); @@ -312,7 +312,7 @@ public class PredicateTest extends AbstractMetamodelSpecificTest { } @Test - @TestForIssue( jiraKey = "HHH-8901" ) + @JiraKey( value = "HHH-8901" ) public void testEmptyInPredicate() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -328,7 +328,7 @@ public class PredicateTest extends AbstractMetamodelSpecificTest { } @Test - @TestForIssue( jiraKey = "HHH-17804" ) + @JiraKey( value = "HHH-17804" ) public void testEmptyInPredicate2() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -344,7 +344,7 @@ public class PredicateTest extends AbstractMetamodelSpecificTest { } @Test - @TestForIssue( jiraKey = "HHH-17804" ) + @JiraKey( value = "HHH-17804" ) public void testEmptyInPredicate3() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java index 787b83559e..02481c50be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java @@ -11,7 +11,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -40,7 +40,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-6562") +@JiraKey(value = "HHH-6562") @Jpa(annotatedClasses = { ComponentInWhereClauseTest.Employee.class, ComponentInWhereClauseTest.Project.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java index 029eb3d7d7..b87d33af41 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java @@ -27,7 +27,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -40,7 +40,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-6562") +@JiraKey(value = "HHH-6562") @Jpa(annotatedClasses = { EntitySuperclassComponentWithCollectionTest.Employee.class, EntitySuperclassComponentWithCollectionTest.Manager.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java index db34e7b05a..f3c9a1c9cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java @@ -27,7 +27,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -40,7 +40,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-6562") +@JiraKey(value = "HHH-6562") @Jpa(annotatedClasses = { MappedSuperclassComponentWithCollectionTest.Employee.class, MappedSuperclassComponentWithCollectionTest.Manager.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/convert/ConvertedAttributeConcatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/convert/ConvertedAttributeConcatTest.java index 954b0fd977..e948454032 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/convert/ConvertedAttributeConcatTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/convert/ConvertedAttributeConcatTest.java @@ -13,7 +13,7 @@ import java.util.Set; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Marco Belladelli */ -@TestForIssue(jiraKey = "HHH-15823") +@JiraKey(value = "HHH-15823") @DomainModel(annotatedClasses = ConvertedAttributeConcatTest.Post.class) public class ConvertedAttributeConcatTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java index 5e0f2cd99c..5d82a64620 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -36,7 +36,7 @@ public class EnumIsMemberTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9605") + @JiraKey(value = "HHH-9605") public void testQueryEnumCollection() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java index efe5c7c9b3..3e3e6020ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java @@ -23,7 +23,7 @@ import org.hibernate.dialect.HANADialect; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-10062") +@JiraKey(value = "HHH-10062") public class CriteriaToScrollableResultsFetchTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java index 324ea612bf..0289099020 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.criteria.MapJoin; import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -43,7 +43,7 @@ public class MapJoinEntryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12945") + @JiraKey(value = "HHH-12945") public void testMapJoinEntryCriteria() { doInJPA( this::entityManagerFactory, em -> { CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java index 54e5739be4..6ff228e825 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java @@ -29,7 +29,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -44,7 +44,7 @@ public class MapJoinTestWithEmbeddable extends BaseEntityManagerFunctionalTestCa } @Test - @TestForIssue( jiraKey = "HHH-10455" ) + @JiraKey( value = "HHH-10455" ) public void testSelectingKeyOfMapJoin() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder cb = entityManager.getCriteriaBuilder(); @@ -61,7 +61,7 @@ public class MapJoinTestWithEmbeddable extends BaseEntityManagerFunctionalTestCa } @Test - @TestForIssue( jiraKey = "HHH-10229" ) + @JiraKey( value = "HHH-10229" ) public void testSelectingValueOfMapJoin() { doInJPA( this::entityManagerFactory, entityManager -> { CriteriaBuilder cb = entityManager.getCriteriaBuilder(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java index a03589cbf2..1bc8294e42 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -61,7 +61,7 @@ public class CriteriaLiteralInSelectExpressionTest { } @Test - @TestForIssue(jiraKey = "HHH-10729") + @JiraKey(value = "HHH-10729") public void testBooleanLiteral(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -82,7 +82,7 @@ public class CriteriaLiteralInSelectExpressionTest { } @Test - @TestForIssue(jiraKey = "HHH-10861") + @JiraKey(value = "HHH-10861") public void testNullLiteral(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -103,7 +103,7 @@ public class CriteriaLiteralInSelectExpressionTest { } @Test - @TestForIssue(jiraKey = "HHH-10861") + @JiraKey(value = "HHH-10861") public void testNullLiteralFirst(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -124,7 +124,7 @@ public class CriteriaLiteralInSelectExpressionTest { } @Test - @TestForIssue(jiraKey = "HHH-10729") + @JiraKey(value = "HHH-10729") public void testStringLiteral(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -145,7 +145,7 @@ public class CriteriaLiteralInSelectExpressionTest { } @Test - @TestForIssue(jiraKey = "HHH-9021") + @JiraKey(value = "HHH-9021") @SkipForDialect( dialectClass = OracleDialect.class) @SkipForDialect( dialectClass = DB2Dialect.class) @SkipForDialect( dialectClass = SQLServerDialect.class) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java index 4865b8b866..c918f21386 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java @@ -18,7 +18,7 @@ import org.hibernate.orm.test.jpa.metamodel.Order; import org.hibernate.orm.test.jpa.metamodel.Thing; import org.hibernate.orm.test.jpa.metamodel.ThingWithQuantity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.ExpectedException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -124,7 +124,7 @@ public class AbstractPathImplTest extends AbstractMetamodelSpecificTest { } @Test - @TestForIssue( jiraKey = "HHH-15433") + @JiraKey( value = "HHH-15433") public void testTypeExpressionWithoutInheritance() { EntityManager em = getOrCreateEntityManager(); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java index 8d13761af3..9341d28e85 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java @@ -24,7 +24,7 @@ import org.hibernate.orm.test.jpa.metamodel.Translation; import org.hibernate.query.criteria.HibernateCriteriaBuilder; import org.hibernate.query.criteria.JpaExpression; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; @@ -72,7 +72,7 @@ public class PluralAttributeExpressionsTest extends AbstractMetamodelSpecificTes } @Test - @TestForIssue( jiraKey = "HHH-11225" ) + @JiraKey( value = "HHH-11225" ) public void testElementMapIsEmptyHql() { doInJPA( this::entityManagerFactory, entityManager -> { entityManager.createQuery( "select m from MapEntity m where m.localized is empty" ).getResultList(); @@ -80,7 +80,7 @@ public class PluralAttributeExpressionsTest extends AbstractMetamodelSpecificTes } @Test - @TestForIssue( jiraKey = "HHH-11225" ) + @JiraKey( value = "HHH-11225" ) public void testElementMapIsEmptyCriteria() { doInJPA( this::entityManagerFactory, entityManager -> { final HibernateCriteriaBuilder cb = (HibernateCriteriaBuilder) entityManager.getCriteriaBuilder(); @@ -96,7 +96,7 @@ public class PluralAttributeExpressionsTest extends AbstractMetamodelSpecificTes } @Test - @TestForIssue( jiraKey = "HHH-11225" ) + @JiraKey( value = "HHH-11225" ) public void testEntityMapIsEmptyHql() { doInJPA( this::entityManagerFactory, entityManager -> { entityManager.createQuery( "select a from Article a where a.translations is empty" ).getResultList(); @@ -104,7 +104,7 @@ public class PluralAttributeExpressionsTest extends AbstractMetamodelSpecificTes } @Test - @TestForIssue( jiraKey = "HHH-11225" ) + @JiraKey( value = "HHH-11225" ) public void testEntityMapIsEmptyCriteria() { doInJPA( this::entityManagerFactory, entityManager -> { final HibernateCriteriaBuilder cb = (HibernateCriteriaBuilder) entityManager.getCriteriaBuilder(); @@ -146,7 +146,7 @@ public class PluralAttributeExpressionsTest extends AbstractMetamodelSpecificTes } @Test - @TestForIssue( jiraKey = "HHH-11225" ) + @JiraKey( value = "HHH-11225" ) public void testElementMapSizeHql() { doInJPA( this::entityManagerFactory, entityManager -> { entityManager.createQuery( "select m from MapEntity m where size( m.localized ) > 1" ).getResultList(); @@ -154,7 +154,7 @@ public class PluralAttributeExpressionsTest extends AbstractMetamodelSpecificTes } @Test - @TestForIssue( jiraKey = "HHH-11225" ) + @JiraKey( value = "HHH-11225" ) public void testElementMapSizeCriteria() { doInJPA( this::entityManagerFactory, entityManager -> { final HibernateCriteriaBuilder cb = (HibernateCriteriaBuilder) entityManager.getCriteriaBuilder(); @@ -170,7 +170,7 @@ public class PluralAttributeExpressionsTest extends AbstractMetamodelSpecificTes } @Test - @TestForIssue( jiraKey = "HHH-11225" ) + @JiraKey( value = "HHH-11225" ) public void testEntityMapSizeHql() { doInJPA( this::entityManagerFactory, entityManager -> { entityManager.createQuery( "select a from Article a where size(a.translations) > 1" ).getResultList(); @@ -178,7 +178,7 @@ public class PluralAttributeExpressionsTest extends AbstractMetamodelSpecificTes } @Test - @TestForIssue( jiraKey = "HHH-11225" ) + @JiraKey( value = "HHH-11225" ) public void testEntityMapSizeCriteria() { doInJPA( this::entityManagerFactory, entityManager -> { final HibernateCriteriaBuilder cb = (HibernateCriteriaBuilder) entityManager.getCriteriaBuilder(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java index aa4f429c5e..655b1e1ded 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Before; import org.junit.Test; @@ -34,7 +34,7 @@ public class LimitExpressionTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11278") + @JiraKey(value = "HHH-11278") public void testAnEmptyListIsReturnedWhenSetMaxResultsToZero() { TransactionUtil.doInJPA( this::entityManagerFactory, (EntityManager entityManager) -> { final CriteriaQuery query = entityManager.getCriteriaBuilder().createQuery( Person.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java index dea447d939..6d2411dc39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java @@ -18,14 +18,14 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.orm.test.jpa.metadata.Person_; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@TestForIssue(jiraKey = "HHH-12230") +@JiraKey(value = "HHH-12230") public class GroupBySelectCaseTest extends BaseEntityManagerFunctionalTestCase { @Override @@ -34,7 +34,7 @@ public class GroupBySelectCaseTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12230") + @JiraKey(value = "HHH-12230") public void selectCaseInGroupByAndSelectExpression() { doInJPA( this::entityManagerFactory, entityManager -> { @@ -59,7 +59,7 @@ public class GroupBySelectCaseTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12230") + @JiraKey(value = "HHH-12230") public void selectCaseInOrderByAndSelectExpression() { doInJPA( this::entityManagerFactory, entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java index 3ad680003b..ac9328f1ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java @@ -20,7 +20,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.criteria.ValueHandlingMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -74,7 +74,7 @@ public class SelectCaseLiteralHandlingBindTest extends BaseEntityManagerFunction } @Test - @TestForIssue(jiraKey = "HHH-13001") + @JiraKey(value = "HHH-13001") public void selectSumOnCaseExpression() { doInJPA( this::entityManagerFactory, entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java index dba1d3b1fa..97854cf5b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java @@ -38,10 +38,10 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; -@TestForIssue( jiraKey = "HHH-9731" ) +@JiraKey( value = "HHH-9731" ) public class SelectCaseTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java index e85552ac96..f8ba1d2608 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java @@ -30,7 +30,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; /** @@ -47,7 +47,7 @@ public class BasicSimpleCaseTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9343") + @JiraKey(value = "HHH-9343") public void testCaseStringResult() { EntityManager em = getOrCreateEntityManager(); CriteriaBuilder builder = em.getCriteriaBuilder(); @@ -67,7 +67,7 @@ public class BasicSimpleCaseTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9343") + @JiraKey(value = "HHH-9343") public void testCaseIntegerResult() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -89,7 +89,7 @@ public class BasicSimpleCaseTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9343") + @JiraKey(value = "HHH-9343") public void testCaseLiteralResult() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -109,7 +109,7 @@ public class BasicSimpleCaseTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9343") + @JiraKey(value = "HHH-9343") public void testCaseLiteralResult2() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -173,7 +173,7 @@ public class BasicSimpleCaseTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13016") + @JiraKey(value = "HHH-13016") @FailureExpected(jiraKey = "HHH-13016") public void testCaseEnumResult() { doInJPA( this::entityManagerFactory, em -> { @@ -214,7 +214,7 @@ public class BasicSimpleCaseTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13199") + @JiraKey(value = "HHH-13199") public void testCaseEnumInSum() throws Exception { doInJPA( this::entityManagerFactory, em -> { // create entities diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java index e004b981bb..79d41cb27d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Expression; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -33,7 +33,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH014245") +@JiraKey(value = "HHH014245") @Jpa(annotatedClasses = { CriteriaSelectSizeCollectionTest.Customer.class, CriteriaSelectSizeCollectionTest.Alias.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java index f6b65714cf..9402b39dc2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java @@ -23,7 +23,7 @@ import org.hibernate.orm.test.jpa.metamodel.LineItem; import org.hibernate.orm.test.jpa.metamodel.LineItem_; import org.hibernate.orm.test.jpa.metamodel.Order; import org.hibernate.orm.test.jpa.metamodel.Order_; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SkipForDialect; @@ -125,7 +125,7 @@ public class CorrelatedSubqueryTest extends AbstractMetamodelSpecificTest { } @Test - @TestForIssue(jiraKey = "HHH-8556") + @JiraKey(value = "HHH-8556") public void testCorrelatedJoinsFromSubquery() { CriteriaBuilder builder = entityManagerFactory().getCriteriaBuilder(); CriteriaQuery cquery = builder.createQuery(Customer.class); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java index 1c344b5011..0557b9c1db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java @@ -19,10 +19,10 @@ import jakarta.persistence.criteria.Root; import jakarta.persistence.criteria.Subquery; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; -@TestForIssue(jiraKey = "HHH-13111") +@JiraKey(value = "HHH-13111") public class SubqueryInSelectClauseJpaComplianceTest extends AbstractSubqueryInSelectClauseTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java index 6c9e845e4f..29d98ee7a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java @@ -19,10 +19,10 @@ import jakarta.persistence.criteria.JoinType; import jakarta.persistence.criteria.Root; import jakarta.persistence.criteria.Subquery; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; -@TestForIssue(jiraKey = "HHH-13111") +@JiraKey(value = "HHH-13111") public class SubqueryInSelectClauseTest extends AbstractSubqueryInSelectClauseTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleQueryRetrievePrimitiveTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleQueryRetrievePrimitiveTest.java index 59b9c05aea..7b0abda243 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleQueryRetrievePrimitiveTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleQueryRetrievePrimitiveTest.java @@ -4,7 +4,7 @@ import org.hibernate.orm.test.jpa.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.orm.test.jpa.metamodel.ThingWithQuantity; import org.hibernate.orm.test.jpa.metamodel.ThingWithQuantity_; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.AfterEach; @@ -18,7 +18,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; -@TestForIssue( jiraKey = "HHH-15454" ) +@JiraKey( value = "HHH-15454" ) public class TupleQueryRetrievePrimitiveTest extends AbstractMetamodelSpecificTest { public static final int QUANTITY_OF_THING = 3; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java index 3b89af11be..130e9b8c9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java @@ -14,7 +14,7 @@ import java.util.Set; import jakarta.persistence.EntityManager; import jakarta.persistence.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -43,7 +43,7 @@ public class FlushTest { } @Test - @TestForIssue(jiraKey = "EJBTHREE-722") + @JiraKey(value = "EJBTHREE-722") public void testFlushOnDetached(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java index 63ccf8becb..c607663b05 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.emops; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -17,7 +17,7 @@ import org.hibernate.testing.orm.junit.Setting; * * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-9106") +@JiraKey( value = "HHH-9106") @Jpa( annotatedClasses = { Category.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedTest.java index b155523205..915b0a1e40 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesAllowedTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; * * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-9106") +@JiraKey(value = "HHH-9106") @Jpa( annotatedClasses = { Category.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesCustomTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesCustomTest.java index da6f9e5bd4..62b072a2b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesCustomTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesCustomTest.java @@ -12,7 +12,7 @@ import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; import org.hibernate.event.spi.EntityCopyObserver; import org.hibernate.event.spi.EventSource; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-9106") +@JiraKey( value = "HHH-9106") @Jpa( annotatedClasses = { Category.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java index 52eb9e68b0..823c8dd85d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.emops; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-9106") +@JiraKey(value = "HHH-9106") @Jpa( annotatedClasses = { Category.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedTest.java index 2ca3916433..93bbd117dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeMultipleEntityCopiesDisallowedTest.java @@ -10,7 +10,7 @@ import java.util.Map; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -21,7 +21,7 @@ import org.hibernate.testing.orm.junit.Setting; * * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-9106") +@JiraKey( value = "HHH-9106") @Jpa( annotatedClasses = { Category.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java index 924cced5c2..98fc798d02 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java @@ -10,7 +10,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.TiDBDialect; import org.hibernate.exception.ConstraintViolationException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -154,7 +154,7 @@ public class ExceptionTest { } @Test - @TestForIssue( jiraKey = "HHH-4676" ) + @JiraKey( value = "HHH-4676" ) public void testInterceptor(EntityManagerFactoryScope scope) { EntityManager em = scope.getEntityManagerFactory().createEntityManager(); em.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java index ee2741f52b..fff5a9b3d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java @@ -28,7 +28,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; public class CacheableEntityGraphTest extends BaseEntityManagerFunctionalTestCase { @@ -39,7 +39,7 @@ public class CacheableEntityGraphTest extends BaseEntityManagerFunctionalTestCas } @Test - @TestForIssue(jiraKey = "HHH-15964") + @JiraKey(value = "HHH-15964") public void test() { EntityManager em = getOrCreateEntityManager(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java index 61af50538d..149df194b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java @@ -23,7 +23,7 @@ import jakarta.persistence.Table; import org.hibernate.graph.GraphSemantic; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -35,7 +35,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; * @author Benjamin M. * @author Nathan Xu */ -@TestForIssue( jiraKey = "HHH-14113" ) +@JiraKey( value = "HHH-14113" ) @SuppressWarnings({ "unchecked", "rawtypes" }) public class EntityGraphAttributeResolutionTest extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java index f8c7f42ff9..a86fc8411e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java @@ -39,7 +39,7 @@ import org.hibernate.Hibernate; import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; @@ -62,7 +62,7 @@ public class EntityGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8857") + @JiraKey(value = "HHH-8857") public void loadMultipleAssociations() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -182,7 +182,7 @@ public class EntityGraphTest extends BaseEntityManagerFunctionalTestCase { * automatically include the specified attributes of superclass subgraphs." */ @Test - @TestForIssue(jiraKey = "HHH-8640") + @JiraKey(value = "HHH-8640") public void inheritanceTest() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -229,7 +229,7 @@ public class EntityGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9080") + @JiraKey(value = "HHH-9080") public void attributeNodeInheritanceTest() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -267,7 +267,7 @@ public class EntityGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9735") + @JiraKey(value = "HHH-9735") public void loadIsMemeberQueriedCollection() { EntityManager em = getOrCreateEntityManager(); @@ -311,7 +311,7 @@ public class EntityGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-15859") + @JiraKey(value = "HHH-15859") public void mapAttributeTest() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -342,7 +342,7 @@ public class EntityGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-15964") + @JiraKey(value = "HHH-15964") public void paginationOverCollectionFetch() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -388,7 +388,7 @@ public class EntityGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-15964") + @JiraKey(value = "HHH-15964") public void paginationOverEagerCollectionWithEmptyEG() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -433,7 +433,7 @@ public class EntityGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-15972") + @JiraKey(value = "HHH-15972") public void joinedInheritanceWithAttributeConflictTest() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java index a952004095..170d99ebdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java @@ -25,7 +25,7 @@ import org.hibernate.Hibernate; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -58,7 +58,7 @@ public class EntityGraphUsingFetchGraphForLazyTest { } @Test - @TestForIssue(jiraKey = "HHH-10179") + @JiraKey(value = "HHH-10179") @FailureExpected(jiraKey = "HHH-10179") public void testFetchLazyWithGraphsSubsequently(EntityManagerFactoryScope scope) { Address address = new Address(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java index 5ca1e34ced..0f6098e487 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java @@ -18,7 +18,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.graph.GraphParser; import org.hibernate.graph.GraphSemantic; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * @author Yaroslav Prokipchyn * @author Nathan Xu */ -@TestForIssue( jiraKey = "HHH-14212" ) +@JiraKey( value = "HHH-14212" ) @Jpa(annotatedClasses = { FetchGraphTest.LedgerRecord.class, FetchGraphTest.LedgerRecordItem.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java index 46784350e2..9871c2257d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java @@ -29,7 +29,7 @@ import org.hibernate.graph.GraphSemantic; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -179,7 +179,7 @@ public class LoadAndFetchGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-14097") + @JiraKey(value = "HHH-14097") public void testQueryById() { Statistics statistics = entityManagerFactory().unwrap( SessionFactory.class ).getStatistics(); statistics.clear(); @@ -205,7 +205,7 @@ public class LoadAndFetchGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-14097") + @JiraKey(value = "HHH-14097") public void testQueryByIdWithLoadGraph() { Statistics statistics = entityManagerFactory().unwrap( SessionFactory.class ).getStatistics(); statistics.clear(); @@ -241,7 +241,7 @@ public class LoadAndFetchGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-14097") + @JiraKey(value = "HHH-14097") public void testQueryByIdWithFetchGraph() { Statistics statistics = entityManagerFactory().unwrap( SessionFactory.class ).getStatistics(); statistics.clear(); @@ -276,7 +276,7 @@ public class LoadAndFetchGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-14097") + @JiraKey(value = "HHH-14097") public void testQueryByIdWithFetchGraph2() { Statistics statistics = entityManagerFactory().unwrap( SessionFactory.class ).getStatistics(); statistics.clear(); @@ -306,7 +306,7 @@ public class LoadAndFetchGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-14124") + @JiraKey(value = "HHH-14124") public void testQueryByIdWithLoadGraphMultipleResults() { Statistics statistics = entityManagerFactory().unwrap( SessionFactory.class ).getStatistics(); statistics.clear(); @@ -344,7 +344,7 @@ public class LoadAndFetchGraphTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-14124") + @JiraKey(value = "HHH-14124") public void testQueryByIdWithFetchGraphMultipleResults() { Statistics statistics = entityManagerFactory().unwrap( SessionFactory.class ).getStatistics(); statistics.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java index 724883c045..437528426e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java @@ -12,7 +12,7 @@ import org.hibernate.orm.test.jpa.graphs.Manager; import org.hibernate.orm.test.jpa.graphs.Market; import org.hibernate.orm.test.jpa.graphs.Student; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -35,7 +35,7 @@ public class FetchGraphFindByIdTest extends BaseEntityManagerFunctionalTestCase private long companyWithFetchProfileId; @Test - @TestForIssue(jiraKey = "HHH-8776") + @JiraKey(value = "HHH-8776") public void testFetchGraphByFind() { EntityManager entityManager = getOrCreateEntityManager(); entityManager.getTransaction().begin(); @@ -100,7 +100,7 @@ public class FetchGraphFindByIdTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-8776") + @JiraKey(value = "HHH-8776") public void testFetchGraphByFindTakingPrecedenceOverFetchProfile() { EntityManager entityManager = getOrCreateEntityManager(); entityManager.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java index 9f78f3da7c..93e227180c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java @@ -25,7 +25,7 @@ import org.hibernate.orm.test.jpa.graphs.Manager; import org.hibernate.orm.test.jpa.graphs.Market; import org.hibernate.orm.test.jpa.graphs.Student; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil2; import org.junit.Before; import org.junit.Test; @@ -117,7 +117,7 @@ public class QueryHintEntityGraphTest extends BaseEntityManagerFunctionalTestCas } @Test - @TestForIssue(jiraKey = "https://hibernate.atlassian.net/browse/HHH-14855") + @JiraKey(value = "https://hibernate.atlassian.net/browse/HHH-14855") public void testEntityGraphStringQueryHint() { TransactionUtil2.inTransaction( entityManagerFactory(), (session) -> { final String hql = "from Company c"; @@ -143,7 +143,7 @@ public class QueryHintEntityGraphTest extends BaseEntityManagerFunctionalTestCas } @Test - @TestForIssue(jiraKey = "HHH-8776") + @JiraKey(value = "HHH-8776") public void testFetchGraph() { EntityManager entityManager = getOrCreateEntityManager(); entityManager.getTransaction().begin(); @@ -209,7 +209,7 @@ public class QueryHintEntityGraphTest extends BaseEntityManagerFunctionalTestCas } @Test - @TestForIssue(jiraKey = "HHH-8776") + @JiraKey(value = "HHH-8776") public void testFetchGraphTakingPrecedenceOverFetchProfile() { EntityManager entityManager = getOrCreateEntityManager(); entityManager.getTransaction().begin(); @@ -275,7 +275,7 @@ public class QueryHintEntityGraphTest extends BaseEntityManagerFunctionalTestCas } @Test - @TestForIssue( jiraKey = "HHH-9457") + @JiraKey( value = "HHH-9457") public void testLoadGraphOrderByWithImplicitJoin() { EntityManager entityManager = getOrCreateEntityManager(); entityManager.getTransaction().begin(); @@ -339,7 +339,7 @@ public class QueryHintEntityGraphTest extends BaseEntityManagerFunctionalTestCas } @Test - @TestForIssue( jiraKey = "HHH-9448") + @JiraKey( value = "HHH-9448") public void testLoadGraphWithRestriction() { EntityManager entityManager = getOrCreateEntityManager(); entityManager.getTransaction().begin(); @@ -432,7 +432,7 @@ public class QueryHintEntityGraphTest extends BaseEntityManagerFunctionalTestCas } @Test - @TestForIssue( jiraKey = "HHH-9448") + @JiraKey( value = "HHH-9448") public void testEntityGraphWithExplicitFetchAndRestriction() { EntityManager entityManager = getOrCreateEntityManager(); entityManager.getTransaction().begin(); @@ -460,7 +460,7 @@ public class QueryHintEntityGraphTest extends BaseEntityManagerFunctionalTestCas } @Test - @TestForIssue(jiraKey = "HHH-9374") + @JiraKey(value = "HHH-9374") public void testEntityGraphWithCollectionSubquery(){ EntityManager entityManager = getOrCreateEntityManager(); entityManager.getTransaction().begin(); @@ -476,7 +476,7 @@ public class QueryHintEntityGraphTest extends BaseEntityManagerFunctionalTestCas } @Test - @TestForIssue(jiraKey = "HHH-11569") + @JiraKey(value = "HHH-11569") public void testCollectionSizeLoadedWithGraph() { doInJPA( this::entityManagerFactory, entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassTest.java index c17670aff2..fc85eb63a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.jpa.integrationprovider; import java.util.List; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-13614") +@JiraKey(value = "HHH-13614") @Jpa( annotatedClasses = { Person.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassUsingPropertiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassUsingPropertiesTest.java index b053823d41..63360f2863 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassUsingPropertiesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByClassUsingPropertiesTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHHH-13853") +@JiraKey(value = "HHHH-13853") @Jpa( annotatedClasses = Person.class, properties = @Setting(name = EntityManagerFactoryBuilderImpl.INTEGRATOR_PROVIDER, value = "org.hibernate.orm.test.jpa.integrationprovider.DtoIntegratorProvider") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByObjectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByObjectTest.java index 833e05e3a1..7a426216a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByObjectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByObjectTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.SettingProvider; @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-13614") +@JiraKey(value = "HHH-13614") @Jpa( annotatedClasses = { Person.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByStringTest.java index ade6eb883c..47238b4920 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/IntegrationProviderSettingByStringTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.SettingProvider; @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-13614") +@JiraKey(value = "HHH-13614") @Jpa( annotatedClasses = { Person.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java index f1ab345a43..b3f0d18c57 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java @@ -17,7 +17,7 @@ import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.orm.test.jpa.model.AbstractJPATest; import org.hibernate.orm.test.jpa.model.Item; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLServerSnapshotIsolationConnectionProvider; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -56,7 +56,7 @@ public class LockExceptionTests extends AbstractJPATest { } @Test - @TestForIssue( jiraKey = "HHH-8786" ) + @JiraKey( value = "HHH-8786" ) @SkipForDialect(dialectClass = CockroachDialect.class, reason = "for update clause does not imply locking. See https://github.com/cockroachdb/cockroach/issues/88995") public void testLockTimeoutFind() { final Item item = new Item( "find" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java index 5161cfb8c8..bc6eb40f4b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java @@ -39,7 +39,7 @@ import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.hibernate.testing.util.ExceptionUtil; import org.junit.Test; @@ -99,7 +99,7 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase { } @Test(timeout = 5 * 1000) //5 seconds - @TestForIssue( jiraKey = "HHH-7252" ) + @JiraKey( value = "HHH-7252" ) @RequiresDialectFeature( value = DialectChecks.SupportsLockTimeouts.class, comment = "Test verifies proper exception throwing when a lock timeout is specified.", jiraKey = "HHH-7252" ) @@ -149,7 +149,7 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase { } @Test(timeout = 5 * 1000) //5 seconds - @TestForIssue( jiraKey = "HHH-13364" ) + @JiraKey( value = "HHH-13364" ) @RequiresDialectFeature( value = DialectChecks.SupportsLockTimeouts.class, comment = "Test verifies proper exception throwing when a lock timeout is specified for Query#getSingleResult.", jiraKey = "HHH-13364" ) @@ -196,7 +196,7 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase { } @Test(timeout = 5 * 1000) //5 seconds - @TestForIssue( jiraKey = "HHH-13364" ) + @JiraKey( value = "HHH-13364" ) @RequiresDialectFeature( value = DialectChecks.SupportsLockTimeouts.class, comment = "Test verifies proper exception throwing when a lock timeout is specified for Query#getResultList.", jiraKey = "HHH-13364" ) @@ -246,7 +246,7 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase { } @Test(timeout = 5 * 1000) //5 seconds - @TestForIssue( jiraKey = "HHH-13364" ) + @JiraKey( value = "HHH-13364" ) @RequiresDialectFeature( value = DialectChecks.SupportsLockTimeouts.class, comment = "Test verifies proper exception throwing when a lock timeout is specified for NamedQuery#getResultList.", jiraKey = "HHH-13364" ) @@ -1180,7 +1180,7 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase { } @Test(timeout = 70 * 1000) //70 seconds - @TestForIssue( jiraKey = "HHH-13135" ) + @JiraKey( value = "HHH-13135" ) @SkipForDialect(value = MySQLDialect.class, strictMatching = true, comment = "With InnoDB, a FK constraint check acquires a shared lock that isn't compatible with an exclusive lock") @SkipForDialect(value = MariaDBDialect.class, strictMatching = true, comment = "With InnoDB, a FK constraint check acquires a shared lock that isn't compatible with an exclusive lock") @SkipForDialect(value = HSQLDialect.class, comment = "Seems like FK constraint checks are not compatible with exclusive locks") @@ -1219,7 +1219,7 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase { } @Test(timeout = 70 * 1000) //70 seconds - @TestForIssue( jiraKey = "HHH-13135" ) + @JiraKey( value = "HHH-13135" ) @SkipForDialect(value = MySQLDialect.class, strictMatching = true, comment = "With InnoDB, a FK constraint check acquires a shared lock that isn't compatible with an exclusive lock") @SkipForDialect(value = MariaDBDialect.class, strictMatching = true, comment = "With InnoDB, a FK constraint check acquires a shared lock that isn't compatible with an exclusive lock") @SkipForDialect(value = HSQLDialect.class, comment = "Seems like FK constraint checks are not compatible with exclusive locks") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java index 1673d1103d..8762fc8e2d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java @@ -16,7 +16,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -47,7 +47,7 @@ public class LockTimeoutPropertyTest extends BaseEntityManagerFunctionalTestCase @Test - @TestForIssue( jiraKey = "HHH-6256") + @JiraKey( value = "HHH-6256") public void testTimeoutHint(){ EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java index 3b752c85d1..80421999dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java @@ -14,7 +14,7 @@ import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ExceptionUtil; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.fail; */ @RequiresDialect(PostgreSQLDialect.class) @SkipForDialect(value = CockroachDialect.class, comment = "https://github.com/cockroachdb/cockroach/issues/41335") -@TestForIssue( jiraKey = "HHH-13493") +@JiraKey( value = "HHH-13493") public class NativeSQLQueryTimeoutTest extends BaseEntityManagerFunctionalTestCase { @Override protected void addConfigOptions(Map options) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java index 4490b4a696..ae72d9c1ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.JoinTable; import jakarta.persistence.LockModeType; import jakarta.persistence.ManyToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -24,7 +24,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -@TestForIssue(jiraKey = "HHH-13000") +@JiraKey(value = "HHH-13000") @Jpa(annotatedClasses = { PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.Parent.class, PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.Child.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java index 222dbc16f4..6641a295c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java @@ -19,7 +19,7 @@ import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -77,7 +77,7 @@ public class QueryLockingTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8756" ) + @JiraKey( value = "HHH-8756" ) public void testNoneLockModeForNonSelectQueryAllowed() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -291,7 +291,7 @@ public class QueryLockingTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9419") + @JiraKey(value = "HHH-9419") public void testNoVersionCheckAfterRemove() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -383,7 +383,7 @@ public class QueryLockingTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11376") + @JiraKey(value = "HHH-11376") @RequiresDialect( SQLServerDialect.class ) public void testCriteriaWithPessimisticLock() { TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java index 0def5cdfb1..a63ebde554 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java @@ -19,7 +19,7 @@ import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.hibernate.testing.util.ExceptionUtil; import org.junit.Before; @@ -70,7 +70,7 @@ public class StatementIsClosedAfterALockExceptionTest extends BaseEntityManagerF } @Test(timeout = 1000 * 30) //30 seconds - @TestForIssue(jiraKey = "HHH-11617") + @JiraKey(value = "HHH-11617") public void testStatementIsClosed() { TransactionUtil.doInJPA( this::entityManagerFactory, em1 -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java index 030893804a..4837170afb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java @@ -27,7 +27,7 @@ import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jira; import org.hibernate.testing.orm.junit.Jpa; @@ -289,7 +289,7 @@ public class MetadataTest { } @Test - @TestForIssue(jiraKey = "HHH-14346") + @JiraKey(value = "HHH-14346") public void testEmptyPluralAttributeSet(EntityManagerFactoryScope scope) { final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity(Feline.class); final Set> attributes = entityType.getPluralAttributes(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java index 8a2ce5ddca..4a35069a05 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.EntityManagerFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.jpa.TestingEntityManagerFactoryGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-5024" ) +@JiraKey( value = "HHH-5024" ) @BaseUnitTest public class MappedSuperclassWithAttributesTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java index 6790d4c6fb..7d2ed49b83 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java @@ -12,7 +12,7 @@ import java.util.Arrays; import org.hibernate.orm.test.jpa.TestingEntityManagerFactoryGenerator; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @BaseUnitTest public class MappedSuperclassWithEmbeddedTest { @Test - @TestForIssue( jiraKey = "HHH-5024" ) + @JiraKey( value = "HHH-5024" ) public void testStaticMetamodel() { EntityManagerFactory emf = TestingEntityManagerFactoryGenerator.generateEntityManagerFactory( AvailableSettings.LOADED_CLASSES, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java index fc727180cf..3d955e78a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java @@ -12,7 +12,7 @@ import java.util.Arrays; import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.jpa.TestingEntityManagerFactoryGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @BaseUnitTest public class MappedSuperclassWithEmbeddedIdTest { @Test - @TestForIssue( jiraKey = "HHH-5024" ) + @JiraKey( value = "HHH-5024" ) public void testStaticMetamodel() { EntityManagerFactory emf = TestingEntityManagerFactoryGenerator.generateEntityManagerFactory( AvailableSettings.LOADED_CLASSES, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java index f3f4e4107f..4817b06e2a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java @@ -12,7 +12,7 @@ import java.util.Arrays; import org.hibernate.orm.test.jpa.TestingEntityManagerFactoryGenerator; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.junit.jupiter.api.Test; @@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @BaseUnitTest public class MappedSuperclassWithEntityWithIdClassTest { @Test - @TestForIssue( jiraKey = "HHH-5024" ) + @JiraKey( value = "HHH-5024" ) public void testStaticMetamodel() { EntityManagerFactory emf = TestingEntityManagerFactoryGenerator.generateEntityManagerFactory( AvailableSettings.LOADED_CLASSES, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java index 1761146ef4..27def8f7d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.EntityManagerFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.jpa.TestingEntityManagerFactoryGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.orm.junit.FailureExpected; @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Oliver Breidenbach */ -@TestForIssue(jiraKey = "HHH-11078") +@JiraKey(value = "HHH-11078") @BaseUnitTest public class MappedSuperclassWithOverriddenAttributeTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractJpaMetamodelPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractJpaMetamodelPopulationTest.java index 715dd4df5a..7305cdc4bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractJpaMetamodelPopulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractJpaMetamodelPopulationTest.java @@ -25,7 +25,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12871") +@JiraKey(value = "HHH-12871") public abstract class AbstractJpaMetamodelPopulationTest extends BaseEntityManagerFunctionalTestCase { @Entity(name = "SimpleAnnotatedEntity") public static class SimpleAnnotatedEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java index 108fd4df1b..f3a1275881 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.metamodel; import java.sql.Date; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class EmbeddedTypeTest { @Test - @TestForIssue(jiraKey = "HHH-6896") + @JiraKey(value = "HHH-6896") public void ensureComponentsReturnedAsManagedType(EntityManagerFactoryScope scope) { ManagedType managedType = scope.getEntityManagerFactory() .getMetamodel() @@ -40,7 +40,7 @@ public class EmbeddedTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-4702") + @JiraKey(value = "HHH-4702") public void testSingularAttributeAccessByName(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -54,7 +54,7 @@ public class EmbeddedTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-5821") + @JiraKey(value = "HHH-5821") public void testVersionAttributeMetadata(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java index d74d2bf26d..5866ede093 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.metamodel; import jakarta.persistence.metamodel.EmbeddableType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -19,7 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Christian Beikov */ -@TestForIssue( jiraKey = "HHH-11540" ) +@JiraKey( value = "HHH-11540" ) @Jpa(annotatedClasses = { Person.class, PersonId.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelDisabledPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelDisabledPopulationTest.java index 1df48e0fe3..4a0cc116b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelDisabledPopulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelDisabledPopulationTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.metamodel; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12871") +@JiraKey(value = "HHH-12871") public class JpaMetamodelDisabledPopulationTest extends AbstractJpaMetamodelPopulationTest { @Override protected String getJpaMetamodelPopulationValue() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelEnabledPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelEnabledPopulationTest.java index dd7f0e25ed..ac8cd2ec78 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelEnabledPopulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelEnabledPopulationTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.metamodel; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12871") +@JiraKey(value = "HHH-12871") public class JpaMetamodelEnabledPopulationTest extends AbstractJpaMetamodelPopulationTest { @Override protected String getJpaMetamodelPopulationValue() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java index 9d90cc86f8..af06f554c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.metamodel; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12871") +@JiraKey(value = "HHH-12871") public class JpaMetamodelIgnoreUnsupportedPopulationTest extends AbstractJpaMetamodelPopulationTest { @Override protected String getJpaMetamodelPopulationValue() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java index f7d26aef81..ffe3efd367 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java @@ -19,7 +19,7 @@ import org.hibernate.testing.orm.jpa.PersistenceUnitDescriptorAdapter; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.orm.junit.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class MappedSuperclassType2Test { @Test - @TestForIssue( jiraKey = "HHH-8534" ) + @JiraKey( value = "HHH-8534" ) @FailureExpected( jiraKey = "HHH-8534" ) public void testMappedSuperclassAccessNoEntity() { // stupid? yes. tck does it? yes. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java index d446dd083f..f328ba12ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.metamodel.EntityType; import jakarta.persistence.metamodel.IdentifiableType; import jakarta.persistence.metamodel.ManagedType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.fail; public class MappedSuperclassTypeTest { @Test - @TestForIssue( jiraKey = "HHH-6896" ) + @JiraKey( value = "HHH-6896" ) public void ensureMappedSuperclassTypeReturnedAsManagedType(EntityManagerFactoryScope scope) { ManagedType type = scope.getEntityManagerFactory().getMetamodel().managedType( SomeMappedSuperclass.class ); // the issue was in regards to throwing an exception, but also check for nullness @@ -36,7 +36,7 @@ public class MappedSuperclassTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-8533" ) + @JiraKey( value = "HHH-8533" ) @SuppressWarnings("unchecked") public void testAttributeAccess(EntityManagerFactoryScope scope) { final EntityType entityType = scope.getEntityManagerFactory().getMetamodel().entity( SomeMappedSuperclassSubclass.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java index b8842723dc..262591fa5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.metamodel.Attribute; import jakarta.persistence.metamodel.EmbeddableType; import jakarta.persistence.metamodel.ManagedType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class EmbeddableInSuperClassTest { @Test - @TestForIssue(jiraKey = "HHH-6475") + @JiraKey(value = "HHH-6475") public void ensureAttributeForEmbeddableIsGeneratedInMappedSuperClass(EntityManagerFactoryScope scope) { EmbeddableType embeddableType = scope.getEntityManagerFactory().getMetamodel().embeddable( EmbeddableEntity.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java index b67ccece08..e03ff5ac91 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.metamodel.attributeInSuper; import jakarta.persistence.metamodel.EmbeddableType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -29,7 +29,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class FunkyExtendedEmbeddedIdTest { @Test - @TestForIssue(jiraKey = "HHH-8712") + @JiraKey(value = "HHH-8712") public void ensureAttributeForEmbeddableIsGeneratedInMappedSuperClass(EntityManagerFactoryScope scope) { EmbeddableType woci = scope.getEntityManagerFactory().getMetamodel() .embeddable( WorkOrderComponentId.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java index 7325a10b47..74f8b137ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java @@ -10,7 +10,7 @@ import org.hibernate.community.dialect.AltibaseDialect; import org.hibernate.dialect.HANADialect; import org.hibernate.dialect.OracleDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SkipForDialect; import org.hibernate.orm.test.jpa.model.AbstractJPATest; @@ -63,7 +63,7 @@ public class MutableNaturalIdTest extends AbstractJPATest { } @Test - @TestForIssue(jiraKey = "HHH-7304") + @JiraKey(value = "HHH-7304") public void testInLineSynchWithIdentityColumn() { inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/NaturalIdAndLazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/NaturalIdAndLazyLoadingTest.java index 8be153e0be..3ecc6bb3b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/NaturalIdAndLazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/NaturalIdAndLazyLoadingTest.java @@ -12,7 +12,7 @@ import java.util.List; import org.hibernate.Hibernate; import org.hibernate.annotations.NaturalId; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeEach; @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; NaturalIdAndLazyLoadingTest.Currency.class } ) -@TestForIssue(jiraKey = "HHH-15481") +@JiraKey(value = "HHH-15481") public class NaturalIdAndLazyLoadingTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/FindTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/FindTest.java index 548a9cf817..fff71973e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/FindTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/FindTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.ops; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -47,7 +47,7 @@ public class FindTest { } @Test - @TestForIssue(jiraKey = "HHH-9856") + @JiraKey(value = "HHH-9856") public void testNonEntity(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java index 84a2bed30d..247b23ef25 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java @@ -12,7 +12,7 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.fail; public class GetLoadJpaComplianceTest { @Test - @TestForIssue(jiraKey = "HHH-12034") + @JiraKey(value = "HHH-12034") public void testLoadIdNotFound_FieldBasedAccess(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { @@ -67,7 +67,7 @@ public class GetLoadJpaComplianceTest { } @Test - @TestForIssue(jiraKey = "HHH-12034") + @JiraKey(value = "HHH-12034") public void testReferenceIdNotFound_FieldBasedAccess(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { @@ -93,7 +93,7 @@ public class GetLoadJpaComplianceTest { } @Test - @TestForIssue(jiraKey = "HHH-12034") + @JiraKey(value = "HHH-12034") public void testLoadIdNotFound_PropertyBasedAccess(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { @@ -120,7 +120,7 @@ public class GetLoadJpaComplianceTest { } @Test - @TestForIssue(jiraKey = "HHH-12034") + @JiraKey(value = "HHH-12034") public void testReferenceIdNotFound_PropertyBasedAccess(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java index f14685c4cf..f30bca6f7c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java @@ -11,7 +11,7 @@ import org.hibernate.Session; import org.hibernate.cfg.Environment; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -160,7 +160,7 @@ public class GetLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-9856" ) + @JiraKey( value = "HHH-9856" ) public void testNonEntity(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { @@ -180,7 +180,7 @@ public class GetLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-11838") + @JiraKey( value = "HHH-11838") public void testLoadGetId(EntityManagerFactoryScope scope) { Workload workload = scope.fromTransaction( entityManager -> { @@ -208,7 +208,7 @@ public class GetLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-12034") + @JiraKey( value = "HHH-12034") public void testLoadIdNotFound_FieldBasedAccess(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { @@ -231,7 +231,7 @@ public class GetLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-12034") + @JiraKey( value = "HHH-12034") public void testReferenceIdNotFound_FieldBasedAccess(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { @@ -253,7 +253,7 @@ public class GetLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-12034") + @JiraKey( value = "HHH-12034") public void testLoadIdNotFound_PropertyBasedAccess(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { @@ -276,7 +276,7 @@ public class GetLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-12034") + @JiraKey( value = "HHH-12034") public void testReferenceIdNotFound_PropertyBasedAccess(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java index a3e050646a..ca09c0d849 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java @@ -15,13 +15,13 @@ import jakarta.persistence.OneToMany; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil2.fromTransaction; import static org.hibernate.testing.transaction.TransactionUtil2.inTransaction; -@TestForIssue( jiraKey = "HHH-14608") +@JiraKey( value = "HHH-14608") public class MergeJpaComplianceTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java index 9c0861dfc1..1bd1cd708d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java @@ -17,7 +17,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test; public class RemoveOrderingTest { @Test - @TestForIssue(jiraKey = "HHH-8550") + @JiraKey(value = "HHH-8550") @FailureExpected(jiraKey = "HHH-8550") public void testManyToOne(EntityManagerFactoryScope scope) { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteOneToManyOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteOneToManyOrphansTest.java index afc9c843d6..7b5dea86d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteOneToManyOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteOneToManyOrphansTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.orphan.onetomany; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -54,7 +54,7 @@ public class DeleteOneToManyOrphansTest { } @Test - @TestForIssue( jiraKey = "HHH-9568") + @JiraKey( value = "HHH-9568") // @FailureExpected( jiraKey = "HHH-9568" ) public void testOrphanedWhileManaged(EntityManagerFactoryScope scope) { Long productId = scope.fromTransaction( @@ -83,7 +83,7 @@ public class DeleteOneToManyOrphansTest { } @Test - @TestForIssue( jiraKey = "HHH-9568") + @JiraKey( value = "HHH-9568") // @FailureExpected( jiraKey = "HHH-9568" ) public void testOrphanedWhileManagedMergeOwner(EntityManagerFactoryScope scope) { Long productId = scope.fromTransaction( @@ -113,7 +113,7 @@ public class DeleteOneToManyOrphansTest { } @Test - @TestForIssue( jiraKey = "HHH-9568") + @JiraKey( value = "HHH-9568") // @FailureExpected( jiraKey = "HHH-9568" ) public void testReplacedWhileManaged(EntityManagerFactoryScope scope) { Long featureNewId = scope.fromTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java index bd87399889..b6609f676a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.orm.junit.Jpa; @@ -77,7 +77,7 @@ public class DeleteSharedOneToManyOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-11144") + @JiraKey(value = "HHH-11144") @FailureExpected( jiraKey = "HHH-11144" ) public void testInitializingSecondCollection(EntityManagerFactoryScope scope) { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyOrphanWithIdentityIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyOrphanWithIdentityIdTest.java index 5068bbf14d..47eb18ca3b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyOrphanWithIdentityIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyOrphanWithIdentityIdTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; EagerOneToManyOrphanWithIdentityIdTest.Child.class } ) -@TestForIssue(jiraKey = "HHH-15258") +@JiraKey(value = "HHH-15258") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class) public class EagerOneToManyOrphanWithIdentityIdTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoad2Test.java index ec3fb3b946..2f60de11d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoad2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoad2Test.java @@ -5,7 +5,7 @@ import java.util.List; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import jakarta.persistence.OneToMany; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; -@TestForIssue(jiraKey = "HHH-16334") +@JiraKey(value = "HHH-16334") @DomainModel( annotatedClasses = { EagerOneToManyPersistAndLoad2Test.Parent.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoadTest.java index cc5653a9a2..5bea66be8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerOneToManyPersistAndLoadTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import jakarta.persistence.OneToMany; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; -@TestForIssue(jiraKey = "HHH-16334") +@JiraKey(value = "HHH-16334") @DomainModel( annotatedClasses = { EagerOneToManyPersistAndLoadTest.Parent.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoad2Test.java index b12102fd7c..3962ad4917 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoad2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoad2Test.java @@ -7,7 +7,7 @@ import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import jakarta.persistence.OneToMany; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; -@TestForIssue(jiraKey = "HHH-16334") +@JiraKey(value = "HHH-16334") @DomainModel( annotatedClasses = { EagerSubSelectOneToManyPersistAndLoad2Test.Parent.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoadTest.java index 9ac08363ab..450c58f2cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EagerSubSelectOneToManyPersistAndLoadTest.java @@ -7,7 +7,7 @@ import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import jakarta.persistence.OneToMany; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; -@TestForIssue(jiraKey = "HHH-16334") +@JiraKey(value = "HHH-16334") @DomainModel( annotatedClasses = { EagerSubSelectOneToManyPersistAndLoadTest.Parent.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EmbeddablePersistAndQueryInSameTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EmbeddablePersistAndQueryInSameTransactionTest.java index b4234c7891..6ac63e3fa2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EmbeddablePersistAndQueryInSameTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/EmbeddablePersistAndQueryInSameTransactionTest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; EmbeddablePersistAndQueryInSameTransactionTest.Dog.class } ) -@TestForIssue(jiraKey = "HHH-16117") +@JiraKey(value = "HHH-16117") class EmbeddablePersistAndQueryInSameTransactionTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyOrphanWithIdentityIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyOrphanWithIdentityIdTest.java index 0d43856286..5a6ac59464 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyOrphanWithIdentityIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyOrphanWithIdentityIdTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; LazyOneToManyOrphanWithIdentityIdTest.Child.class } ) -@TestForIssue(jiraKey = "HHH-15258") +@JiraKey(value = "HHH-15258") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class) public class LazyOneToManyOrphanWithIdentityIdTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoad2Test.java index f6b2b6405f..6db2ea9847 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoad2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoad2Test.java @@ -5,7 +5,7 @@ import java.util.List; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -@TestForIssue(jiraKey = "HHH-16334") +@JiraKey(value = "HHH-16334") @DomainModel( annotatedClasses = { LazyOneToManyPersistAndLoad2Test.Parent.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoadTest.java index 9463ca656b..c2afe40554 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/LazyOneToManyPersistAndLoadTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -@TestForIssue(jiraKey = "HHH-16334") +@JiraKey(value = "HHH-16334") @DomainModel( annotatedClasses = { LazyOneToManyPersistAndLoadTest.Parent.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java index 6bd7cf1f2f..08408bea32 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java @@ -7,7 +7,7 @@ import java.util.Set; import org.hibernate.Hibernate; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import jakarta.persistence.OneToMany; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; -@TestForIssue(jiraKey = "HHH-16334") +@JiraKey(value = "HHH-16334") @DomainModel( annotatedClasses = { OneToManyPersistAndLoad2Test.Parent.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java index 54e9fc520b..ea6216324c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java @@ -7,7 +7,7 @@ import java.util.Set; import org.hibernate.Hibernate; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import jakarta.persistence.OneToMany; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; -@TestForIssue(jiraKey = "HHH-16334") +@JiraKey(value = "HHH-16334") @DomainModel( annotatedClasses = { OneToManyPersistAndLoadTest.Parent.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/PersistAndQueryingInSameTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/PersistAndQueryingInSameTransactionTest.java index a09168fe66..f31831cee5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/PersistAndQueryingInSameTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/PersistAndQueryingInSameTransactionTest.java @@ -7,7 +7,7 @@ import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.notNullValue; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15512") +@JiraKey(value = "HHH-15512") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class) public class PersistAndQueryingInSameTransactionTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerNonOptionalOrphanRemovalTest.java index 78783dd64b..0963e89e02 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerNonOptionalOrphanRemovalTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.orphan.onetoone; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9663") +@JiraKey(value = "HHH-9663") @Jpa( annotatedClasses = { OneToOneEagerNonOptionalOrphanRemovalTest.Car.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerOrphanRemovalTest.java index 8a3c8f0b32..c2eeff24a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneEagerOrphanRemovalTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.orphan.onetoone; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9663") +@JiraKey(value = "HHH-9663") @Jpa( annotatedClasses = { OneToOneEagerOrphanRemovalTest.Car.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyNonOptionalOrphanRemovalTest.java index 7f0e58837e..efae319226 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyNonOptionalOrphanRemovalTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.orphan.onetoone; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9663") +@JiraKey(value = "HHH-9663") @Jpa( annotatedClasses = { OneToOneLazyNonOptionalOrphanRemovalTest.Car.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyOrphanRemovalTest.java index ee505513b9..9094b5b4bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneLazyOrphanRemovalTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.orphan.onetoone; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9663") +@JiraKey(value = "HHH-9663") @Jpa( annotatedClasses = { OneToOneLazyOrphanRemovalTest.Car.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneOrphanTest.java index f5fa01b02e..121c23c1a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneOrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/OneToOneOrphanTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.orphan.onetoone; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.fail; public class OneToOneOrphanTest { @Test - @TestForIssue(jiraKey = "HHH-9568") + @JiraKey(value = "HHH-9568") public void testFlushTransientOneToOneNoCascade(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java index 8ea3e2a530..aeadf7eb99 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; * shows that orphanRemoval = true is not removing the orphan of OneToOne relations in Embedded objects * for unidirectional relationship. * - * @TestForIssue( jiraKey = "HHH-9663" ) + * @JiraKey( value = "HHH-9663" ) */ @Jpa( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java index 224c25a985..810eb00831 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.EntityManager; import org.junit.Test; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -70,7 +70,7 @@ public class DeleteMultiLevelOrphansTest extends BaseEntityManagerFunctionalTest } @Test - @TestForIssue( jiraKey = "HHH-9091") + @JiraKey( value = "HHH-9091") public void testDirectAssociationOrphanedWhileManaged() { createData(); @@ -114,7 +114,7 @@ public class DeleteMultiLevelOrphansTest extends BaseEntityManagerFunctionalTest } @Test - @TestForIssue( jiraKey = "HHH-9091") + @JiraKey( value = "HHH-9091") public void testReplacedDirectAssociationWhileManaged() { createData(); @@ -203,7 +203,7 @@ public class DeleteMultiLevelOrphansTest extends BaseEntityManagerFunctionalTest } @Test - @TestForIssue( jiraKey = "HHH-9091") + @JiraKey( value = "HHH-9091") public void testDirectAndNestedAssociationsOrphanedWhileManaged() { createData(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java index caf7edcb53..843e49eeb1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java @@ -22,7 +22,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.jpa.boot.spi.PersistenceXmlParser; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; @@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11845") +@JiraKey(value = "HHH-11845") public class DuplicatePersistenceUnitNameTest extends BaseUnitTestCase { private Triggerable triggerable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/ExcludeUnlistedClassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/ExcludeUnlistedClassesTest.java index d7cc371100..3b6f33b348 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/ExcludeUnlistedClassesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/ExcludeUnlistedClassesTest.java @@ -23,7 +23,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.internal.util.ConfigHelper; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; import org.hibernate.jpa.boot.spi.PersistenceXmlParser; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.Test; @@ -44,7 +44,7 @@ import org.junit.Test; * * @author Brett Meyer */ -@TestForIssue(jiraKey = "HHH-8364") +@JiraKey(value = "HHH-8364") public class ExcludeUnlistedClassesTest extends BaseUnitTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/SharedCacheModeDeprecatedWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/SharedCacheModeDeprecatedWarningTest.java index 23e6420068..f62a86172a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/SharedCacheModeDeprecatedWarningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/SharedCacheModeDeprecatedWarningTest.java @@ -14,7 +14,7 @@ import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; import org.hibernate.jpa.boot.spi.Bootstrap; import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LogInspectionHelper; import org.hibernate.testing.logger.TriggerOnPrefixLogListener; import org.hibernate.testing.orm.jpa.PersistenceUnitInfoAdapter; @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Marco Belladelli */ -@TestForIssue(jiraKey = "HHH-15768") +@JiraKey(value = "HHH-15768") public class SharedCacheModeDeprecatedWarningTest { private TriggerOnPrefixLogListener trigger; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java index dc300c5994..c948ac9e76 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java @@ -21,7 +21,7 @@ import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertNull; public class TwoPersistenceUnits2LCDisabledEnabled { @Test - @TestForIssue( jiraKey = "HHH-11516" ) + @JiraKey( value = "HHH-11516" ) public void testDisabledEnabled() { final Map config = Environment.getProperties(); config.put( AvailableSettings.LOADED_CLASSES, Collections.singletonList( AnEntity.class ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/HSQLStoreProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/HSQLStoreProcedureTest.java index d2cd881405..3c42ee79a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/HSQLStoreProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/HSQLStoreProcedureTest.java @@ -35,7 +35,7 @@ import org.junit.Before; import org.junit.Test; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -68,7 +68,7 @@ public class HSQLStoreProcedureTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-10515") + @JiraKey(value = "HHH-10515") public void testNamedStoredProcedureExecution() { EntityManager em = entityManagerFactory.createEntityManager(); try { @@ -82,7 +82,7 @@ public class HSQLStoreProcedureTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-10915") + @JiraKey(value = "HHH-10915") public void testGetNamedParameters() { EntityManager em = entityManagerFactory.createEntityManager(); try { @@ -114,7 +114,7 @@ public class HSQLStoreProcedureTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-10915") + @JiraKey(value = "HHH-10915") public void testGetPositionalParameters() { EntityManager em = entityManagerFactory.createEntityManager(); try { @@ -142,7 +142,7 @@ public class HSQLStoreProcedureTest extends BaseEntityManagerFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-10915") + @JiraKey(value = "HHH-10915") public void testGetPositionalParameters2() { EntityManager em = entityManagerFactory.createEntityManager(); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByNameTest.java index fce6b1480c..4cc338817c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByNameTest.java @@ -31,7 +31,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -40,7 +40,7 @@ import static org.junit.Assert.fail; * @author Andrea Boriero * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-10756") +@JiraKey(value = "HHH-10756") @RequiresDialect(OracleDialect.class) public class StoreProcedureOutParameterByNameTest extends BaseEntityManagerFunctionalTestCase { EntityManagerFactory entityManagerFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByPositionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByPositionTest.java index ac6a0e74d2..80b6c97737 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByPositionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureOutParameterByPositionTest.java @@ -31,7 +31,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -40,7 +40,7 @@ import static org.junit.Assert.fail; * @author Andrea Boriero * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-10756") +@JiraKey(value = "HHH-10756") @RequiresDialect(OracleDialect.class) public class StoreProcedureOutParameterByPositionTest extends BaseEntityManagerFunctionalTestCase { EntityManagerFactory entityManagerFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByNameTest.java index 148d6ebab9..8edea7f18c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByNameTest.java @@ -27,7 +27,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -36,7 +36,7 @@ import static org.junit.Assert.fail; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-9286") +@JiraKey(value = "HHH-9286") @RequiresDialect(OracleDialect.class) public class StoreProcedureRefCursorOutParameterByNameTest extends BaseEntityManagerFunctionalTestCase { EntityManagerFactory entityManagerFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java index 28a6b27bf5..284479f884 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java @@ -27,7 +27,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -36,7 +36,7 @@ import static org.junit.Assert.fail; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-9286") +@JiraKey(value = "HHH-9286") @RequiresDialect(OracleDialect.class) public class StoreProcedureRefCursorOutParameterByPositionTest extends BaseEntityManagerFunctionalTestCase { EntityManagerFactory entityManagerFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java index 54934a1369..267b4d4884 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java @@ -12,7 +12,7 @@ import java.util.List; import org.hibernate.query.Query; import org.hibernate.query.SemanticException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.orm.test.jpa.model.AbstractJPATest; import org.hibernate.orm.test.jpa.model.Item; import org.junit.jupiter.api.Test; @@ -85,7 +85,7 @@ public class JPAQLComplianceTest extends AbstractJPATest { } @Test - @TestForIssue(jiraKey = "HHH-12290") + @JiraKey(value = "HHH-12290") public void testParametersMixturePositionalAndNamed() { inTransaction( s -> { @@ -102,7 +102,7 @@ public class JPAQLComplianceTest extends AbstractJPATest { } @Test - @TestForIssue(jiraKey = "HHH-12290") + @JiraKey(value = "HHH-12290") public void testParametersMixtureNamedAndPositional() { inTransaction( s -> { @@ -119,7 +119,7 @@ public class JPAQLComplianceTest extends AbstractJPATest { } @Test - @TestForIssue(jiraKey = "HHH-12290") + @JiraKey(value = "HHH-12290") public void testReusedNamedCollectionParam() { inTransaction( session -> { @@ -135,7 +135,7 @@ public class JPAQLComplianceTest extends AbstractJPATest { } @Test - @TestForIssue(jiraKey = "HHH-12290") + @JiraKey(value = "HHH-12290") public void testReusedPositionalCollectionParam() { inTransaction( session -> { @@ -154,7 +154,7 @@ public class JPAQLComplianceTest extends AbstractJPATest { * query is wrong in terms of JPA and exception must be thrown */ @Test - @TestForIssue(jiraKey = "HHH-12290") + @JiraKey(value = "HHH-12290") public void testParametersMixtureNamedCollectionAndPositional() { inTransaction( s -> { @@ -178,7 +178,7 @@ public class JPAQLComplianceTest extends AbstractJPATest { } @Test - @TestForIssue(jiraKey = "HHH-12290") + @JiraKey(value = "HHH-12290") public void testParameterCollectionParenthesesAndPositional() { final Item item = new Item( "Mouse" ); final Item item2 = new Item( "Computer" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/MapIssueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/MapIssueTest.java index c735fa79af..4b3c99c57b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/MapIssueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/MapIssueTest.java @@ -11,7 +11,7 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.orm.test.jpa.model.MapContent; import org.hibernate.orm.test.jpa.model.MapOwner; import org.hibernate.orm.test.jpa.model.Relationship; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -19,7 +19,7 @@ import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.Test; -@TestForIssue(jiraKey = "HHH-14279") +@JiraKey(value = "HHH-14279") @DomainModel( annotatedClasses = { MapOwner.class, MapContent.class, Relationship.class @@ -122,7 +122,7 @@ public class MapIssueTest { } @Test - @TestForIssue( jiraKey = "HHH-15357") + @JiraKey( value = "HHH-15357") public void testSelectMapKeyFk(SessionFactoryScope scope) { SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); statementInspector.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java index 3f95379261..13d3e5cc6d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java @@ -26,7 +26,7 @@ import org.hibernate.Session; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; @@ -64,7 +64,7 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8637" ) + @JiraKey( value = "HHH-8637" ) public void testFilteringDiscriminatorSubclasses() { Session s = openSession(); s.beginTransaction(); @@ -105,7 +105,7 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8637" ) + @JiraKey( value = "HHH-8637" ) public void testFilteringJoinedSubclasses() { Session s = openSession(); s.beginTransaction(); @@ -149,7 +149,7 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9862" ) + @JiraKey( value = "HHH-9862" ) public void testRestrictionsOnJoinedSubclasses() { Session s = openSession(); s.beginTransaction(); @@ -191,7 +191,7 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9411") + @JiraKey(value = "HHH-9411") public void testTreatWithRestrictionOnAbstractClass() { inTransaction( s -> { @@ -210,7 +210,7 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-16657") + @JiraKey(value = "HHH-16657") public void testTypeFilterInSubquery() { inTransaction( s -> { @@ -245,7 +245,7 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-16658") + @JiraKey(value = "HHH-16658") public void testPropagateEntityNameUsesFromDisjunction() { inSession( s -> { @@ -258,7 +258,7 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-16658") + @JiraKey(value = "HHH-16658") public void testPropagateEntityNameUsesFromDisjunction2() { inSession( s -> { @@ -271,7 +271,7 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-16657") + @JiraKey(value = "HHH-16657") public void testTreatInSelect() { inTransaction( s -> { @@ -301,7 +301,7 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-16571") // Sort of related to that issue + @JiraKey(value = "HHH-16571") // Sort of related to that issue public void testJoinSubclassOneToMany() { // Originally, the FK for "others" used the primary key of the root table JoinedEntity // Since we didn't register an entity use, we wrongly pruned that table before. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java index 2d80a1fd39..0235144bbc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java @@ -15,7 +15,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -34,7 +34,7 @@ import jakarta.persistence.TypedQuery; import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE; import static org.junit.jupiter.api.Assertions.assertEquals; -@TestForIssue(jiraKey = "HHH-15086") +@JiraKey(value = "HHH-15086") @Jpa( annotatedClasses = CachedQueryDirectReferenceTest.ImmutableEmployee.class, generateStatistics = true, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.java index 8f5f5f4ce8..bf9e8462be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.java @@ -13,7 +13,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-9573") +@JiraKey(value = "HHH-9573") @Jpa( annotatedClasses = Employee.class, generateStatistics = true, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java index 1ceec38323..e7ef51d333 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java @@ -22,7 +22,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.OracleDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; }, useCollectingStatementInspector = true ) -@TestForIssue(jiraKey = "HHH-11640") +@JiraKey(value = "HHH-11640") public class NamedQueryCommentTest { private static SQLStatementInspector statementInspector; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java index c82ea89fc4..8eb01a25c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java @@ -18,7 +18,7 @@ import org.hibernate.annotations.NamedQuery; import org.hibernate.query.NativeQuery; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Yoann Rodiere */ -@TestForIssue(jiraKey = "HHH-12795") +@JiraKey(value = "HHH-12795") @Jpa(annotatedClasses = { NamedQueryFlushModeTest.TestEntity.class }) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java index 1d0ca7adfc..6c172d59d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java @@ -19,7 +19,7 @@ import org.hibernate.Session; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.NativeQuery; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.JiraKey; import org.junit.After; import org.junit.Before; @@ -39,7 +39,7 @@ import org.assertj.core.api.InstanceOfAssertFactories; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11092") +@JiraKey(value = "HHH-11092") public class NamedQueryTest extends BaseEntityManagerFunctionalTestCase { private static final String[] GAME_TITLES = { "Halo", "Grand Theft Auto", "NetHack" }; @@ -169,7 +169,7 @@ public class NamedQueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12621") + @JiraKey(value = "HHH-12621") public void testNativeQueriesFromNamedQueriesDoNotShareQuerySpaces() { doInJPA( this::entityManagerFactory, entityManager -> { Query originalQuery = entityManager.createNativeQuery( "select g from Game g where title = ?1" ); @@ -188,7 +188,7 @@ public class NamedQueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11413") + @JiraKey(value = "HHH-11413") public void testNamedNativeQueryExceptionNoResultDefined() { doInJPA( this::entityManagerFactory, entityManager -> { assertThrows( @@ -200,7 +200,7 @@ public class NamedQueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11413") + @JiraKey(value = "HHH-11413") public void testNamedQueryAddedFromTypedNativeQuery() { doInJPA( this::entityManagerFactory, entityManager -> { final Query query = entityManager.createNativeQuery( @@ -273,7 +273,7 @@ public class NamedQueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-14816") + @JiraKey(value = "HHH-14816") public void testQueryHintLockMode() { doInJPA( this::entityManagerFactory, entityManager -> { Query query = entityManager.createNamedQuery( "NamedNativeQuery" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java index 01aad24050..ca24161bcf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java @@ -22,7 +22,7 @@ import org.hibernate.Session; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.query.NativeQuery; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -67,7 +67,7 @@ public class NativeQueryOrdinalParametersTest { } @Test - @TestForIssue(jiraKey = "HHH-10885") + @JiraKey(value = "HHH-10885") public void testNativeQueryIndexedOrdinalParameter(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -80,7 +80,7 @@ public class NativeQueryOrdinalParametersTest { } @Test - @TestForIssue(jiraKey = "HHH-10885") + @JiraKey(value = "HHH-10885") public void testNativeQueryOrdinalParameter(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -93,7 +93,7 @@ public class NativeQueryOrdinalParametersTest { } @Test - @TestForIssue(jiraKey = "HHH-11121") + @JiraKey(value = "HHH-11121") public void testConflictWithSessionNativeQuery(EntityManagerFactoryScope scope) { final String sqlString = "SELECT * FROM GAME g WHERE title = ?"; @@ -122,7 +122,7 @@ public class NativeQueryOrdinalParametersTest { } @Test - @TestForIssue(jiraKey = "HHH-12532") + @JiraKey(value = "HHH-12532") // Add RequiresDialect be Cockroach version 201 @RequiresDialect( value = PostgreSQLDialect.class ) @RequiresDialect( value = CockroachDialect.class, majorVersion = 20, minorVersion = 1 ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java index e296088901..ee9d14e78a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java @@ -56,7 +56,7 @@ import org.hibernate.type.descriptor.jdbc.RealJdbcType; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.orm.junit.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.CustomRunner; import org.hibernate.testing.orm.jpa.PersistenceUnitDescriptorAdapter; import org.hibernate.testing.orm.junit.DialectContext; @@ -85,7 +85,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; * We use one entity type per JDBC type, just in case some types are not supported in some dialects, * so that we can more easily disable testing of a particular type in a particular dialect. */ -@TestForIssue(jiraKey = "HHH-7318") +@JiraKey(value = "HHH-7318") @RunWith(CustomRunner.class) public class NativeQueryResultTypeAutoDiscoveryTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NonWhereQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NonWhereQueryTest.java index e21499d33b..33027ef255 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NonWhereQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NonWhereQueryTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterAll; @@ -29,7 +29,7 @@ import org.junit.jupiter.api.BeforeAll; /** * @author Jan Schatteman */ -@TestForIssue( jiraKey = "HHH-15257" ) +@JiraKey( value = "HHH-15257" ) @Jpa( annotatedClasses = { NonWhereQueryTest.TestUser.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java index 0daa468b65..5bd81f7ff8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Id; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull; * @author Vlad Mihalcea * @see JPA-31 */ -@TestForIssue(jiraKey = "JPA-31") +@JiraKey(value = "JPA-31") public class NullParameterQueryTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java index d0057a1e32..c740baf9a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.hibernate.dialect.OracleDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -49,7 +49,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; OracleConstructorResultNativeQueryTest.Person.class } ) -@TestForIssue(jiraKey = "HHH-10323") +@JiraKey(value = "HHH-10323") @RequiresDialect(value = OracleDialect.class) public class OracleConstructorResultNativeQueryTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java index 07f4a78e5a..27985c6769 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java @@ -21,7 +21,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.usertype.UserType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.Entity; @@ -45,7 +45,7 @@ public class QueryParametersValidationTest extends BaseEntityManagerFunctionalTe options.put( AvailableSettings.JPA_LOAD_BY_ID_COMPLIANCE, "true" ); } - @TestForIssue(jiraKey = "HHH-11397") + @JiraKey(value = "HHH-11397") @Test(expected = IllegalArgumentException.class) public void setParameterWithWrongTypeShouldThrowIllegalArgumentException() { final EntityManager entityManager = entityManagerFactory().createEntityManager(); @@ -69,7 +69,7 @@ public class QueryParametersValidationTest extends BaseEntityManagerFunctionalTe } @Test - @TestForIssue(jiraKey = "HHH-11971") + @JiraKey(value = "HHH-11971") public void setPrimitiveParameterShouldNotThrowExceptions() { final EntityManager entityManager = entityManagerFactory().createEntityManager(); try { @@ -88,7 +88,7 @@ public class QueryParametersValidationTest extends BaseEntityManagerFunctionalTe } @Test(expected = IllegalArgumentException.class) - @TestForIssue( jiraKey = "HHH-11971") + @JiraKey( value = "HHH-11971") public void setWrongPrimitiveParameterShouldThrowIllegalArgumentException() { final EntityManager entityManager = entityManagerFactory().createEntityManager(); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java index dee7e064cf..d4d2cd4e86 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11579") +@JiraKey(value = "HHH-11579") @Jpa( annotatedClasses = {QueryParametersWithDisabledValidationTest.TestEntity.class} ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java index 9a1d36e791..a99c769840 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java @@ -42,7 +42,7 @@ import org.hibernate.orm.test.jpa.Wallet; import org.hibernate.stat.Statistics; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.Jira; import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; @@ -82,7 +82,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7192") + @JiraKey(value = "HHH-7192") public void testTypedManipulationQueryError() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -416,7 +416,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10161") + @JiraKey(value = "HHH-10161") @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") @@ -502,7 +502,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10161") + @JiraKey(value = "HHH-10161") @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") @@ -666,7 +666,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH_7407") + @JiraKey(value = "HHH_7407") public void testMultipleParameterLists() throws Exception { final Item item = new Item( "Mouse", "Micro$oft mouse" ); final Item item2 = new Item( "Computer", "Dell computer" ); @@ -714,7 +714,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH_8949") + @JiraKey(value = "HHH_8949") public void testCacheStoreAndRetrieveModeParameter() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -775,7 +775,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12290") + @JiraKey(value = "HHH-12290") public void testParameterCollectionAndPositional() { final Item item = new Item( "Mouse", "Microsoft mouse" ); final Item item2 = new Item( "Computer", "Dell computer" ); @@ -801,7 +801,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12290") + @JiraKey(value = "HHH-12290") public void testParameterCollectionParenthesesAndPositional() { final Item item = new Item( "Mouse", "Microsoft mouse" ); final Item item2 = new Item( "Computer", "Dell computer" ); @@ -827,7 +827,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12290") + @JiraKey(value = "HHH-12290") public void testParameterCollectionSingletonParenthesesAndPositional() { final Item item = new Item( "Mouse", "Microsoft mouse" ); final Item item2 = new Item( "Computer", "Dell computer" ); @@ -1286,7 +1286,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10803") + @JiraKey(value = "HHH-10803") public void testNamedParameterWithUserError() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -1604,7 +1604,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10269") + @JiraKey(value = "HHH-10269") public void testFailingNativeQuery() { final EntityManager entityManager = getOrCreateEntityManager(); try { @@ -1625,7 +1625,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10833") + @JiraKey(value = "HHH-10833") public void testGetSingleResultWithNoResultException() { final EntityManager entityManager = getOrCreateEntityManager(); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java index 6bfa8ed8e4..72afc41dc7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.NamedEntityGraph; import jakarta.persistence.Table; import jakarta.persistence.TypedQuery; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; * * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-9230") +@JiraKey(value = "HHH-9230") @Jpa(annotatedClasses = { QueryWithInParamListAndNamedEntityGraphTest.Person.class }) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java index ded488c847..32cc879331 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Andrea Boriero @@ -53,7 +53,7 @@ public class QueryWithLiteralsInSelectExpressionTest extends BaseEntityManagerFu } @Test - @TestForIssue(jiraKey = "HHH-10230") + @JiraKey(value = "HHH-10230") public void testSelectLiterals() { final EntityManager entityManager = getOrCreateEntityManager(); try { @@ -73,7 +73,7 @@ public class QueryWithLiteralsInSelectExpressionTest extends BaseEntityManagerFu } @Test - @TestForIssue(jiraKey = "HHH-10230") + @JiraKey(value = "HHH-10230") public void testSelectNonNullLiteralsCastToBoolean() { final EntityManager entityManager = getOrCreateEntityManager(); try { @@ -93,7 +93,7 @@ public class QueryWithLiteralsInSelectExpressionTest extends BaseEntityManagerFu } @Test - @TestForIssue(jiraKey = "HHH-10230") + @JiraKey(value = "HHH-10230") public void testSelectNullLiterals() { final EntityManager entityManager = getOrCreateEntityManager(); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/RegisterNamedQueryWithParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/RegisterNamedQueryWithParameterTest.java index 74421d66a5..d30e4584d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/RegisterNamedQueryWithParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/RegisterNamedQueryWithParameterTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.jpa.query; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -19,7 +19,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @Jpa( annotatedClasses = RegisterNamedQueryWithParameterTest.TestEntity.class ) -@TestForIssue(jiraKey = "HHH-15653") +@JiraKey(value = "HHH-15653") public class RegisterNamedQueryWithParameterTest { private static final String QUERY_NAME = "ENTITY_BY_NAME"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseCriteriaWithMixedParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseCriteriaWithMixedParametersTest.java index a8bcb71a6f..2f5421b11d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseCriteriaWithMixedParametersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ReuseCriteriaWithMixedParametersTest.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.orm.test.jpa.Wallet; import org.hibernate.orm.test.jpa.Wallet_; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; @Jpa( annotatedClasses = { Wallet.class, ReuseCriteriaWithMixedParametersTest.Person.class } ) -@TestForIssue(jiraKey = "HHH-15142") +@JiraKey(value = "HHH-15142") public class ReuseCriteriaWithMixedParametersTest { @AfterEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java index 33ffe493b3..45fe82d3df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java @@ -6,7 +6,7 @@ import org.hibernate.query.sql.internal.NativeQueryImpl; import org.hibernate.query.sql.spi.NativeQueryImplementor; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -694,7 +694,7 @@ public class TupleNativeQueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11897") + @JiraKey(value = "HHH-11897") public void testGetElementsShouldNotThrowExceptionWhenResultContainsNullValue() { doInJPA(this::entityManagerFactory, entityManager -> { User user = entityManager.find(User.class, 1L); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java index 645ac89af7..5957fb03c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.jpa.refresh; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11188") +@JiraKey(value = "HHH-11188") @Jpa( annotatedClasses = { TestEntity.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaFileSchemaGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaFileSchemaGeneratorTest.java index ab49af7501..a994e3d881 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaFileSchemaGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaFileSchemaGeneratorTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.jpa.schemagen; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.RequiresDialect; /** * @author Vlad MIhalcea */ @RequiresDialect( H2Dialect.class ) -@TestForIssue( jiraKey = "HHH-10972" ) +@JiraKey( value = "HHH-10972" ) public class JpaFileSchemaGeneratorTest extends JpaSchemaGeneratorTest { protected String getLoadSqlScript() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java index 88b7d0e13a..5ecd79ece3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java @@ -17,7 +17,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.jpa.boot.spi.Bootstrap; import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.orm.junit.RequiresDialect; import org.junit.Assert; @@ -46,7 +46,7 @@ public class JpaSchemaGeneratorTest extends EntityManagerFactoryBasedFunctionalT } @Test - @TestForIssue(jiraKey = "HHH-8271") + @JiraKey(value = "HHH-8271") public void testSqlLoadScriptSourceClasspath() { Map settings = buildSettings(); settings.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "create-drop" ); @@ -56,7 +56,7 @@ public class JpaSchemaGeneratorTest extends EntityManagerFactoryBasedFunctionalT @Test - @TestForIssue(jiraKey = "HHH-8271") + @JiraKey(value = "HHH-8271") public void testSqlLoadScriptSourceUrl() { Map settings = buildSettings(); settings.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "create-drop" ); @@ -65,7 +65,7 @@ public class JpaSchemaGeneratorTest extends EntityManagerFactoryBasedFunctionalT } @Test - @TestForIssue(jiraKey = "HHH-8271") + @JiraKey(value = "HHH-8271") public void testSqlCreateScriptSourceClasspath() { Map settings = buildSettings(); settings.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "create-drop" ); @@ -75,7 +75,7 @@ public class JpaSchemaGeneratorTest extends EntityManagerFactoryBasedFunctionalT } @Test - @TestForIssue(jiraKey = "HHH-8271") + @JiraKey(value = "HHH-8271") public void testSqlCreateScriptSourceUrl() { Map settings = buildSettings(); settings.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "create-drop" ); @@ -86,7 +86,7 @@ public class JpaSchemaGeneratorTest extends EntityManagerFactoryBasedFunctionalT @Test - @TestForIssue(jiraKey = "HHH-8271") + @JiraKey(value = "HHH-8271") public void testSqlDropScriptSourceClasspath() { Map settings = buildSettings(); settings.put( AvailableSettings.JAKARTA_HBM2DDL_DROP_SOURCE, "metadata-then-script" ); @@ -96,7 +96,7 @@ public class JpaSchemaGeneratorTest extends EntityManagerFactoryBasedFunctionalT } @Test - @TestForIssue(jiraKey = "HHH-8271") + @JiraKey(value = "HHH-8271") public void testSqlDropScriptSourceUrl() { Map settings = buildSettings(); settings.put( AvailableSettings.JAKARTA_HBM2DDL_DROP_SOURCE, "metadata-then-script" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java index 1c5ac64cc2..ee9631e716 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.jpa.schemagen; import jakarta.persistence.TypedQuery; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -23,7 +23,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10104") +@JiraKey(value = "HHH-10104") @Jpa(annotatedClasses = { Document.class }) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java index 9db21011f0..b5fb7ca648 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java @@ -22,7 +22,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.jpa.boot.spi.Bootstrap; import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.AfterEach; @@ -78,7 +78,7 @@ public class SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest { } @Test - @TestForIssue(jiraKey = "HHH-10972") + @JiraKey(value = "HHH-10972") public void testEncoding() throws Exception { entityManagerFactoryBuilder.generateSchema(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java index 5e1c769b27..84b7fc709e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java @@ -28,7 +28,7 @@ import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; import org.hibernate.testing.orm.junit.SkipForDialect; import org.hibernate.tool.schema.spi.CommandAcceptanceException; import org.hibernate.tool.schema.spi.SchemaManagementException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -73,7 +73,7 @@ public class SchemaDatabaseFileGenerationFailureTest { } @Test - @TestForIssue(jiraKey = "HHH-12192") + @JiraKey(value = "HHH-12192") @SkipForDialect(dialectClass = PostgreSQLDialect.class, matchSubTypes = true, reason = "on postgres we send 'set client_min_messages = WARNING'") public void testErrorMessageContainsTheFailingDDLCommand() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java index 20dfcb21fd..18d9773a97 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java @@ -26,7 +26,7 @@ import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; import org.hibernate.testing.orm.junit.SkipForDialect; import org.hibernate.tool.schema.spi.CommandAcceptanceException; import org.hibernate.tool.schema.spi.SchemaManagementException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -64,7 +64,7 @@ public class SchemaScriptFileGenerationFailureTest { } @Test - @TestForIssue(jiraKey = "HHH-12192") + @JiraKey(value = "HHH-12192") @SkipForDialect(dialectClass = PostgreSQLDialect.class, matchSubTypes = true, reason = "on postgres we send 'set client_min_messages = WARNING'") public void testErrorMessageContainsTheFailingDDLCommand() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java index 2f246d8610..f164e63260 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java @@ -23,7 +23,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.jpa.boot.spi.Bootstrap; import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -63,7 +63,7 @@ public class SchemaScriptFileGenerationTest { } @Test - @TestForIssue(jiraKey = "10601") + @JiraKey(value = "10601") public void testGenerateSchemaDoesNotProduceTheSameStatementTwice() throws Exception { entityManagerFactoryBuilder.generateSchema(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java index 09e0a4b9a8..25c12162a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java @@ -13,13 +13,13 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.orm.test.jpa.schemagen.JpaSchemaGeneratorTest; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Vlad MIhalcea */ @RequiresDialect( H2Dialect.class ) -@TestForIssue( jiraKey = "HHH-10972" ) +@JiraKey( value = "HHH-10972" ) public class JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest extends JpaSchemaGeneratorTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java index 6a664277f4..d1c47cc5fb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.Id; import jakarta.persistence.PersistenceException; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test; public class EntityManagerDeserializationTest { @Test - @TestForIssue(jiraKey = "HHH-11555") + @JiraKey(value = "HHH-11555") public void deserializedEntityManagerPersistenceExceptionManagementTest(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java index 853e3feb03..24b3805ee8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java @@ -12,7 +12,7 @@ import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -25,7 +25,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11602") +@JiraKey(value = "HHH-11602") @Jpa( integrationSettings = { @Setting(name = AvailableSettings.GENERATE_STATISTICS, value = "true") } ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java index ce6be09076..e562266f55 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -64,7 +64,7 @@ public class ComponentCriteriaTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9642") + @JiraKey(value = "HHH-9642") public void testOneToManyJoinFetchedInEmbeddable() { Client client = new Client( 111, "steve", "ebersole" ); Alias alias = new Alias( "a", "guy", "work" ); @@ -115,7 +115,7 @@ public class ComponentCriteriaTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-4586") + @JiraKey(value = "HHH-4586") public void testParameterizedFunctions() { doInJPA( this::entityManagerFactory, em -> { CriteriaBuilder cb = em.getCriteriaBuilder(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java index 32165e5f02..a011c929a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java @@ -28,7 +28,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl; import org.hibernate.internal.SessionImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -101,7 +101,7 @@ public class CloseEntityManagerWithActiveTransactionTest { @Test - @TestForIssue(jiraKey = "HHH-10942") + @JiraKey(value = "HHH-10942") public void testPersistThenCloseWithAnActiveTransaction(EntityManagerFactoryScope scope) throws Exception { TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager(); try { @@ -128,7 +128,7 @@ public class CloseEntityManagerWithActiveTransactionTest { } @Test - @TestForIssue(jiraKey = "HHH-11166") + @JiraKey(value = "HHH-11166") public void testMergeThenCloseWithAnActiveTransaction(EntityManagerFactoryScope scope) throws Exception { TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager(); try { @@ -171,7 +171,7 @@ public class CloseEntityManagerWithActiveTransactionTest { @Test - @TestForIssue(jiraKey = "HHH-11269") + @JiraKey(value = "HHH-11269") public void testMergeWithDeletionOrphanRemovalThenCloseWithAnActiveTransaction(EntityManagerFactoryScope scope) throws Exception { TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager(); @@ -212,7 +212,7 @@ public class CloseEntityManagerWithActiveTransactionTest { } @Test - @TestForIssue(jiraKey = "HHH-11166") + @JiraKey(value = "HHH-11166") public void testUpdateThenCloseWithAnActiveTransaction(EntityManagerFactoryScope scope) throws Exception { TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager(); try { @@ -253,7 +253,7 @@ public class CloseEntityManagerWithActiveTransactionTest { } @Test - @TestForIssue(jiraKey = "HHH-11166") + @JiraKey(value = "HHH-11166") public void testRemoveThenCloseWithAnActiveTransaction(EntityManagerFactoryScope scope) throws Exception { TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager(); try { @@ -295,7 +295,7 @@ public class CloseEntityManagerWithActiveTransactionTest { } @Test - @TestForIssue(jiraKey = "HHH-11099") + @JiraKey(value = "HHH-11099") public void testCommitReleasesLogicalConnection(EntityManagerFactoryScope scope) throws Exception { TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager(); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java index 4dce1245ca..c10bb13aaf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; public class JtaGetTransactionThrowsExceptionTest { @Test() - @TestForIssue(jiraKey = "HHH-12487") + @JiraKey(value = "HHH-12487") public void onCloseEntityManagerTest(EntityManagerFactoryScope scope) { EntityManager em = createEntityManager( scope ); em.close(); @@ -50,7 +50,7 @@ public class JtaGetTransactionThrowsExceptionTest { } @Test() - @TestForIssue(jiraKey = "HHH-12487") + @JiraKey(value = "HHH-12487") public void onOpenEntityManagerTest(EntityManagerFactoryScope scope) { EntityManager em = createEntityManager( scope ); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java index 4a596df8e6..2bc906a020 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java @@ -20,7 +20,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.ExtraAssertions; @@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.fail; * * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-7451") +@JiraKey(value = "HHH-7451") @Jpa( annotatedClasses = { Book.class }, integrationSettings = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java index 6b3fb9cc90..e136309f02 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java @@ -26,7 +26,7 @@ import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProviderImpl; import org.hibernate.testing.orm.jpa.PersistenceUnitDescriptorAdapter; import org.hibernate.orm.test.jpa.SettingsGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.orm.junit.DialectContext; import org.junit.jupiter.api.AfterEach; @@ -89,7 +89,7 @@ public class TransactionCommitFailureTest { } @Test - @TestForIssue(jiraKey = "HHH-12285") + @JiraKey(value = "HHH-12285") public void assertConnectionIsReleasedIfRollbackFails() { EntityManager em = emf.createEntityManager(); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java index 1a341613cf..9ab34b6903 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java @@ -22,7 +22,7 @@ import org.hibernate.internal.SessionImpl; import org.hibernate.orm.test.jpa.txn.JtaTransactionJoiningTest; import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.ExtraAssertions; @@ -129,7 +129,7 @@ public class TransactionJoiningTest { } @Test - @TestForIssue(jiraKey = "HHH-10807") + @JiraKey(value = "HHH-10807") public void testIsJoinedAfterMarkedForRollbackImplicit(EntityManagerFactoryScope scope) throws Exception { EntityManager entityManager = null; TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager(); @@ -166,7 +166,7 @@ public class TransactionJoiningTest { } @Test - @TestForIssue(jiraKey = "HHH-10807") + @JiraKey(value = "HHH-10807") public void testIsJoinedAfterMarkedForRollbackExplicit(EntityManagerFactoryScope scope) throws Exception { EntityManager entityManager = null; TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager(); @@ -273,7 +273,7 @@ public class TransactionJoiningTest { * See HHH-7910 */ @Test - @TestForIssue(jiraKey = "HHH-7910") + @JiraKey(value = "HHH-7910") public void testMultiThreadTransactionTimeout(EntityManagerFactoryScope scope) throws Exception { EntityManager em = null; TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java index 47f73ed3dd..de88dbf26f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java @@ -14,7 +14,7 @@ import org.hibernate.Session; import org.hibernate.resource.transaction.spi.TransactionObserver; import org.hibernate.resource.jdbc.spi.JdbcSessionOwner; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -43,7 +43,7 @@ public class TransactionRollbackTest { } @Test - @TestForIssue( jiraKey = "HHH-11407") + @JiraKey( value = "HHH-11407") public void checkRollBackTransactionIsExecutedOnceWhenACommitFails(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java index 08cf55b531..ef5ba20e1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/FailingAddToBatchTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.transaction.batch; import org.hibernate.cfg.BatchSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.NotImplementedYet; @@ -23,7 +23,7 @@ import jakarta.persistence.PersistenceException; import static org.assertj.core.api.Assertions.assertThat; -@TestForIssue(jiraKey = "HHH-15082") +@JiraKey(value = "HHH-15082") @Jpa( annotatedClasses = { FailingAddToBatchTest.MyEntity.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java index fafeda3325..ca962dd199 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java @@ -10,7 +10,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.BatchSettings; import org.hibernate.orm.test.jpa.transaction.JtaPlatformSettingProvider; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.fail; * @author Gail Badner * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-13050") +@JiraKey(value = "HHH-13050") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class) @Jpa( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java index 409f468506..07e817705b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java @@ -10,7 +10,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.BatchSettings; import org.hibernate.orm.test.jpa.transaction.JtaPlatformSettingProvider; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-13050") +@JiraKey(value = "HHH-13050") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class) @Jpa( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java index 6e3c3c3cb7..256e774c68 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java @@ -13,7 +13,7 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl; import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.orm.junit.ExtraAssertions; import org.hibernate.orm.test.jpa.model.AbstractJPATest; @@ -38,7 +38,7 @@ public class ResourceLocalTransactionJoiningTest extends AbstractJPATest { } @Test - @TestForIssue(jiraKey = "HHH-9859") + @JiraKey(value = "HHH-9859") public void testExpectations() { // JPA spec is very vague on what should happen here. It does vaguely // imply that jakarta.persistence.EntityManager.joinTransaction() should only be used diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java index d7d1dbda2f..1ed44e0ad6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java @@ -12,7 +12,7 @@ import org.junit.Test; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.proxy.HibernateProxy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -38,7 +38,7 @@ public class GetIdentifierTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7561") + @JiraKey(value = "HHH-7561") public void testProxyObject() { EntityManager em = entityManagerFactory().createEntityManager(); em.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java index f829133f61..896cf69500 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.jpa.version; import org.junit.Test; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; @@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-7138" ) +@JiraKey( value = "HHH-7138" ) public class JpaSpecVersionValueUpdatingTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java index 32415e23c6..fdbeb3a7f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java @@ -10,8 +10,9 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -19,7 +20,10 @@ import org.junit.jupiter.api.Test; /** * @author Strong Liu */ -@TestForIssue( jiraKey = "HHH-6039, HHH-6100" ) +@JiraKeyGroup( value = { + @JiraKey( value = "HHH-6039" ), + @JiraKey( value = "HHH-6100" ) +} ) @Jpa( xmlMappings = {"org/hibernate/orm/test/jpa/xml/Qualifier.hbm.xml"} ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java index c63b14799a..3d042439a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test; ) public class XmlAndAnnotationAttributeOverrideTest { @Test - @TestForIssue(jiraKey = "HHH-14827") + @JiraKey(value = "HHH-14827") public void testDerivedClassAttributeOverriding(EntityManagerFactoryScope scope) { assertThat( SchemaUtil.getColumnNames( scope.getEntityManagerFactory(), DerivedEntityType.class ) ) .contains( "custom_name" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java index b56c9f24d9..278f035fbb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java @@ -22,7 +22,7 @@ import org.hibernate.event.spi.LoadEventListener; import org.hibernate.integrator.spi.Integrator; import org.hibernate.stat.spi.StatisticsImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BootstrapServiceRegistry; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -132,7 +132,7 @@ public class EagerKeyManyToOneTest { } @Test - @TestForIssue(jiraKey = "HHH-2277") + @JiraKey(value = "HHH-2277") public void testLoadEntityWithEagerFetchingToKeyManyToOneReferenceBackToSelf(SessionFactoryScope scope) { StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); statistics.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java index ff7112f4b4..c0a18d07e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.keymanytoone.bidir.ondelete; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -39,7 +39,7 @@ public class KeyManyToOneCascadeDeleteTest { } @Test - @TestForIssue(jiraKey = "HHH-7807") + @JiraKey(value = "HHH-7807") public void testEmbeddedCascadeRemoval(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java index 57dec16e47..d2c34fef56 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.keymanytoone.unidir.ondelete; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class KeyManyToOneCascadeDeleteTest { @Test - @TestForIssue(jiraKey = "HHH-7807") + @JiraKey(value = "HHH-7807") public void testComponentCascadeRemoval(SessionFactoryScope scope) { scope.inSession( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java index f83f53adf9..1f1e69a864 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Table; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -60,7 +60,7 @@ public class LazyPersistWithDetachedAssociationTest { } @Test - @TestForIssue(jiraKey = "HHH-3846") + @JiraKey(value = "HHH-3846") public void testDetachedAssociationOnPersisting(SessionFactoryScope scope) { Address loadedAddress = scope.fromTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java index 18fc5f6981..251cd18acb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java @@ -10,7 +10,7 @@ import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -75,7 +75,7 @@ public class AtomikosJtaLazyLoadingTest { } @Test - @TestForIssue(jiraKey = "HHH-7971") + @JiraKey(value = "HHH-7971") public void testLazyCollectionLoadingAfterEndTransaction(SessionFactoryScope scope) { Parent loadedParent = scope.fromTransaction( session -> diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java index 61ba1e5f77..c5d2c25aab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java @@ -10,7 +10,7 @@ import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -75,7 +75,7 @@ public class JtaLazyLoadingTest { } @Test - @TestForIssue(jiraKey = "HHH-7971") + @JiraKey(value = "HHH-7971") public void testLazyCollectionLoadingAfterEndTransaction(SessionFactoryScope scope) { Parent loadedParent = scope.fromTransaction( session -> diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java index 45a794853e..1e6e5d8e0e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.OneToOne; import org.hibernate.LazyInitializationException; import org.hibernate.internal.AbstractSharedSessionContract; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -67,7 +67,7 @@ public class LazyLoadingLoggingTest { } @Test - @TestForIssue(jiraKey = "HHH-12484") + @JiraKey(value = "HHH-12484") public void testNoSession(SessionFactoryScope scope) { Address address = scope.fromTransaction( session -> @@ -89,7 +89,7 @@ public class LazyLoadingLoggingTest { } @Test - @TestForIssue(jiraKey = "HHH-12484") + @JiraKey(value = "HHH-12484") public void testDisconnect(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java index 54b37324a3..31f33b8f3f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.lazyload; import org.hibernate.LazyInitializationException; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.fail; public class LazyLoadingNotFoundTest { @Test - @TestForIssue(jiraKey = "HHH-11179") + @JiraKey(value = "HHH-11179") public void testNonExistentLazyInitOutsideTransaction(SessionFactoryScope scope) { Child loadedChild = scope.fromTransaction( session -> session.getReference( Child.class, -1L ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java index 4589307a8b..be40007372 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.OneToOne; import org.hibernate.Hibernate; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -80,7 +80,7 @@ public class LazyLoadingTest { } @Test - @TestForIssue(jiraKey = "HHH-7971") + @JiraKey(value = "HHH-7971") public void testLazyCollectionLoadingAfterEndTransaction(SessionFactoryScope scope) { Parent loadedParent = scope.fromTransaction( session -> @@ -113,7 +113,7 @@ public class LazyLoadingTest { } @Test - @TestForIssue(jiraKey = "HHH-11838") + @JiraKey(value = "HHH-11838") public void testGetIdOneToOne(SessionFactoryScope scope) { final Object clientId = scope.fromTransaction( session -> { @@ -152,7 +152,7 @@ public class LazyLoadingTest { } @Test - @TestForIssue(jiraKey = "HHH-11838") + @JiraKey(value = "HHH-11838") public void testGetIdManyToOne(SessionFactoryScope scope) { Serializable accountId = scope.fromTransaction( session -> { Address address = new Address(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java index 3ec0f0a1b0..4ecf43a07c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java @@ -20,7 +20,7 @@ import org.hibernate.mapping.MetaAttribute; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.AfterEach; @@ -109,7 +109,7 @@ public class NonReflectiveBinderTest { } @Test - @TestForIssue(jiraKey = "HBX-718") + @JiraKey(value = "HBX-718") public void testNonMutatedInheritance() { PersistentClass cm = metadata.getEntityBinding( "org.hibernate.orm.test.legacy.Wicked" ); MetaAttribute metaAttribute = cm.getMetaAttribute( "globalmutated" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/limit/Oracle12LimitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/limit/Oracle12LimitTest.java index f19128709b..523e5d1b27 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/limit/Oracle12LimitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/limit/Oracle12LimitTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.dialect.OracleDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -23,7 +23,7 @@ import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; @RequiresDialect(value = OracleDialect.class, majorVersion = 12) -@TestForIssue(jiraKey = "HHH-14819") +@JiraKey(value = "HHH-14819") @DomainModel( annotatedClasses = { Oracle12LimitTest.Person.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java index 76f5af234c..4e73bdfbe0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.loading; import java.util.Collections; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import static org.hibernate.jpa.HibernateHints.HINT_READ_ONLY; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-11958" ) +@JiraKey( value = "HHH-11958" ) public class ReadonlyHintTest { private static final String ORIGINAL_NAME = "original"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionDialectWithLimitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionDialectWithLimitTest.java index a313844211..a0d3484d43 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionDialectWithLimitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionDialectWithLimitTest.java @@ -15,7 +15,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.loader.ast.internal.MultiKeyLoadHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -106,7 +106,7 @@ public class MultiLoadSubSelectCollectionDialectWithLimitTest { } @Test - @TestForIssue(jiraKey = "HHH-12740") + @JiraKey(value = "HHH-12740") public void testSubselect(SessionFactoryScope scope) { final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); final Dialect dialect = scope.getSessionFactory().getFastSessionServices().jdbcServices.getDialect(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java index 1179353373..f4e42367e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java @@ -15,7 +15,7 @@ import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -73,7 +73,7 @@ public class MultiLoadSubSelectCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-12740") + @JiraKey(value = "HHH-12740") public void testSubselect(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java index 76ad1195a4..4f9c22a6cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java @@ -21,7 +21,7 @@ import org.hibernate.internal.util.StringHelper; import org.hibernate.loader.ast.internal.MultiKeyLoadHelper; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.FailureExpected; @@ -117,7 +117,7 @@ public class MultiLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-10984" ) + @JiraKey( value = "HHH-10984" ) public void testUnflushedDeleteAndThenMultiLoadPart0(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -136,7 +136,7 @@ public class MultiLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-10984" ) + @JiraKey( value = "HHH-10984" ) public void testUnflushedDeleteAndThenMultiLoadPart1(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -153,7 +153,7 @@ public class MultiLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-10984" ) + @JiraKey( value = "HHH-10984" ) public void testUnflushedDeleteAndThenMultiLoadPart2(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -170,7 +170,7 @@ public class MultiLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-10984" ) + @JiraKey( value = "HHH-10984" ) public void testUnflushedDeleteAndThenMultiLoadPart3(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -187,7 +187,7 @@ public class MultiLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-10984" ) + @JiraKey( value = "HHH-10984" ) public void testUnflushedDeleteAndThenMultiLoadPart4(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -202,7 +202,7 @@ public class MultiLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-10617" ) + @JiraKey( value = "HHH-10617" ) public void testDuplicatedRequestedIds(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -216,7 +216,7 @@ public class MultiLoadTest { } @Test - @TestForIssue(jiraKey = "HHH-10617") + @JiraKey(value = "HHH-10617") public void testDuplicatedRequestedIdswithDisableOrderedReturn(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -230,7 +230,7 @@ public class MultiLoadTest { } @Test - @TestForIssue( jiraKey = "HHH-10617" ) + @JiraKey( value = "HHH-10617" ) public void testNonExistentIdRequest(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -307,7 +307,7 @@ public class MultiLoadTest { } @Test - @TestForIssue(jiraKey = "HHH-12944") + @JiraKey(value = "HHH-12944") public void testMultiLoadFrom2ndLevelCache(SessionFactoryScope scope) { final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); statementInspector.clear(); @@ -371,7 +371,7 @@ public class MultiLoadTest { } @Test - @TestForIssue(jiraKey = "HHH-12944") + @JiraKey(value = "HHH-12944") public void testUnorderedMultiLoadFrom2ndLevelCache(SessionFactoryScope scope) { final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); statementInspector.clear(); @@ -436,7 +436,7 @@ public class MultiLoadTest { } @Test - @TestForIssue(jiraKey = "HHH-12944") + @JiraKey(value = "HHH-12944") public void testOrderedMultiLoadFrom2ndLevelCachePendingDelete(SessionFactoryScope scope) { final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); statementInspector.clear(); @@ -477,7 +477,7 @@ public class MultiLoadTest { } @Test - @TestForIssue(jiraKey = "HHH-12944") + @JiraKey(value = "HHH-12944") public void testOrderedMultiLoadFrom2ndLevelCachePendingDeleteReturnRemoved(SessionFactoryScope scope) { final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); statementInspector.clear(); @@ -523,7 +523,7 @@ public class MultiLoadTest { } @Test - @TestForIssue(jiraKey = "HHH-12944") + @JiraKey(value = "HHH-12944") public void testUnorderedMultiLoadFrom2ndLevelCachePendingDelete(SessionFactoryScope scope) { final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); statementInspector.clear(); @@ -563,7 +563,7 @@ public class MultiLoadTest { } @Test - @TestForIssue(jiraKey = "HHH-12944") + @JiraKey(value = "HHH-12944") public void testUnorderedMultiLoadFrom2ndLevelCachePendingDeleteReturnRemoved(SessionFactoryScope scope) { final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); statementInspector.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/JpaLargeBlobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/JpaLargeBlobTest.java index af44a5adda..43b7e8ea2e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/JpaLargeBlobTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/JpaLargeBlobTest.java @@ -15,7 +15,7 @@ import org.hibernate.LobHelper; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Brett Meyer */ -@TestForIssue(jiraKey = "HHH-7698") +@JiraKey(value = "HHH-7698") @RequiresDialect(value = H2Dialect.class, comment = "HHH-7724") @DomainModel( annotatedClasses = LobEntity.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java index 791619994e..886f3db773 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.lob; import java.util.Random; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; * @author Chris Cranford */ @RequiresDialectFeature(feature = DialectFeatureChecks.ForceLobAsLastValue.class) -@TestForIssue(jiraKey = "HHH-8382") +@JiraKey(value = "HHH-8382") @DomainModel( xmlMappings = "org/hibernate/orm/test/lob/LobAsLastValue.hbm.xml" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java index c139cbacfb..0772cedc63 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java @@ -12,7 +12,7 @@ import org.hibernate.Session; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-2680" ) +@JiraKey( value = "HHH-2680" ) @RequiresDialectFeature( {DialectChecks.SupportsExpectedLobUsagePattern.class, DialectChecks.SupportsLobValueChangePropagation.class} ) // Skip for Sybase. HHH-6807 public class LobMergeTest extends BaseCoreFunctionalTestCase { private static final int LOB_SIZE = 10000; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java index 9e101dfb37..b0b578c859 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -31,7 +31,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isOneOf; import static org.hamcrest.core.Is.is; -@TestForIssue(jiraKey = "HHH-15162") +@JiraKey(value = "HHH-15162") @DomainModel( annotatedClasses = LobStringFunctionsTest.TestEntity.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java index 8a4603181e..52c6e4b8b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java @@ -15,7 +15,7 @@ import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.RequiresDialects; @@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11477") +@JiraKey(value = "HHH-11477") // Note that Cockroach doesn't support LOB functions. See https://github.com/cockroachdb/cockroach/issues/26725 @RequiresDialect(PostgreSQLDialect.class) @DomainModel( @@ -80,7 +80,7 @@ public class LobStringTest { } @Test - @TestForIssue(jiraKey = "HHH-11477") + @JiraKey(value = "HHH-11477") public void testHqlQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { final Query query = session.createQuery( "from TestEntity" ); @@ -104,7 +104,7 @@ public class LobStringTest { } @Test - @TestForIssue(jiraKey = "HHH-11477") + @JiraKey(value = "HHH-11477") @RequiresDialect(PostgreSQLDialect.class) public void testUsingStringLobAnnotatedPropertyInNativeQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -133,7 +133,7 @@ public class LobStringTest { } @Test - @TestForIssue(jiraKey = "HHH-11477") + @JiraKey(value = "HHH-11477") @RequiresDialect(PostgreSQLDialect.class) public void testSelectStringLobAnnotatedInNativeQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -151,7 +151,7 @@ public class LobStringTest { } @Test - @TestForIssue(jiraKey = "HHH-11477") + @JiraKey(value = "HHH-11477") @RequiresDialect(PostgreSQLDialect.class) public void testUsingLobPropertyInNativeQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -169,7 +169,7 @@ public class LobStringTest { } @Test - @TestForIssue(jiraKey = "HHH-11477") + @JiraKey(value = "HHH-11477") @RequiresDialect(PostgreSQLDialect.class) public void testSelectClobPropertyInNativeQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java index af70fce8c2..1273a013cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java @@ -15,7 +15,7 @@ import java.util.List; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11614") +@JiraKey(value = "HHH-11614") @RequiresDialect(PostgreSQLDialect.class) @DomainModel( annotatedClasses = PostgreSqlLobStringTest.TestEntity.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java index 5e3448f861..4df00277f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import jakarta.persistence.LockModeType; import jakarta.persistence.Version; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-11656") +@JiraKey(value = "HHH-11656") @RequiresDialect(HANADialect.class) public class HANAOptimisticLockingTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java index f3e1afafc6..86bbbc4a77 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.LockModeType; import jakarta.persistence.PrimaryKeyJoinColumn; import jakarta.persistence.Version; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -55,7 +55,7 @@ public class JoinedInheritanceOptimisticForceIncrementTest extends BaseNonConfig } @Test - @TestForIssue(jiraKey = "HHH-11979") + @JiraKey(value = "HHH-11979") public void testForceIncrement() { doInHibernate( this::sessionFactory, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java index 90e249dd7d..fe96b777e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java @@ -30,7 +30,7 @@ import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.RequiresDialectFeature; import org.hibernate.testing.orm.junit.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.hibernate.testing.util.ExceptionUtil; @@ -47,7 +47,7 @@ import static org.junit.jupiter.api.Assertions.fail; * * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-5275") +@JiraKey( value = "HHH-5275") @SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 15, reason = "skip this test on Sybase ASE 15.5, but run it on 15.7, see HHH-6820") public class LockModeTest extends BaseSessionFactoryFunctionalTest { @@ -179,7 +179,7 @@ public class LockModeTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue(jiraKey = "HHH-2735") + @JiraKey(value = "HHH-2735") public void testQueryLockModeNoneWithAlias() { doInHibernate( this::sessionFactory, session -> { // shouldn't throw an exception @@ -191,7 +191,7 @@ public class LockModeTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue(jiraKey = "HHH-2735") + @JiraKey(value = "HHH-2735") public void testQueryLockModePessimisticWriteWithAlias() { doInHibernate( this::sessionFactory, session -> { // shouldn't throw an exception @@ -203,7 +203,7 @@ public class LockModeTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue(jiraKey = "HHH-12257") + @JiraKey(value = "HHH-12257") public void testRefreshLockedEntity() { doInHibernate( this::sessionFactory, session -> { A a = session.get( A.class, id, LockMode.PESSIMISTIC_READ ); @@ -218,7 +218,7 @@ public class LockModeTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue(jiraKey = "HHH-12257") + @JiraKey(value = "HHH-12257") public void testRefreshWithExplicitLowerLevelLockMode() { doInHibernate( this::sessionFactory, session -> { A a = session.get( A.class, id, LockMode.PESSIMISTIC_READ ); @@ -234,7 +234,7 @@ public class LockModeTest extends BaseSessionFactoryFunctionalTest { @Test - @TestForIssue(jiraKey = "HHH-12257") + @JiraKey(value = "HHH-12257") @SkipForDialect( dialectClass = CockroachDialect.class ) public void testRefreshWithExplicitHigherLevelLockMode1() { doInHibernate( this::sessionFactory, session -> { @@ -248,7 +248,7 @@ public class LockModeTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue(jiraKey = "HHH-12257") + @JiraKey(value = "HHH-12257") @SkipForDialect( dialectClass = CockroachDialect.class ) public void testRefreshWithExplicitHigherLevelLockMode2() { doInHibernate( this::sessionFactory, session -> { @@ -262,7 +262,7 @@ public class LockModeTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue(jiraKey = "HHH-12257") + @JiraKey(value = "HHH-12257") public void testRefreshAfterUpdate() { doInHibernate( this::sessionFactory, session -> { A a = session.get( A.class, id ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java index 2f68dac98a..84b7ab08a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import jakarta.persistence.LockModeType; import jakarta.persistence.Version; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.junit4.CustomParameterized; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertNull; * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-13492") +@JiraKey(value = "HHH-13492") @RunWith(CustomParameterized.class) public class LockRefreshTest extends BaseNonConfigCoreFunctionalTestCase { private final LockModeType lockModeType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java index 0f7a7a3f0e..2093832eab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java @@ -15,7 +15,7 @@ import org.hibernate.LockMode; import org.hibernate.query.NativeQuery; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; * * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-1168") +@JiraKey(value = "HHH-1168") public class PagingAndLockingTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java index f659615b9c..66355b84be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java @@ -23,7 +23,7 @@ import org.hibernate.Session; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; @@ -40,7 +40,7 @@ import static org.junit.Assert.assertFalse; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10513") +@JiraKey(value = "HHH-10513") public class LockNoneWarmingTest extends BaseCoreFunctionalTestCase { private Triggerable triggerable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java index 6a6795f7fd..71f1727e78 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java @@ -11,7 +11,7 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9084") +@JiraKey(value = "HHH-9084") @DomainModel( annotatedClasses = { Advertisement.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java index 8c7ade4a5e..072834fce0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java @@ -26,7 +26,7 @@ import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-4235") +@JiraKey(value = "HHH-4235") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportSchemaCreation.class) @DomainModel( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/AliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/AliasTest.java index ba58402616..cd9eb0856f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/AliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/AliasTest.java @@ -11,7 +11,7 @@ import java.util.Iterator; import org.hibernate.HibernateException; import org.hibernate.mapping.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -47,7 +47,7 @@ public class AliasTest { * mapping ordering. */ @Test - @TestForIssue(jiraKey = "HHH-2448") + @JiraKey(value = "HHH-2448") public void testAliasOrdering(SessionFactoryScope scope) { Iterator tables = scope.getMetadataImplementor().collectTableMappings().iterator(); Table table1 = null; @@ -66,7 +66,7 @@ public class AliasTest { } @Test - @TestForIssue(jiraKey = "HHH-8371") + @JiraKey(value = "HHH-8371") public final void testUnderscoreInColumnName(SessionFactoryScope scope) { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ColumnLastIndexNotLetterAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ColumnLastIndexNotLetterAliasTest.java index 1700f4a12e..a56d1352af 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ColumnLastIndexNotLetterAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/ColumnLastIndexNotLetterAliasTest.java @@ -12,7 +12,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.mapping.Column; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -29,7 +29,7 @@ public class ColumnLastIndexNotLetterAliasTest { private static final Dialect DIALECT = new PostgreSQLDialect(); @Test - @TestForIssue(jiraKey = "HHH-14720") + @JiraKey(value = "HHH-14720") public void testColumnNameEndinWithNonCharacter() { test( "aColumn1" ); test( "aColumn_" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cascade/PersistOnLazyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cascade/PersistOnLazyCollectionTest.java index 26dc192f81..881486d127 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cascade/PersistOnLazyCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cascade/PersistOnLazyCollectionTest.java @@ -13,7 +13,7 @@ import org.hibernate.LazyInitializationException; import org.hibernate.Session; import org.hibernate.stat.SessionStatistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -67,7 +67,7 @@ public class PersistOnLazyCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-11916") + @JiraKey(value = "HHH-11916") public void testPersistOnAlreadyPersistentEntityWithUninitializedLazyCollection(SessionFactoryScope scope) { final Invoice _invoice = scope.fromTransaction( session -> createInvoiceWithTwoInvoiceLines( session ) ); @@ -97,7 +97,7 @@ public class PersistOnLazyCollectionTest { } @Test - @TestForIssue(jiraKey = "HHH-11916") + @JiraKey(value = "HHH-11916") public void testPersistOnNewEntityRelatedToAlreadyPersistentEntityWithUninitializedLazyCollection( SessionFactoryScope scope) { final Invoice _invoice = scope.fromTransaction( session -> createInvoiceWithTwoInvoiceLines( session ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java index 9c8d44fa9a..8889da88ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java @@ -13,7 +13,7 @@ import jakarta.persistence.OneToMany; import org.hamcrest.collection.IsIterableContainingInOrder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -44,7 +44,7 @@ import static org.hamcrest.MatcherAssert.assertThat; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-13877" ) +@JiraKey( value = "HHH-13877" ) public class SortNaturalByDefaultTests { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java index 307a987e96..44d1d7f104 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java @@ -23,7 +23,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.mapping.PersistentClass; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals; @SkipForDialect(value = DB2Dialect.class, comment = "DB2 jdbc driver doesn't support setNString") public class AndNationalizedTests extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-9599") + @JiraKey( value = "HHH-9599") public void basicTest() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConvertAndDynamicInstantiationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConvertAndDynamicInstantiationTest.java index ad701a19a7..da1027c623 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConvertAndDynamicInstantiationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConvertAndDynamicInstantiationTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.net.URI; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; annotatedClasses = { AttributeConvertAndDynamicInstantiationTest.TestEntity.class } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15331") +@JiraKey(value = "HHH-15331") public class AttributeConvertAndDynamicInstantiationTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java index 52c9007ccd..dc029fee75 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java @@ -40,7 +40,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; import org.hibernate.type.internal.ConvertedBasicTypeImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.boot.MetadataBuildingContextTestingImpl; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ExceptionUtil; @@ -198,7 +198,7 @@ public class AttributeConverterTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8462") + @JiraKey(value = "HHH-8462") public void testBasicOrmXmlConverterApplication() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); @@ -232,7 +232,7 @@ public class AttributeConverterTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-14881") + @JiraKey(value = "HHH-14881") public void testBasicOrmXmlConverterWithOrmXmlPackage() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); @@ -340,7 +340,7 @@ public class AttributeConverterTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-14206" ) + @JiraKey( value = "HHH-14206" ) public void testPrimitiveTypeConverterAutoApplied() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); @@ -404,7 +404,7 @@ public class AttributeConverterTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-14021") + @JiraKey(value = "HHH-14021") public void testBasicByteUsage() { Configuration cfg = new Configuration(); ServiceRegistryUtil.applySettings( cfg.getStandardServiceRegistryBuilder() ); @@ -446,7 +446,7 @@ public class AttributeConverterTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8866") + @JiraKey(value = "HHH-8866") public void testEnumConverter() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java index 126f2261f2..ead762faa0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java @@ -19,7 +19,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.Type; import org.hibernate.type.internal.ConvertedBasicTypeImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-8842" ) +@JiraKey( value = "HHH-8842" ) public class BasicJodaTimeConversionTest extends BaseNonConfigCoreFunctionalTestCase { static boolean convertToDatabaseColumnCalled = false; static boolean convertToEntityAttributeCalled = false; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java index 7e231bd224..eb03974f95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java @@ -23,7 +23,7 @@ import org.hibernate.query.BindableType; import org.hibernate.query.Query; import org.hibernate.type.Type; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; Employee.class } ) -@TestForIssue(jiraKey = "HHH-12662") +@JiraKey(value = "HHH-12662") public class ConverterTest { private String tooBigParameter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java index bfdfd61538..b5ebb1550a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java @@ -19,7 +19,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.Type; import org.hibernate.type.internal.ConvertedBasicTypeImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -29,7 +29,7 @@ import static org.junit.Assert.assertTrue; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-8807" ) +@JiraKey( value = "HHH-8807" ) public class ExplicitDateConvertersTest extends BaseNonConfigCoreFunctionalTestCase { // NOTE : initially unable to reproduce the reported problem diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java index 4474f135dc..66d75f3645 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java @@ -18,7 +18,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.Type; import org.hibernate.type.internal.ConvertedBasicTypeImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-8809" ) +@JiraKey( value = "HHH-8809" ) public class ExplicitEnumConvertersTest extends BaseNonConfigCoreFunctionalTestCase { // NOTE : initially unable to reproduce the reported problem diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java index 5606fc274c..c90f66b147 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java @@ -30,7 +30,7 @@ import org.hibernate.type.descriptor.java.MutabilityPlan; import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -54,7 +54,7 @@ public class ExplicitJavaTypeDescriptorTest extends BaseNonConfigCoreFunctionalT private static int pseudoMutableToDomainCallCount; @Test - @TestForIssue( jiraKey = "HHH-11098" ) + @JiraKey( value = "HHH-11098" ) public void testIt() { // create data and check assertions inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java index a300557e22..63429de8ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java @@ -12,7 +12,7 @@ import java.util.stream.Stream; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10959") +@JiraKey(value = "HHH-10959") @DomainModel( annotatedClasses = LongToDateConversionTest.TestEntity.class ) @SessionFactory public class LongToDateConversionTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java index 7db96bc20f..3f2a350ad6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java @@ -19,7 +19,7 @@ import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.jdbc.Work; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -35,7 +35,7 @@ public class NullHandlingTests extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8697" ) + @JiraKey( value = "HHH-8697" ) public void testNullReplacementOnBinding() { TheEntity theEntity = new TheEntity( 1 ); @@ -84,7 +84,7 @@ public class NullHandlingTests extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9320" ) + @JiraKey( value = "HHH-9320" ) public void testNullReplacementOnExtraction() { Session session = openSession(); session.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java index 855158b3a3..1cbe2fd9b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Tuple; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-10778" ) +@JiraKey( value = "HHH-10778" ) @DomainModel( annotatedClasses = PackagePrivateAttributeConverterEntityManagerFactoryTest.Tester.class ) @SessionFactory public class PackagePrivateAttributeConverterEntityManagerFactoryTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java index f0ee10e4a1..3348fc18f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Tuple; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-10778" ) +@JiraKey( value = "HHH-10778" ) @DomainModel( annotatedClasses = PackagePrivateAttributeConverterSessionFactoryTest.Tester.class ) @SessionFactory public class PackagePrivateAttributeConverterSessionFactoryTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryConvertedAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryConvertedAttributeTest.java index 76f72df460..0dc028735d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryConvertedAttributeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryConvertedAttributeTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.time.Year; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Marco Belladelli */ -@TestForIssue( jiraKey = "HHH-15742") +@JiraKey( value = "HHH-15742") public class QueryConvertedAttributeTest extends BaseNonConfigCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java index ac16a502c5..692795e0b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java @@ -21,7 +21,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.Type; import org.hibernate.type.internal.ConvertedBasicTypeImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue; * * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-8812" ) +@JiraKey( value = "HHH-8812" ) public class XmlWithExplicitConvertAnnotationsTest extends BaseNonConfigCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java index a0f80524d9..7a5afdb3af 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java @@ -13,7 +13,7 @@ import org.hibernate.cache.spi.access.EntityDataAccess; import org.hibernate.cfg.AvailableSettings; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -41,7 +41,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class BasicStructuredCachingOfConvertedValueTest { @Test - @TestForIssue( jiraKey = "HHH-9615" ) + @JiraKey( value = "HHH-9615" ) @SuppressWarnings("unchecked") public void basicCacheStructureTest(SessionFactoryScope scope) { EntityPersister persister = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor( Address.class.getName() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java index a86718e682..fd74927348 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java @@ -12,7 +12,7 @@ import org.hibernate.cache.spi.entry.StandardCacheEntryImpl; import org.hibernate.cfg.AvailableSettings; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -42,7 +42,7 @@ public class BasicUnstructuredCachingOfConvertedValueTest { public static final int postalAreaAttributeIndex = 0; @Test - @TestForIssue( jiraKey = "HHH-9615" ) + @JiraKey( value = "HHH-9615" ) public void basicCacheStructureTest(SessionFactoryScope scope) { EntityPersister persister = scope.getSessionFactory() .getMappingMetamodel() diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java index 91c3a9f1f5..a87995d71c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-8529" ) +@JiraKey( value = "HHH-8529" ) @DomainModel( annotatedClasses = { CollectionCompositeElementConversionTest.Disguise.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java index 26681480e1..a2ac263770 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java @@ -30,7 +30,7 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.SimpleValue; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; @@ -47,7 +47,7 @@ import static org.junit.Assert.assertThat; * * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-10277" ) +@JiraKey( value = "HHH-10277" ) @ServiceRegistry public class CollectionCompositeElementExplicitConversionTest { private Field simpleValueAttributeConverterDescriptorField; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java index 222b58a6a2..ad0d443c1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.Enumerated; import jakarta.persistence.Id; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-8529") +@JiraKey(value = "HHH-8529") @DomainModel( annotatedClasses = { CollectionElementConversionTest.Customer.class, CollectionElementConversionTest.ColorConverter.class } ) @SessionFactory public class CollectionElementConversionTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java index 11e8fd7955..b27cee8ed6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-8529" ) +@JiraKey( value = "HHH-8529" ) @DomainModel( annotatedClasses = { CollectionElementExplicitConversionTest.Customer.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionEmbeddableElementConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionEmbeddableElementConversionTest.java index e8cba555d3..f6a2361107 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionEmbeddableElementConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionEmbeddableElementConversionTest.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -37,7 +37,7 @@ import jakarta.persistence.Id; CollectionEmbeddableElementConversionTest.MyBigDecimalConverter.class }) @SessionFactory -@TestForIssue(jiraKey = "HHH-15211") +@JiraKey(value = "HHH-15211") class CollectionEmbeddableElementConversionTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java index c9edd7bf0c..67d82e8f0f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java @@ -19,7 +19,7 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.type.internal.ConvertedBasicTypeImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; import org.hibernate.testing.orm.junit.SessionFactory; @@ -52,7 +52,7 @@ import static org.junit.Assert.assertNotNull; * @author Markus Heiden * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-9495" ) +@JiraKey( value = "HHH-9495" ) @DomainModel( annotatedClasses = ElementCollectionTests.TheEntity.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java index e633852bde..07a144652b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java @@ -23,7 +23,7 @@ import org.hibernate.mapping.Property; import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.type.internal.ConvertedBasicTypeImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.boot.BootstrapContextImpl; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue; public class ParameterizedAttributeConverterParameterTypeTest { @Test - @TestForIssue(jiraKey = "HHH-8804") + @JiraKey(value = "HHH-8804") public void testGenericTypeParameters() { final BootstrapContextImpl bootstrapContext = new BootstrapContextImpl(); try { @@ -59,7 +59,7 @@ public class ParameterizedAttributeConverterParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-10050" ) + @JiraKey( value = "HHH-10050" ) public void testNestedTypeParameterAutoApplication(ServiceRegistryScope scope) { final Metadata metadata = new MetadataSources( scope.getRegistry() ) .addAnnotatedClass( SampleEntity.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java index a46296c4d1..2e8ffee309 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.AttributeConverter; import org.hibernate.boot.model.convert.internal.ClassBasedConverterDescriptor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.boot.BootstrapContextImpl; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.Test; @@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals; * * @author Svein Baardsen */ -@TestForIssue(jiraKey = "HHH-8854") +@JiraKey(value = "HHH-8854") public class AttributeConverterOnSuperclassTest extends BaseUnitTestCase { public static class StringIntegerAttributeConverter implements AttributeConverter { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/ConvertibleNullLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/ConvertibleNullLiteralTest.java index 109877fded..db91e25e92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/ConvertibleNullLiteralTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/ConvertibleNullLiteralTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.converted.converter.literal; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -20,7 +20,7 @@ import jakarta.persistence.Id; */ @DomainModel(annotatedClasses = ConvertibleNullLiteralTest.Foo.class) @SessionFactory -@TestForIssue( jiraKey = "HHH-15246" ) +@JiraKey( value = "HHH-15246" ) class ConvertibleNullLiteralTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java index ecb2fc10e8..14bbdca44e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.mapping.converted.converter.lob; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -29,7 +29,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class ConverterAndLobTest { @Test - @TestForIssue( jiraKey = "HHH-9615" ) + @JiraKey( value = "HHH-9615" ) public void basicTest(SessionFactoryScope scope) { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java index 35c6809aad..af05051fb9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.MapKeyColumn; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-8529" ) +@JiraKey( value = "HHH-8529" ) @DomainModel( annotatedClasses = { MapElementConversionTest.Customer.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java index 9d489b097e..96e5f66939 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.Table; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-8529" ) +@JiraKey( value = "HHH-8529" ) public class MapKeyConversionTest extends BaseNonConfigCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumExplicitTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumExplicitTypeTest.java index a3cf5fe7c6..66695976e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumExplicitTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumExplicitTypeTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.converted.enums; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals; public class EnumExplicitTypeTest { @Test - @TestForIssue(jiraKey = "HHH-10766") + @JiraKey(value = "HHH-10766") public void hbmEnumWithExplicitTypeTest(SessionFactoryScope scope) { final Long id = scope.fromTransaction( (session) -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java index f499851639..36e56ddec6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java @@ -17,7 +17,7 @@ import org.hibernate.internal.CoreMessageLogger; import org.hibernate.type.descriptor.JdbcBindingLogging; import org.hibernate.type.descriptor.JdbcExtractingLogging; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; @@ -92,7 +92,7 @@ public class EnumTypeTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8153") + @JiraKey(value = "HHH-8153") public void hbmEnumTypeTest() { doInHibernate( this::sessionFactory, @@ -125,7 +125,7 @@ public class EnumTypeTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12978") + @JiraKey(value = "HHH-12978") public void testEnumAsBindParameterAndExtract() { doInHibernate( this::sessionFactory, s -> { binderTriggerable.reset(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java index 59d8f49ff7..2ef18da856 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.type.descriptor.JdbcBindingLogging; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.Logger; import org.hibernate.testing.orm.junit.MessageKeyInspection; @@ -58,7 +58,7 @@ public class OrdinalEnumTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-12978") + @JiraKey(value = "HHH-12978") public void testEnumAsBindParameterAndExtract(SessionFactoryScope scope, MessageKeyWatcher loggingWatcher) { scope.inTransaction( (session) -> { @@ -86,7 +86,7 @@ public class OrdinalEnumTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-10282") + @JiraKey(value = "HHH-10282") public void hqlTestEnumShortHandSyntax(SessionFactoryScope scope, MessageKeyWatcher loggingWatcher) { scope.inTransaction( (session) -> { @@ -100,7 +100,7 @@ public class OrdinalEnumTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-10282") + @JiraKey(value = "HHH-10282") public void hqlTestEnumQualifiedShortHandSyntax(SessionFactoryScope scope, MessageKeyWatcher loggingWatcher) { final String qry = "select id from Person where originalHairColor = HairColor.BLONDE"; scope.inTransaction( @@ -113,7 +113,7 @@ public class OrdinalEnumTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-10282") + @JiraKey(value = "HHH-10282") public void hqlTestEnumShortHandSyntaxInPredicate(SessionFactoryScope scope, MessageKeyWatcher loggingWatcher) { scope.inTransaction( (session) -> { @@ -126,7 +126,7 @@ public class OrdinalEnumTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-10282") + @JiraKey(value = "HHH-10282") public void hqlTestEnumQualifiedShortHandSyntaxInPredicate(SessionFactoryScope scope, MessageKeyWatcher loggingWatcher) { scope.inTransaction( (session) -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeTest.java index d487ce2dc6..149417a6ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/UnspecifiedEnumTypeTest.java @@ -16,7 +16,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.jdbc.Work; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -25,7 +25,7 @@ import org.junit.Test; /** * @author Lukasz Antoniak */ -@TestForIssue( jiraKey = "HHH-7780" ) +@JiraKey( value = "HHH-7780" ) @RequiresDialect( value = H2Dialect.class ) public class UnspecifiedEnumTypeTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithIdenticallyNamedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithIdenticallyNamedAssociationTest.java index e8b11bec23..f01545f3d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithIdenticallyNamedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableWithIdenticallyNamedAssociationTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.mapping.embeddable; import static org.assertj.core.api.Assertions.assertThat; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -24,7 +24,7 @@ import jakarta.persistence.OneToOne; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16209") +@JiraKey(value = "HHH-16209") public class EmbeddableWithIdenticallyNamedAssociationTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociationTest.java index 0950f976a2..e9fe663b39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/elementcollection/EmbeddedElementCollectionWithIdenticallyNamedAssociationTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.mapping.embeddable.elementcollection; import java.util.ArrayList; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15604") +@JiraKey(value = "HHH-15604") public class EmbeddedElementCollectionWithIdenticallyNamedAssociationTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MergeTest.java index 126b8bac2d..a75817b17c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/usertype/embedded/merge/MergeTest.java @@ -1,6 +1,6 @@ package org.hibernate.orm.test.mapping.embeddable.strategy.usertype.embedded.merge; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -12,7 +12,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; annotatedClasses = { Parent.class, Child.class } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16015") +@JiraKey(value = "HHH-16015") public class MergeTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java index b7c52037bb..d101fa7de0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java @@ -40,7 +40,7 @@ import org.hibernate.annotations.FetchMode; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -74,7 +74,7 @@ import static org.junit.Assert.assertTrue; public class SubselectFetchCollectionFromBatchTest { @Test - @TestForIssue( jiraKey = "HHH-10679") + @JiraKey( value = "HHH-10679") public void testSubselectFetchFromEntityBatch(SessionFactoryScope scope) { final EmployeeGroup[] createdGroups = scope.fromTransaction( (s) -> { EmployeeGroup group1 = new EmployeeGroup(); @@ -189,7 +189,7 @@ public class SubselectFetchCollectionFromBatchTest { } @Test - @TestForIssue( jiraKey = "HHH-10679") + @JiraKey( value = "HHH-10679") public void testMultiSubselectFetchSamePersisterQueryList(SessionFactoryScope scope) { final Long[] createdIds = scope.fromTransaction( (s) -> { EmployeeGroup group1 = new EmployeeGroup(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java index dca266606b..65ec60f6b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java @@ -19,7 +19,7 @@ import org.hibernate.annotations.Formula; import org.hibernate.query.NativeQuery; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue; */ @DomainModel( annotatedClasses = FormulaNativeQueryTest.Foo.class ) @SessionFactory -@TestForIssue(jiraKey = "HHH-7525") +@JiraKey(value = "HHH-7525") public class FormulaNativeQueryTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java index 7836c6e0d8..74a353c802 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.Formula; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -53,7 +53,7 @@ public class FormulaWithAliasTest { } ); } @Test - @TestForIssue(jiraKey = "HHH-12280") + @JiraKey(value = "HHH-12280") void testFormulaWithAlias(SessionFactoryScope scope) { scope.inTransaction( session -> { final List customers = session.createQuery( "select c from Customer c ", Customer.class ).getResultList(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java index 949565b526..c78af26d4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java @@ -24,7 +24,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -45,7 +45,7 @@ public class FormulaWithColumnTypesTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9951") + @JiraKey(value = "HHH-9951") public void testFormulaAnnotationWithTypeNames() { inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java index c93a8f3a69..3d31ebeda1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.Formula; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -61,7 +61,7 @@ public class FormulaWithPartitionByTest { } @Test - @TestForIssue( jiraKey = "HHH-10754" ) + @JiraKey( value = "HHH-10754" ) void testFormulaAnnotationWithPartitionBy(SessionFactoryScope scope) { scope.inTransaction( session -> { final List displayItems = session.createQuery( "select di from DisplayItem di order by di.id", DisplayItem.class).getResultList(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java index 9a3a42c194..5ae1117925 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType; @@ -30,7 +30,7 @@ public abstract class AbstractGeneratedPropertyTest extends BaseCoreFunctionalTe } @Test - @TestForIssue( jiraKey = "HHH-2627" ) + @JiraKey( value = "HHH-2627" ) public final void testGeneratedProperty() { // The following block is repeated 300 times to reproduce HHH-2627. // Without the fix, Oracle will run out of cursors using 10g with diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java index 35cdc23b90..59b94cb3e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java @@ -16,11 +16,11 @@ import org.hibernate.query.sqm.mutation.internal.inline.InlineMutationStrategy; import org.hibernate.orm.test.mapping.hhh14276.entity.PlayerStat; import org.hibernate.orm.test.mapping.hhh14276.entity.Score; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; -@TestForIssue(jiraKey = "HHH-14276") +@JiraKey(value = "HHH-14276") public class NestedIdClassDerivedIdentifiersTest extends BaseEntityManagerFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/NestedIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/NestedIdClassTest.java index 7e9a267cf7..70080c8a61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/NestedIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh14343/NestedIdClassTest.java @@ -13,7 +13,7 @@ import org.hibernate.query.sqm.mutation.internal.inline.InlineMutationStrategy; import org.hibernate.orm.test.mapping.hhh14343.entity.NestedPlayerStat; import org.hibernate.orm.test.mapping.hhh14343.entity.NestedScore; import org.hibernate.orm.test.mapping.hhh14343.entity.NestedStat; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -21,7 +21,7 @@ import java.util.Map; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; -@TestForIssue(jiraKey = "HHH-14343") +@JiraKey(value = "HHH-14343") public class NestedIdClassTest extends BaseEntityManagerFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh15842/EnumForeignKeyParameterMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh15842/EnumForeignKeyParameterMappingTest.java index e9aa3f6741..5b417b27c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh15842/EnumForeignKeyParameterMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh15842/EnumForeignKeyParameterMappingTest.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; EnumForeignKeyParameterMappingTest.EntityWithEnumPrimaryKey.class, EnumForeignKeyParameterMappingTest.EntityWithEnumForeignKey.class }) -@TestForIssue(jiraKey = "HHH-15842") +@JiraKey(value = "HHH-15842") public class EnumForeignKeyParameterMappingTest { List entitiesWithEnumPk = new ArrayList<>(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java index 01c4459b83..d5e0a8785a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java @@ -11,7 +11,7 @@ import java.time.OffsetDateTime; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; public class EmbeddedIdDatabaseGeneratedValueTest { @Test - @TestForIssue(jiraKey = "HHH-13096") + @JiraKey(value = "HHH-13096") public void test(SessionFactoryScope scope) { final EventId eventId = scope.fromTransaction(entityManager -> { //tag::identifiers-composite-generated-database-example[] diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java index a24f2d59aa..1b8b3ab35c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java @@ -10,7 +10,7 @@ import java.sql.Timestamp; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -27,7 +27,7 @@ public class EmbeddedIdInMemoryGeneratedValueTest extends BaseEntityManagerFunct } @Test - @TestForIssue(jiraKey = "HHH-13096") + @JiraKey(value = "HHH-13096") public void test() { final EventId eventId = doInJPA(this::entityManagerFactory, entityManager -> { //tag::identifiers-composite-generated-in-memory-example[] diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceDiscriminatorTest.java index 791e17badd..4ae85580ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceDiscriminatorTest.java @@ -11,7 +11,7 @@ import java.math.RoundingMode; import java.util.HashSet; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Jan Schatteman */ -@TestForIssue( jiraKey = {"HHH-1134"} ) +@JiraKey( value = "HHH-1134" ) public class MultiInheritanceDiscriminatorTest { @DomainModel( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java index 2959794ed1..94048b705b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.inheritance.discriminator.joined; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -19,7 +19,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11133") +@JiraKey(value = "HHH-11133") @DomainModel( xmlMappings = "org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritance.hbm.xml" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java index 8dcd129677..35e32bc21b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.SingularAttributeMapping; import org.hibernate.metamodel.mapping.internal.SimpleNaturalIdMapping; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertThat; */ public abstract class AbstractCompositeIdAndNaturalIdTest { @Test - @TestForIssue( jiraKey = "HHH-10360") + @JiraKey( value = "HHH-10360") public void testNaturalIdNullability(SessionFactoryScope scope) { final EntityMappingType accountMapping = scope.getSessionFactory().getRuntimeMetamodels().getEntityMappingType( Account.class ); final SingularAttributeMapping shortCodeMapping = ((SimpleNaturalIdMapping) accountMapping.getNaturalIdMapping()).getAttribute(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompositeNaturalIdMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompositeNaturalIdMappingTest.java index 85046e9f23..e9977226f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompositeNaturalIdMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompositeNaturalIdMappingTest.java @@ -12,14 +12,14 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.spi.MetadataImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-11255") +@JiraKey(value = "HHH-11255") public class CompositeNaturalIdMappingTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java index 047057b783..2663a5b360 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.naturalid.composite; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; */ @DomainModel( annotatedClasses = PostalCarrier.class ) @SessionFactory -@TestForIssue(jiraKey = "HHH-11255") +@JiraKey(value = "HHH-11255") public class EmbeddedNaturalIdTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdCacheTest.java index ad194432b4..8d8488f0a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdCacheTest.java @@ -13,7 +13,7 @@ import org.hibernate.engine.internal.NaturalIdResolutionsImpl; import org.hibernate.stat.NaturalIdStatistics; import org.hibernate.stat.spi.StatisticsImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -32,7 +32,7 @@ import static org.hibernate.testing.cache.CachingRegionFactory.DEFAULT_ACCESSTYP /** * @author Sylvain Dusart */ -@TestForIssue(jiraKey = "HHH-16218") +@JiraKey(value = "HHH-16218") @DomainModel( annotatedClasses = { CompoundNaturalIdCacheTest.EntityWithSimpleNaturalId.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdMappingTest.java index d6fedb0a12..d6af2b0328 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdMappingTest.java @@ -18,7 +18,7 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.NaturalIdMapping; import org.hibernate.metamodel.mapping.SingularAttributeMapping; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.is; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-11255") +@JiraKey(value = "HHH-11255") public class CompoundNaturalIdMappingTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdTest.java index cb0c88a45a..103534e596 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdTest.java @@ -13,7 +13,7 @@ import org.hibernate.query.criteria.HibernateCriteriaBuilder; import org.hibernate.query.criteria.JpaCriteriaQuery; import org.hibernate.query.criteria.JpaRoot; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Sylvain Dusart */ -@TestForIssue(jiraKey = "HHH-16218") +@JiraKey(value = "HHH-16218") @DomainModel( annotatedClasses = { CompoundNaturalIdTest.EntityWithSimpleNaturalId.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java index 1eabfb625c..6e8b4c5b59 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java @@ -18,7 +18,7 @@ import org.hibernate.annotations.NaturalIdCache; import org.hibernate.cfg.AvailableSettings; import org.hibernate.stat.spi.StatisticsImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -37,7 +37,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Alex Burgel */ -@TestForIssue( jiraKey = "HHH-11330" ) +@JiraKey( value = "HHH-11330" ) @ServiceRegistry( settings = { @Setting( name = AvailableSettings.GENERATE_STATISTICS, value = "true" ), @@ -67,7 +67,7 @@ public class IdentityGeneratorWithNaturalIdCacheTest { } @Test - @TestForIssue(jiraKey = "HHH-10659") + @JiraKey(value = "HHH-10659") public void testNaturalIdCacheEntry(SessionFactoryScope scope) { final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); statistics.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdAnnotationTest.java index 21e4bea339..ec12b126be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdAnnotationTest.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.SingularAttributeMapping; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.tuple.entity.EntityMetamodel; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertTrue; public class ImmutableManyToOneNaturalIdAnnotationTest { @Test - @TestForIssue( jiraKey = "HHH-10360") + @JiraKey( value = "HHH-10360") public void testNaturalIdNullability(SessionFactoryScope scope) { // nullability is not specified for either properties making up // the natural ID, so they should be nullable by annotation-specific default diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java index d8344d581f..f5de25cc61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java @@ -17,7 +17,7 @@ import org.hibernate.metamodel.mapping.SingularAttributeMapping; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.tuple.entity.EntityMetamodel; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -71,7 +71,7 @@ public class ImmutableManyToOneNaturalIdHbmTest { } @Test - @TestForIssue( jiraKey = "HHH-10360") + @JiraKey( value = "HHH-10360") public void checkingMapping(SessionFactoryScope scope) { final RuntimeMetamodels runtimeMetamodels = scope.getSessionFactory().getRuntimeMetamodels(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java index 9125bc3596..8d6c6c2b01 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.stat.spi.StatisticsImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -50,7 +50,7 @@ public class ImmutableNaturalIdTest { } @Test - @TestForIssue( jiraKey = "HHH-10360") + @JiraKey( value = "HHH-10360") public void verifyMetamodel(SessionFactoryScope scope) { final SessionFactoryImplementor sessionFactory = scope.getSessionFactory(); final EntityMappingType entityMappingType = sessionFactory.getRuntimeMetamodels().getEntityMappingType( User.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java index 8fc953922f..a9091e72f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java @@ -17,7 +17,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.stat.spi.StatisticsImplementor; import org.hibernate.tuple.entity.EntityMetamodel; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -50,7 +50,7 @@ import static org.junit.Assert.assertTrue; @DomainModel( annotatedClasses = Building.class ) @SessionFactory @SuppressWarnings("unchecked") -@TestForIssue( jiraKey = "HHH-7085" ) +@JiraKey( value = "HHH-7085" ) public class ImmutableEntityNaturalIdTest { @BeforeEach public void createTestData(SessionFactoryScope scope) { @@ -206,7 +206,7 @@ public class ImmutableEntityNaturalIdTest { } @Test - @TestForIssue( jiraKey = "HHH-7371" ) + @JiraKey( value = "HHH-7371" ) public void testImmutableNaturalIdLifecycle2(SessionFactoryScope scope) { scope.inTransaction( (s) -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java index ee16a1774f..b0f1f952f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.internal.SimpleNaturalIdMapping; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.stat.spi.StatisticsImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -39,7 +39,7 @@ import static org.junit.Assert.assertThat; @SessionFactory public class InheritedNaturalIdTest { @Test - @TestForIssue( jiraKey = "HHH-10360") + @JiraKey( value = "HHH-10360") public void verifyMappingModel(SessionFactoryScope scope) { final SessionFactoryImplementor sessionFactory = scope.getSessionFactory(); final EntityMappingType userMapping = sessionFactory.getRuntimeMetamodels().getEntityMappingType( User.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/SpreadNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/SpreadNaturalIdTest.java index a00cdc0dac..a0990f5852 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/SpreadNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/SpreadNaturalIdTest.java @@ -12,7 +12,7 @@ import org.hibernate.boot.registry.BootstrapServiceRegistry; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; import org.hibernate.service.ServiceRegistry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import static org.junit.Assert.fail; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-7129" ) +@JiraKey( value = "HHH-7129" ) public class SpreadNaturalIdTest { @Test @SuppressWarnings("EmptyCatchBlock") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java index 0f4a262408..9c0554dcb6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java @@ -16,7 +16,7 @@ import org.hibernate.Hibernate; import org.hibernate.annotations.NaturalId; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertFalse; /** * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-13607" ) +@JiraKey( value = "HHH-13607" ) @ServiceRegistry( settings = { @Setting( name = AvailableSettings.FORMAT_SQL, value = "false" ), diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java index 4cd200f72d..467a61b539 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java @@ -13,7 +13,7 @@ import org.hibernate.Hibernate; import org.hibernate.annotations.NaturalId; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -29,7 +29,7 @@ import static org.junit.Assert.assertFalse; /** * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-13607" ) +@JiraKey( value = "HHH-13607" ) @ServiceRegistry( settings = { @Setting( name = AvailableSettings.FORMAT_SQL, value = "false" ), diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java index 29778e508c..d6a2074e39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java @@ -16,7 +16,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.stat.spi.StatisticsImplementor; import org.hibernate.tuple.entity.EntityMetamodel; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -49,7 +49,7 @@ import static org.junit.Assert.assertNull; public class MutableNaturalIdTest { @Test - @TestForIssue( jiraKey = "HHH-10360") + @JiraKey( value = "HHH-10360") public void testNaturalIdNullability(SessionFactoryScope scope) { final SessionFactoryImplementor sessionFactory = scope.getSessionFactory(); final EntityMappingType entityMappingType = sessionFactory.getRuntimeMetamodels().getEntityMappingType( User.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java index ad4e479f59..baa05297d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java @@ -10,7 +10,7 @@ import org.hibernate.Transaction; import org.hibernate.stat.NaturalIdStatistics; import org.hibernate.stat.spi.StatisticsImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -39,7 +39,7 @@ import static org.junit.Assert.assertNull; public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNaturalIdTest { @Test - @TestForIssue( jiraKey = "HHH-9203" ) + @JiraKey( value = "HHH-9203" ) public void testToMapConversion(SessionFactoryScope scope) { final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); statistics.clear(); @@ -53,7 +53,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu } @Test - @TestForIssue( jiraKey = "HHH-7278" ) + @JiraKey( value = "HHH-7278" ) public void testInsertedNaturalIdCachedAfterTransactionSuccess(SessionFactoryScope scope) { final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); statistics.clear(); @@ -72,7 +72,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu } @Test - @TestForIssue( jiraKey = "HHH-7278" ) + @JiraKey( value = "HHH-7278" ) public void testInsertedNaturalIdNotCachedAfterTransactionFailure(SessionFactoryScope scope) { final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); statistics.clear(); @@ -99,7 +99,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu } @Test - @TestForIssue( jiraKey = "HHH-7278" ) + @JiraKey( value = "HHH-7278" ) public void testChangedNaturalIdCachedAfterTransactionSuccess(SessionFactoryScope scope) { final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); statistics.clear(); @@ -130,7 +130,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu } @Test - @TestForIssue( jiraKey = "HHH-7278" ) + @JiraKey( value = "HHH-7278" ) public void testChangedNaturalIdNotCachedAfterTransactionFailure(SessionFactoryScope scope) { final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); statistics.clear(); @@ -166,7 +166,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu } @Test - @TestForIssue( jiraKey = "HHH-7309" ) + @JiraKey( value = "HHH-7309" ) public void testInsertUpdateEntity_NaturalIdCachedAfterTransactionSuccess(SessionFactoryScope scope) { final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); statistics.clear(); @@ -194,7 +194,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu } @Test - @TestForIssue( jiraKey = "HHH-9200" ) + @JiraKey( value = "HHH-9200" ) public void testNaturalIdCacheStatisticsReset(SessionFactoryScope scope) { final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); statistics.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java index 4a07ebd88b..8413bc1431 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.SingularAttributeMapping; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.tuple.entity.EntityMetamodel; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue; public class NullableNaturalIdTest { @Test - @TestForIssue( jiraKey = "HHH-10360") + @JiraKey( value = "HHH-10360") public void testNaturalIdNullability(SessionFactoryScope scope) { // A, B, C, and D are mapped using annotations; // none are mapped to be non-nullable, so all are nullable by annotations-specific default, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java index 858c6e6ff9..8af9715b2a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.Table; import org.hibernate.PropertyValueException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -31,7 +31,7 @@ import static org.junit.Assert.fail; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11596") +@JiraKey(value = "HHH-11596") @DomainModel( annotatedClasses = { OneToOneJoinTableNonOptionalTest.Show.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java index e748471395..ac1004be22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.JoinTable; import jakarta.persistence.OneToOne; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11596") +@JiraKey(value = "HHH-11596") @DomainModel( annotatedClasses = { OneToOneJoinTableOptionalTest.Show.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java index e80ac24802..e7316998c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.OneToOne; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.mutation.UpdateCoordinatorStandard; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-13228") +@JiraKey(value = "HHH-13228") @Jpa( annotatedClasses = { OneToOneMapsIdChangeParentTest.Parent.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java index 4f0f1b7ab6..464b0cd720 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.PersistenceException; import org.hibernate.Transaction; import org.hibernate.exception.ConstraintViolationException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; import static org.junit.Assert.fail; -@TestForIssue(jiraKey = "HHH-9798") +@JiraKey(value = "HHH-9798") @DomainModel( annotatedClasses = { Shipment.class, Item.class } ) @SessionFactory public class OneToOneJoinTableTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BlobDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BlobDescriptorTest.java index d3d081b9a4..11015e5171 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BlobDescriptorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BlobDescriptorTest.java @@ -18,7 +18,7 @@ import java.sql.SQLException; import org.hibernate.engine.jdbc.BlobImplementer; import org.hibernate.engine.jdbc.BlobProxy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.type.descriptor.java.BlobJavaType; import org.hibernate.type.descriptor.java.DataHelper; import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType; @@ -86,7 +86,7 @@ public class BlobDescriptorTest extends AbstractDescriptorTest { } @Test - @TestForIssue( jiraKey = "HHH-8193" ) + @JiraKey( value = "HHH-8193" ) public void testStreamResetOnAccess() throws IOException, SQLException { byte[] bytes = new byte[] { 1, 2, 3, 4 }; BlobImplementer blob = (BlobImplementer) BlobProxy.generateProxy( bytes ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserTypeTest.java index 4ca4cc9011..cd7e9f52a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserTypeTest.java @@ -16,7 +16,7 @@ import org.hibernate.orm.test.mapping.converted.enums.Person; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test; @SessionFactory public class NamedEnumUserTypeTest { @Test - @TestForIssue(jiraKey = "HHH-14820") + @JiraKey(value = "HHH-14820") public void testNamedEnumUserType(SessionFactoryScope scope) { scope.inTransaction( (session) -> { session.createQuery( "from Person p", Person.class ).list(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeMappingTest.java index c764349874..c211ce7ab1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/UserTypeMappingTest.java @@ -12,7 +12,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; * * @author Stefan Schulze */ -@TestForIssue(jiraKey = "HHH-7300") +@JiraKey(value = "HHH-7300") @BaseUnitTest public class UserTypeMappingTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelJavaTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelJavaTypeTest.java index 6c0bcfc70d..da0727d260 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelJavaTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelJavaTypeTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.metamodel; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; Person.class } ) -@TestForIssue(jiraKey = "HHH-15285") +@JiraKey(value = "HHH-15285") public class MetamodelJavaTypeTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java index 31c21fb9d9..771b51b308 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.ManyToMany; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals; public class MetamodelTest { @Test - @TestForIssue(jiraKey = "HHH-12906") + @JiraKey(value = "HHH-12906") public void testGetAllCollectionRoles(EntityManagerFactoryScope scope) { String[] collectionRoles = ( (SessionFactoryImplementor) scope.getEntityManagerFactory() ).getMetamodel() .getAllCollectionRoles(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java index 11a912e4e9..4b35653e82 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.metamodel; import jakarta.persistence.metamodel.EntityType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.orm.test.metamodel.wildcardmodel.AbstractEntity; @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class WildcardTypeAttributeMetaModelTest { @Test - @TestForIssue(jiraKey = "HHH-9403") + @JiraKey(value = "HHH-9403") public void testWildcardGenericAttributeCanBeResolved(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { EntityType entity = entityManager.getMetamodel().entity( AbstractOwner.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurationValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurationValidationTest.java index a6581bf9d4..b6dba21f26 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurationValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/ConfigurationValidationTest.java @@ -16,7 +16,7 @@ import org.hibernate.service.spi.ServiceException; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.env.ConnectionProviderBuilder; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -25,7 +25,7 @@ import org.junit.Test; /** * @author Lukasz Antoniak */ -@TestForIssue(jiraKey = "HHH-7311") +@JiraKey(value = "HHH-7311") @RequiresDialect( H2Dialect.class ) public class ConfigurationValidationTest extends BaseUnitTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java index 1c4d68c20b..42bddfffe4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java @@ -30,7 +30,7 @@ import org.hibernate.tool.schema.internal.SchemaDropperImpl; import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.cache.CachingRegionFactory; import org.hibernate.testing.env.ConnectionProviderBuilder; import org.hibernate.testing.junit4.BaseUnitTestCase; @@ -47,7 +47,7 @@ import org.junit.Test; /** * @author Mårten Svantesson */ -@TestForIssue(jiraKey = "HHH-11980") +@JiraKey(value = "HHH-11980") @RequiresDialectFeature( value = ConnectionProviderBuilder.class ) public class DiscriminatorMultiTenancyTest extends BaseUnitTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java index 74aa595a62..235bfb0870 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java @@ -27,7 +27,7 @@ import org.hibernate.tool.schema.internal.SchemaCreatorImpl; import org.hibernate.tool.schema.internal.SchemaDropperImpl; import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.cache.CachingRegionFactory; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -150,7 +150,7 @@ public abstract class AbstractSchemaBasedMultiTenancyTest multiTenantConnectionProvider = serviceRegistry.getService( MultiTenantConnectionProvider.class ); @@ -61,7 +61,7 @@ public class SchemaBasedDataSourceMultiTenancyTest extends AbstractSchemaBasedM } @Test - @TestForIssue(jiraKey = "HHH-11651") + @JiraKey(value = "HHH-11651") public void testUnwrappingAbstractMultiTenantConnectionProvider() { final MultiTenantConnectionProvider multiTenantConnectionProvider = serviceRegistry.getService( MultiTenantConnectionProvider.class ); @@ -71,7 +71,7 @@ public class SchemaBasedDataSourceMultiTenancyTest extends AbstractSchemaBasedM } @Test - @TestForIssue(jiraKey = "HHH-11651") + @JiraKey(value = "HHH-11651") public void testUnwrappingMultiTenantConnectionProvider() { final MultiTenantConnectionProvider multiTenantConnectionProvider = serviceRegistry.getService( MultiTenantConnectionProvider.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java index edcb061fc0..765fd0903e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java @@ -12,7 +12,7 @@ import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.env.ConnectionProviderBuilder; import org.junit.Test; @@ -50,7 +50,7 @@ public class SchemaBasedMultiTenancyTest extends AbstractSchemaBasedMultiTenancy } @Test - @TestForIssue( jiraKey = "HHH-11651") + @JiraKey( value = "HHH-11651") public void testUnwrappingConnectionProvider() { final MultiTenantConnectionProvider multiTenantConnectionProvider = serviceRegistry.getService( MultiTenantConnectionProvider.class ); @@ -59,7 +59,7 @@ public class SchemaBasedMultiTenancyTest extends AbstractSchemaBasedMultiTenancy } @Test - @TestForIssue(jiraKey = "HHH-11651") + @JiraKey(value = "HHH-11651") public void testUnwrappingAbstractMultiTenantConnectionProvider() { final MultiTenantConnectionProvider multiTenantConnectionProvider = serviceRegistry.getService( MultiTenantConnectionProvider.class ); @@ -69,7 +69,7 @@ public class SchemaBasedMultiTenancyTest extends AbstractSchemaBasedMultiTenancy } @Test - @TestForIssue(jiraKey = "HHH-11651") + @JiraKey(value = "HHH-11651") public void testUnwrappingMultiTenantConnectionProvider() { final MultiTenantConnectionProvider multiTenantConnectionProvider = serviceRegistry.getService( MultiTenantConnectionProvider.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/TenantResolverConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/TenantResolverConfigurationTest.java index 5c637c400b..86e31050ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/TenantResolverConfigurationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/TenantResolverConfigurationTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.multitenancy.schema; import org.hibernate.cfg.Configuration; import org.hibernate.context.spi.CurrentTenantIdentifierResolver; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -18,7 +18,7 @@ import static org.junit.Assert.assertSame; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-10964") +@JiraKey(value = "HHH-10964") public class TenantResolverConfigurationTest extends BaseCoreFunctionalTestCase { private TestCurrentTenantIdentifierResolver currentTenantResolver = new TestCurrentTenantIdentifierResolver(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/FullyQualifiedEntityNameNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/FullyQualifiedEntityNameNamingStrategyTest.java index f69d756d52..d0cbf45dd5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/FullyQualifiedEntityNameNamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/FullyQualifiedEntityNameNamingStrategyTest.java @@ -21,7 +21,7 @@ import org.hibernate.mapping.Collection; import org.hibernate.mapping.ForeignKey; import org.hibernate.mapping.PersistentClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.AfterAll; @@ -56,7 +56,7 @@ public class FullyQualifiedEntityNameNamingStrategyTest { } @Test - @TestForIssue(jiraKey = "HHH-4312") + @JiraKey(value = "HHH-4312") public void testEntityTable() throws Exception { final PersistentClass classMapping = metadata.getEntityBinding( Workflow.class.getName() ); final String expectedTableName = transformEntityName( Workflow.class.getName() ); @@ -64,7 +64,7 @@ public class FullyQualifiedEntityNameNamingStrategyTest { } @Test - @TestForIssue(jiraKey = "HHH-9327") + @JiraKey(value = "HHH-9327") public void testElementCollectionTable() { final Collection collectionMapping = metadata.getCollectionBinding( Workflow.class.getName() + ".localized" @@ -74,7 +74,7 @@ public class FullyQualifiedEntityNameNamingStrategyTest { } @Test - @TestForIssue(jiraKey = "HHH-9327") + @JiraKey(value = "HHH-9327") public void testManyToManyCollectionTable() { final Collection collectionMapping = metadata.getCollectionBinding( Category.class.getName() + "." + "items" @@ -84,7 +84,7 @@ public class FullyQualifiedEntityNameNamingStrategyTest { } @Test - @TestForIssue( jiraKey = "HHH-9327") + @JiraKey( value = "HHH-9327") public void testManyToManyForeignKeys() { final Collection ownerCollectionMapping = metadata.getCollectionBinding( Category.class.getName() + "." + "items" diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/NamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/NamingStrategyTest.java index 7955500821..87bb28b746 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/NamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/NamingStrategyTest.java @@ -11,7 +11,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.junit.jupiter.api.Test; @@ -52,7 +52,7 @@ public class NamingStrategyTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue(jiraKey = "HHH-5848") + @JiraKey(value = "HHH-5848") public void testDatabaseTableNames() { PersistentClass classMapping = getMetadata().getEntityBinding( Item.class.getName() ); Column secTabColumn = (Column) classMapping.getProperty( "specialPrice" ).getSelectables().get( 0 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java index 12508ccb4b..100a637598 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java @@ -50,7 +50,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Assertions; @@ -67,7 +67,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; public class CollectionJoinTableNamingTest { @Test - @TestForIssue( jiraKey = "HHH-9908" ) + @JiraKey( value = "HHH-9908" ) public void testCollectionJoinTableNamingBase() { // really the same as the JPA compliant tests; here we just pick up the default ImplicitNamingStrategy final MetadataSources metadataSources = new MetadataSources( ServiceRegistryUtil.serviceRegistry() ); @@ -89,7 +89,7 @@ public class CollectionJoinTableNamingTest { } @Test - @TestForIssue( jiraKey = "HHH-9908" ) + @JiraKey( value = "HHH-9908" ) public void testCollectionJoinTableNamingLegacyJpaStrategy() { final MetadataSources metadataSources = new MetadataSources( ServiceRegistryUtil.serviceRegistry() ); try { @@ -111,7 +111,7 @@ public class CollectionJoinTableNamingTest { } @Test - @TestForIssue( jiraKey = "HHH-9908" ) + @JiraKey( value = "HHH-9908" ) public void testCollectionJoinTableNamingLegacyHbmStrategy() { final MetadataSources metadataSources = new MetadataSources( ServiceRegistryUtil.serviceRegistry() ); try { @@ -137,7 +137,7 @@ public class CollectionJoinTableNamingTest { } @Test - @TestForIssue( jiraKey = "HHH-9908" ) + @JiraKey( value = "HHH-9908" ) public void testCollectionJoinTableNamingJpaCompliantStrategy() { // Even in 4.3, with JPA compliant naming, Hibernate creates an unusable table... diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithHbmBindingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithHbmBindingTests.java index d837eac14e..96df2f7a28 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithHbmBindingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/complete/LegacyJpaNamingWithHbmBindingTests.java @@ -14,7 +14,7 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; import org.hibernate.mapping.Selectable; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; * * @author Steve Ebersole */ -@TestForIssue( jiraKey = "" ) +@JiraKey( value = "" ) public class LegacyJpaNamingWithHbmBindingTests extends BaseHbmBindingTests { @Override protected ImplicitNamingStrategy getImplicitNamingStrategyToUse() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java index 323495fea8..318a8a1651 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java @@ -17,7 +17,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.metamodel.CollectionClassification; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Cai Chun */ -@TestForIssue(jiraKey = "HHH-11826") +@JiraKey(value = "HHH-11826") @BaseUnitTest public class ComponentNamingStrategyForJoinColumnTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyTest.java index d7a3e20894..35762aba67 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/components/ComponentNamingStrategyTest.java @@ -20,7 +20,7 @@ import org.hibernate.mapping.Property; import org.hibernate.mapping.SimpleValue; import org.hibernate.metamodel.CollectionClassification; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -63,7 +63,7 @@ public class ComponentNamingStrategyTest { } @Test - @TestForIssue( jiraKey = "HHH-6005" ) + @JiraKey( value = "HHH-6005" ) public void testComponentSafeNamingStrategy() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( AvailableSettings.DEFAULT_LIST_SEMANTICS, CollectionClassification.BAG ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Tests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Tests.java index 2ae2e4fc65..6fc14c1161 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Tests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/namingstrategy/ejb3joincolumn/Tests.java @@ -24,7 +24,7 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.Selectable; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; @@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class Tests { @Test - @TestForIssue(jiraKey = "HHH-9961") + @JiraKey(value = "HHH-9961") public void testJpaJoinColumnPhysicalNaming() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() .applySettings( Environment.getProperties() ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/MaterializedNClobBindTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/MaterializedNClobBindTest.java index 173f3915ed..761b456af7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/MaterializedNClobBindTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/MaterializedNClobBindTest.java @@ -26,7 +26,7 @@ import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.type.descriptor.java.StringJavaType; import org.hibernate.type.descriptor.jdbc.NClobJdbcType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; /** @@ -38,7 +38,7 @@ public class MaterializedNClobBindTest { ); @Test - @TestForIssue( jiraKey = "HHH-11296" ) + @JiraKey( value = "HHH-11296" ) public void testPreparedStatementStreamBinding() throws SQLException { final WrapperOptions wrapperOptions = new MockWrapperOptions( true ); binder.bind( @@ -50,7 +50,7 @@ public class MaterializedNClobBindTest { } @Test - @TestForIssue( jiraKey = "HHH-11296" ) + @JiraKey( value = "HHH-11296" ) public void testCallableStatementStreamBinding() throws SQLException { final WrapperOptions wrapperOptions = new MockWrapperOptions( true ); binder.bind( @@ -62,7 +62,7 @@ public class MaterializedNClobBindTest { } @Test - @TestForIssue( jiraKey = "HHH-11818") + @JiraKey( value = "HHH-11818") public void testPreparedStatementNClobBinding() throws SQLException { final WrapperOptions wrapperOptions = new MockWrapperOptions( false ); binder.bind( @@ -74,7 +74,7 @@ public class MaterializedNClobBindTest { } @Test - @TestForIssue( jiraKey = "HHH-11818") + @JiraKey( value = "HHH-11818") public void testCallableStatementNClobBinding() throws SQLException { final WrapperOptions wrapperOptions = new MockWrapperOptions( false ); binder.bind( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java index b72fdb8589..f0f6f31201 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.nationalized; import org.hibernate.annotations.Nationalized; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10364") +@JiraKey(value = "HHH-10364") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsNationalizedData.class) @DomainModel( annotatedClasses = NationalizedLobFieldTest.MyEntity.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java index f7f1e2e920..c63e91f8c7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java @@ -17,7 +17,7 @@ import org.hibernate.dialect.OracleDialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.RequiresDialects; @@ -32,7 +32,7 @@ import static org.hamcrest.core.Is.is; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "10495") +@JiraKey(value = "10495") @RequiresDialects( value = { @RequiresDialect(value = OracleDialect.class), diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java index 5b4d427445..c288507394 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java @@ -27,7 +27,7 @@ import org.hibernate.type.descriptor.java.CharacterJavaType; import org.hibernate.type.descriptor.java.StringJavaType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -43,7 +43,7 @@ import static org.junit.Assert.assertSame; */ public class UseNationalizedCharDataSettingTest extends BaseUnitTestCase { @Test - @TestForIssue(jiraKey = "HHH-10528") + @JiraKey(value = "HHH-10528") public void testSetting() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( AvailableSettings.USE_NATIONALIZED_CHARACTER_DATA, true ) @@ -76,7 +76,7 @@ public class UseNationalizedCharDataSettingTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11205") + @JiraKey(value = "HHH-11205") public void testSettingOnCharType() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( AvailableSettings.USE_NATIONALIZED_CHARACTER_DATA, true ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/HqlExplicitLeftJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/HqlExplicitLeftJoinTest.java index 78dd690bf4..07347b5b9b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/HqlExplicitLeftJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/HqlExplicitLeftJoinTest.java @@ -4,7 +4,7 @@ import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.hibernate.sql.ast.SqlAstJoinType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -22,7 +22,7 @@ import jakarta.persistence.ManyToOne; @SessionFactory( useCollectingStatementInspector = true ) -@TestForIssue( jiraKey = "HHH-15342") +@JiraKey( value = "HHH-15342") public class HqlExplicitLeftJoinTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundAndSelectJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundAndSelectJoinTest.java index 370599911a..207d206549 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundAndSelectJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundAndSelectJoinTest.java @@ -6,7 +6,7 @@ import org.hibernate.Hibernate; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -28,7 +28,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory(useCollectingStatementInspector = true) -@TestForIssue(jiraKey = "HHH-15990") +@JiraKey(value = "HHH-15990") public class NotFoundAndSelectJoinTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java index 732c7de844..376eb03f16 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java @@ -21,7 +21,7 @@ import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-12436") +@JiraKey(value = "HHH-12436") @DomainModel( annotatedClasses = { OptionalEagerInEmbeddableNotFoundTest.PersonManyToOneJoinIgnore.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java index 08a1b32c28..9e0d9169db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java @@ -15,7 +15,7 @@ import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-12436") +@JiraKey(value = "HHH-12436") @DomainModel( annotatedClasses = { OptionalEagerMappedByNotFoundTest.PersonOneToOneJoinException.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java index bcf0372f41..e5e5ee4a57 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java @@ -20,7 +20,7 @@ import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-12436") +@JiraKey(value = "HHH-12436") @DomainModel( annotatedClasses = { OptionalEagerNotFoundTest.PersonManyToOneJoinIgnore.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java index b7e580a9d7..891e02ff79 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java @@ -20,7 +20,7 @@ import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-12436") +@JiraKey(value = "HHH-12436") @DomainModel( annotatedClasses = { OptionalEagerRefNonPKNotFoundTest.PersonManyToOneJoinIgnore.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java index 24706ffc5d..072d4f7a80 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java @@ -21,7 +21,7 @@ import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-12436") +@JiraKey(value = "HHH-12436") @DomainModel( annotatedClasses = { OptionalLazyNotFoundTest.PersonManyToOneSelectException.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java index 19ce933085..4bc5cac4f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java @@ -19,7 +19,7 @@ import org.hibernate.Hibernate; import org.hibernate.ObjectNotFoundException; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-12436") +@JiraKey(value = "HHH-12436") @DomainModel( annotatedClasses = { RequiredLazyNotFoundTest.PersonManyToOneSelectException.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java index a25d78665b..1422f404b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java @@ -6,7 +6,7 @@ import org.hibernate.FetchNotFoundException; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15229") +@JiraKey(value = "HHH-15229") public class NotFoundExceptionTest { @AfterEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java index 7de266fcaa..aaf035b73a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -47,7 +47,7 @@ public class OneToManyDuplicateInsertionTest { } @Test - @TestForIssue(jiraKey = "HHH-6776") + @JiraKey(value = "HHH-6776") public void testDuplicateInsertion(EntityManagerFactoryScope scope) { // persist parent entity in a transaction @@ -79,7 +79,7 @@ public class OneToManyDuplicateInsertionTest { } @Test - @TestForIssue(jiraKey = "HHH-7404") + @JiraKey(value = "HHH-7404") public void testDuplicateInsertionWithCascadeAndMerge(EntityManagerFactoryScope scope) { scope.inTransaction( em -> { ParentCascade p = new ParentCascade(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java index 783685e6f3..62679c4e2c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.onetomany; import java.util.HashMap; import java.util.Map; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -31,7 +31,7 @@ import jakarta.persistence.Table; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16272") +@JiraKey(value = "HHH-16272") public class RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndListManipulationInSetterMethodTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndListManipulationInSetterMethodTest.java index 06267b4e23..6cd0a3142d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndListManipulationInSetterMethodTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndListManipulationInSetterMethodTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.onetomany; import java.util.ArrayList; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -27,7 +27,7 @@ import jakarta.persistence.Table; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16272") +@JiraKey(value = "HHH-16272") public class RefreshWithPropertyAccessAndListManipulationInSetterMethodTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java index b8e658dcb4..ee3e41320f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.onetomany.inheritance.joined; import java.util.List; import java.util.Map.Entry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestForIssue(jiraKey = "HHH-11005") +@JiraKey(value = "HHH-11005") @DomainModel( annotatedClasses = { Book.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java index 5a46777140..422befdffc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.onetomany.inheritance.perclass; import java.util.List; import java.util.Map.Entry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestForIssue(jiraKey = "HHH-11005") +@JiraKey(value = "HHH-11005") @DomainModel( annotatedClasses = { Book.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java index 6e39a17132..a7ae37cd94 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.onetomany.inheritance.single; import java.util.List; import java.util.Map.Entry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestForIssue(jiraKey = "HHH-11005") +@JiraKey(value = "HHH-11005") @DomainModel( annotatedClasses = { Book.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java index 809f475fe0..334073c89b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Version; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@TestForIssue( jiraKey = "HHH-14826") +@JiraKey( value = "HHH-14826") @DomainModel( annotatedClasses = { OneToOneCacheEnableSelectingTest.Product.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneMultiLevelEmbeddedId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneMultiLevelEmbeddedId.java index ccd89869d7..417ba43089 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneMultiLevelEmbeddedId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneMultiLevelEmbeddedId.java @@ -5,7 +5,7 @@ import java.util.List; import org.hibernate.query.Query; import org.hibernate.query.criteria.HibernateCriteriaBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -32,7 +32,7 @@ import static org.hamcrest.MatcherAssert.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15279") +@JiraKey(value = "HHH-15279") public class OneToOneMultiLevelEmbeddedId { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneWithEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneWithEmbeddedIdTest.java index 1a3a413138..699a80318d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneWithEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/embeddedid/OneToOneWithEmbeddedIdTest.java @@ -5,7 +5,7 @@ import java.io.Serializable; import org.hibernate.cfg.AvailableSettings; import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -29,7 +29,7 @@ import jakarta.persistence.OneToOne; }, integrationSettings = @Setting(name = AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, value = "true") ) -@TestForIssue(jiraKey = "HHH-15153") +@JiraKey(value = "HHH-15153") class OneToOneWithEmbeddedIdTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java index 2bb5698f6e..c8bdba347e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.onetoone.flush; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -21,7 +21,7 @@ import jakarta.persistence.Version; import static org.junit.jupiter.api.Assertions.assertEquals; -@TestForIssue(jiraKey = "HHH-15045") +@JiraKey(value = "HHH-15045") @Jpa( annotatedClasses = { DirtyFlushTest.User.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java index c50e293004..30b333802c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java @@ -21,7 +21,7 @@ import org.hibernate.type.AbstractSingleColumnStandardBasicType; import org.hibernate.type.descriptor.java.StringJavaType; import org.hibernate.type.descriptor.jdbc.ClobJdbcType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -177,7 +177,7 @@ public class OneToOneFormulaTest extends BaseSessionFactoryFunctionalTest { @Test - @TestForIssue(jiraKey = "HHH-5757") + @JiraKey(value = "HHH-5757") public void testQuery() { inTransaction( session -> { Person p = (Person) session.createQuery( "from Person p where p.address = :address" ).setParameter( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java index f2eab23973..cf20a61e39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.onetoone.jointable; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.orm.junit.SessionFactory; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class OneToOneJoinTableTest { @Test - @TestForIssue(jiraKey = "HHH-9188") + @JiraKey(value = "HHH-9188") public void test(SessionFactoryScope scope) throws Exception { Long id = scope.fromTransaction( s -> { Event childEvent = new Event(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java index b17c377193..cc00105afc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.OneToOne; import jakarta.persistence.PrimaryKeyJoinColumn; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import static org.hibernate.Hibernate.isInitialized; import static org.junit.jupiter.api.Assertions.assertFalse; -@TestForIssue(jiraKey = "HHH-12842") +@JiraKey(value = "HHH-12842") @DomainModel( annotatedClasses = { LazyToOneTest.Post.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java index 755cbbf95b..41c45085ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java @@ -12,7 +12,7 @@ import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15498") +@JiraKey(value = "HHH-15498") public class EnumsParameterTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java index 756090cc58..7fac3cf60b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.fail; * * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-9106") +@JiraKey(value = "HHH-9106") @DomainModel( xmlMappings = "org/hibernate/orm/test/ops/Hoarder.hbm.xml", annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java index 2e09601ef4..6da2cd6c88 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.ops; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.fail; * * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-9106") +@JiraKey(value = "HHH-9106") @DomainModel( xmlMappings = "org/hibernate/orm/test/ops/Hoarder.hbm.xml" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedTest.java index 18d8e67a01..0005e56606 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.ops; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.Setting; @@ -18,7 +18,7 @@ import org.hibernate.testing.orm.junit.Setting; * * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-9106") +@JiraKey(value = "HHH-9106") @ServiceRegistry( settings = @Setting(name = AvailableSettings.MERGE_ENTITY_COPY_OBSERVER, value = "disallow") ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java index a9281f51f8..fa70186329 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.MapsId; import jakarta.persistence.OneToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author localEvg */ -@TestForIssue(jiraKey = "HHH-12436") +@JiraKey(value = "HHH-12436") @Jpa( annotatedClasses = { OneToOneMergeTest.Prima.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OracleNoColumnInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OracleNoColumnInsertTest.java index 5e5153bffc..b0b4a24703 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OracleNoColumnInsertTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OracleNoColumnInsertTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.ops; import org.hibernate.dialect.OracleDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; * @author Vlad Mihalcea */ @RequiresDialect(value = OracleDialect.class) -@TestForIssue(jiraKey = "HHH-13104") +@JiraKey(value = "HHH-13104") @DomainModel( xmlMappings = "org/hibernate/orm/test/ops/Competition.hbm.xml" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java index 69c3290d50..2417c1992c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Table; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; public class RemoveOrderingTest { @Test - @TestForIssue( jiraKey = "HHH-8550" ) + @JiraKey( value = "HHH-8550" ) @FailureExpected( jiraKey = "HHH-8550" ) public void testManyToOne(SessionFactoryScope scope) throws Exception { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/replicate/ReplicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/replicate/ReplicateTest.java index 38a49325df..37187f1bc3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/replicate/ReplicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/replicate/ReplicateTest.java @@ -18,7 +18,7 @@ import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; * * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-11514") +@JiraKey(value = "HHH-11514") @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) @FailureExpected( jiraKey = "HHH-11514" ) public class ReplicateTest extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java index fee26d92fc..904968e33a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.orderby; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -24,7 +24,7 @@ import jakarta.persistence.ManyToOne; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16189") +@JiraKey(value = "HHH-16189") public class EmbeddedIdOrderByAndAggregateFunctionTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java index e653a4b8f5..411f29938e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.orderby; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -22,7 +22,7 @@ import jakarta.persistence.ManyToOne; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16189") +@JiraKey(value = "HHH-16189") public class OrderByAndAggregateFunctionTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java index ac22158e7b..921c00241f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.OrderBy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -98,7 +98,7 @@ public class OrderByTest { } @Test - @TestForIssue(jiraKey = "HHH-14351") + @JiraKey(value = "HHH-14351") public void testOrderBySqlNode(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -112,7 +112,7 @@ public class OrderByTest { } @Test - @TestForIssue( jiraKey = "HHH-15885") + @JiraKey( value = "HHH-15885") public void testOrderBy(SessionFactoryScope scope) { scope.inSession( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java index b0ff8d4b4d..af99fe89c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java @@ -7,7 +7,7 @@ import java.util.LinkedList; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -39,7 +39,7 @@ import static jakarta.persistence.CascadeType.REMOVE; @Setting(name = AvailableSettings.ORDER_UPDATES, value = "true") } ) -@TestForIssue(jiraKey = "HHH-16368") +@JiraKey(value = "HHH-16368") public class OrderUpdatesTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java index 733eb1f24a..d318e57a14 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java @@ -11,7 +11,7 @@ import org.hibernate.LockMode; import org.hibernate.cfg.AvailableSettings; import org.hibernate.internal.util.SerializationHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -285,7 +285,7 @@ public class OrphanTest { @Test @SuppressWarnings("unchecked") - @TestForIssue(jiraKey = "HHH-9171") + @JiraKey(value = "HHH-9171") public void testOrphanDeleteOnAddElementMergeRemoveElementMerge(SessionFactoryScope scope) { Product prod = new Product(); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java index 92f5b2ebb5..73361b569f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.orphan; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -17,7 +17,7 @@ import org.junit.jupiter.api.Test; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-565") +@JiraKey(value = "HHH-565") @DomainModel( xmlMappings = { "org/hibernate/orm/test/orphan/User.hbm.xml", diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java index ff1b6dfb6f..60519f9d82 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java @@ -2,14 +2,14 @@ package org.hibernate.orm.test.orphan.elementcollection; import java.util.Collections; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; -@TestForIssue(jiraKey = "HHH-14597") +@JiraKey(value = "HHH-14597") @DomainModel( xmlMappings = "org/hibernate/orm/test/orphan/elementcollection/student.hbm.xml" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java index 546c1d7aab..7c946f552a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java @@ -10,7 +10,7 @@ import java.util.List; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -36,7 +36,7 @@ public class ManyToManyOrphanTest { } @Test - @TestForIssue(jiraKey = "HHH-8749") + @JiraKey(value = "HHH-8749") public void testManyToManyWithCascadeDeleteOrphan(SessionFactoryScope scope) { scope.inTransaction( s -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java index bdd0653df5..0e376ecf65 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.OneToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9663") +@JiraKey(value = "HHH-9663") @DomainModel( annotatedClasses = { OneToOneEagerNonOptionalOrphanRemovalTest.Car.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java index 3033ba6144..6dad6e2c95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.FetchType; import jakarta.persistence.Id; import jakarta.persistence.OneToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9663") +@JiraKey(value = "HHH-9663") @DomainModel( annotatedClasses = { OneToOneEagerOrphanRemovalTest.Car.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java index bd9a03d7b5..46265f0e1a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.OneToOne; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11965") +@JiraKey(value = "HHH-11965") @Jpa( annotatedClasses = { OneToOneProxyOrphanRemovalTest.Child.class, OneToOneProxyOrphanRemovalTest.Parent.class } ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java index 66da3bd6eb..88a948c2e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.orphan.one2one.fk.bidirectional; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -79,7 +79,7 @@ public class DeleteOneToOneOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-6484") + @JiraKey(value = "HHH-6484") public void testReplacedWhileManaged(SessionFactoryScope scope) { Employee e = scope.fromTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java index 487a49043f..a24413a7b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -82,7 +82,7 @@ public class DeleteMultiLevelOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-9091") + @JiraKey(value = "HHH-9091") public void testDirectAssociationOrphanedWhileManaged(SessionFactoryScope scope) { Preisregelung p = scope.fromTransaction( @@ -123,7 +123,7 @@ public class DeleteMultiLevelOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-9091") + @JiraKey(value = "HHH-9091") public void testReplacedDirectAssociationWhileManaged(SessionFactoryScope scope) { // Create a new Tranchenmodell with new direct and nested associations @@ -212,7 +212,7 @@ public class DeleteMultiLevelOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-9091") + @JiraKey(value = "HHH-9091") public void testDirectAndNestedAssociationsOrphanedWhileManaged(SessionFactoryScope scope) { Preisregelung p = scope.fromTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java index b32ad9911e..ca4b2257ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.orphan.one2one.fk.composite; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -79,7 +79,7 @@ public class DeleteOneToOneOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-6484") + @JiraKey(value = "HHH-6484") public void testReplacedWhileManaged(SessionFactoryScope scope) { Employee e = scope.fromTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java index 39f1c81717..a01d4bd646 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -80,7 +80,7 @@ public class DeleteOneToOneOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-6484") + @JiraKey(value = "HHH-6484") public void testReplacedWhileManaged(SessionFactoryScope scope) { Employee e = scope.fromTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java index 6563a0a2c6..898689b35a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional.multilev import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -74,7 +74,7 @@ public class DeleteMultiLevelOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-9091") + @JiraKey(value = "HHH-9091") public void testOrphanedWhileManaged(SessionFactoryScope scope) { Preisregelung p = scope.fromTransaction( @@ -103,7 +103,7 @@ public class DeleteMultiLevelOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-9091") + @JiraKey(value = "HHH-9091") public void testReplacedWhileManaged(SessionFactoryScope scope) { Tranchenmodell t = scope.fromTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java index 816fa0e00b..ff4e29ec60 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java @@ -8,9 +8,8 @@ package org.hibernate.orm.test.orphan.one2one.fk.reversed.unidirectional; import java.util.List; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java index a9fa6238ee..b03f7ac2b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.orphan.onetomany; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -57,7 +57,7 @@ public class DeleteOneToManyOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-9330") + @JiraKey(value = "HHH-9330") public void testOrphanedWhileManaged(SessionFactoryScope scope) { Product p = scope.fromTransaction( @@ -86,7 +86,7 @@ public class DeleteOneToManyOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-9330") + @JiraKey(value = "HHH-9330") public void testOrphanedWhileManagedMergeOwner(SessionFactoryScope scope) { Product p = scope.fromTransaction( @@ -117,7 +117,7 @@ public class DeleteOneToManyOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-9330") + @JiraKey(value = "HHH-9330") public void testReplacedWhileManaged(SessionFactoryScope scope) { Feature f = scope.fromTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java index 219252074b..da9ba71647 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java @@ -16,7 +16,7 @@ import org.hibernate.Transaction; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertFalse; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertFalse; * * @author Valotasios Yoryos */ -@TestForIssue( jiraKey = "HHH-5715" ) +@JiraKey( value = "HHH-5715" ) public class DistinctSelectTest extends BaseCoreFunctionalTestCase { private static final int NUM_OF_USERS = 30; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java index 2c2146e59a..9cc0bff20a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java @@ -15,7 +15,7 @@ import org.hibernate.dialect.OracleDialect; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -68,7 +68,7 @@ public class OraclePaginationTest extends BaseEntityManagerFunctionalTestCase { @Test - @TestForIssue(jiraKey = "HHH-12087") + @JiraKey(value = "HHH-12087") public void testPagination() { doInJPA( this::entityManagerFactory, entityManager -> { List rootEntitiesAllPages = getLimitedRows( entityManager, 0, 10 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java index e70802b555..a668b06d47 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java @@ -14,7 +14,7 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.query.sqm.FetchClauseType; import org.hibernate.resource.jdbc.spi.StatementInspector; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @RequiresDialect(value = OracleDialect.class, majorVersion = 12) -@TestForIssue(jiraKey = "HHH-14624") +@JiraKey(value = "HHH-14624") @DomainModel( annotatedClasses = OraclePaginationWithLocksTest.Person.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/HHH9965Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/HHH9965Test.java index 908e88ad1d..529336c9e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/HHH9965Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/HHH9965Test.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.pagination.hhh9965; import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -20,7 +20,7 @@ import static org.junit.Assert.fail; * * @author Reda.Housni-Alaoui */ -@TestForIssue(jiraKey = "HHH-9965") +@JiraKey(value = "HHH-9965") public class HHH9965Test extends BaseCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractTreeableEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractTreeableEntityTest.java index 0fffd3f546..5dbb4a1e08 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractTreeableEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractTreeableEntityTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.persister.entity; import java.util.Collection; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @DomainModel(annotatedClasses = AbstractTreeableEntityTest.TestEntity.class) @SessionFactory -@TestForIssue(jiraKey = "HHH-15822") +@JiraKey(value = "HHH-15822") public class AbstractTreeableEntityTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java index 682d15c63e..928e876a47 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java @@ -15,14 +15,14 @@ import org.hibernate.annotations.JoinColumnsOrFormulas; import org.hibernate.annotations.JoinFormula; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -@TestForIssue(jiraKey = "HHH-14223") +@JiraKey(value = "HHH-14223") @Jpa(annotatedClasses = { JoinFormulaImplicitJoinTest.Person.class, JoinFormulaImplicitJoinTest.PersonVersion.class }, properties = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinedInheritanceImplicitJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinedInheritanceImplicitJoinTest.java index 909d04ce0d..f17304776c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinedInheritanceImplicitJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinedInheritanceImplicitJoinTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Join; import jakarta.persistence.criteria.Root; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; -@TestForIssue(jiraKey = "HHH-16979") +@JiraKey(value = "HHH-16979") @Jpa(annotatedClasses = { JoinedInheritanceImplicitJoinTest.MasterEntity.class, JoinedInheritanceImplicitJoinTest.ChildEntity.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableSchemaTest.java index e7d72e4bb1..3a425a8de9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableSchemaTest.java @@ -15,7 +15,7 @@ import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableIn import org.hibernate.query.sqm.mutation.internal.temptable.PersistentTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -47,7 +47,7 @@ public class TemporaryTableSchemaTest { static final String CUSTOM_SCHEMA = "CUSTOM_SCHEMA"; @Test - @TestForIssue( jiraKey = "HHH-15517") + @JiraKey( value = "HHH-15517") public void test(SessionFactoryScope scope) { final SessionFactoryImplementor sessionFactory = scope.getSessionFactory(); final SqmMultiTableInsertStrategy insertStrategy = sessionFactory diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java index bd51dab686..1a34270aa0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java @@ -13,7 +13,7 @@ import org.hibernate.dialect.OracleDialect; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.DomainModel; @@ -61,7 +61,7 @@ public class TemporaryTableStrategyTest { ) ); @Test - @TestForIssue(jiraKey = "HHH-15550") + @JiraKey(value = "HHH-15550") public void testGlobalTemporaryTableStrategy(SessionFactoryScope scope) { scope.inTransaction( s -> { Bar bar = new Bar(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest.java index d441e7d95a..d1ae8ad804 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.polymorphic; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-15718") +@JiraKey( value = "HHH-15718") public class PolymorphicQueriesTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest2.java index be57b88509..403b2be10c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesTest2.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.polymorphic; import org.hibernate.query.spi.QueryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -37,7 +37,7 @@ public class PolymorphicQueriesTest2 { } @Test - @TestForIssue( jiraKey = "HHH-15744") + @JiraKey( value = "HHH-15744") public void testQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -52,7 +52,7 @@ public class PolymorphicQueriesTest2 { } @Test - @TestForIssue(jiraKey = "HHH-15850") + @JiraKey(value = "HHH-15850") public void testQueryLike(SessionFactoryScope scope) { scope.inTransaction( session -> { assertEquals( "Fab", session.createQuery( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesWithJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesWithJoinTest.java index 59e42123fc..b5f9354d13 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesWithJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicQueriesWithJoinTest.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -28,7 +28,7 @@ import jakarta.persistence.TypedQuery; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15944") +@JiraKey(value = "HHH-15944") public class PolymorphicQueriesWithJoinTest { public static final Long PERSON_ID = 1l; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java index 8b58f8f34c..718ee472ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java @@ -27,7 +27,7 @@ import org.hibernate.result.Output; import org.hibernate.result.ResultSetOutput; import org.hibernate.type.StandardBasicTypes; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -349,7 +349,7 @@ public class MySQLStoredProcedureTest { } @Test - @TestForIssue(jiraKey = "HHH-12905") + @JiraKey(value = "HHH-12905") public void testStoredProcedureNullParameter(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -378,7 +378,7 @@ public class MySQLStoredProcedureTest { } @Test - @TestForIssue(jiraKey = "HHH-12905") + @JiraKey(value = "HHH-12905") public void testStoredProcedureNullParameterHibernateWithoutEnablePassingNulls(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java index 36170d6e61..d391b0d15e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java @@ -28,7 +28,7 @@ import org.hibernate.result.ResultSetOutput; import org.hibernate.type.NumericBooleanConverter; import org.hibernate.type.YesNoConverter; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -136,7 +136,7 @@ public class OracleStoredProcedureTest { } @Test - @TestForIssue(jiraKey = "HHH-15542") + @JiraKey(value = "HHH-15542") public void testStoredProcedureInAndOutAndRefCursorParameters(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -164,7 +164,7 @@ public class OracleStoredProcedureTest { } @Test - @TestForIssue(jiraKey = "HHH-18280") + @JiraKey(value = "HHH-18280") public void testStoredProcedureInAndOutAndRefCursorParametersInvertedParamRegistationOrder(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -192,7 +192,7 @@ public class OracleStoredProcedureTest { } @Test - @TestForIssue(jiraKey = "HHH-18280") + @JiraKey(value = "HHH-18280") public void testStoredProcedureInAndOutAndRefCursorParametersInvertedParamRegistationOrder2(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -334,7 +334,7 @@ public class OracleStoredProcedureTest { } @Test - @TestForIssue(jiraKey = "HHH-11863") + @JiraKey(value = "HHH-11863") public void testSysRefCursorAsOutParameter(EntityManagerFactoryScope scope) { scope.inTransaction( @@ -360,7 +360,7 @@ public class OracleStoredProcedureTest { } @Test - @TestForIssue(jiraKey = "HHH-11863") + @JiraKey(value = "HHH-11863") public void testOutAndSysRefCursorAsOutParameter(EntityManagerFactoryScope scope) { scope.inTransaction( @@ -386,7 +386,7 @@ public class OracleStoredProcedureTest { } @Test - @TestForIssue(jiraKey = "HHH-12661") + @JiraKey(value = "HHH-12661") public void testBindParameterAsHibernateType(EntityManagerFactoryScope scope) { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java index aa03b34248..173f804325 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java @@ -30,7 +30,7 @@ import org.hibernate.procedure.ProcedureCall; import org.hibernate.type.StandardBasicTypes; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -265,7 +265,7 @@ public class PostgreSQLFunctionProcedureTest extends BaseEntityManagerFunctional } @Test - @TestForIssue(jiraKey = "HHH-11863") + @JiraKey(value = "HHH-11863") public void testSysRefCursorAsOutParameter() { doInJPA( this::entityManagerFactory, entityManager -> { @@ -309,7 +309,7 @@ public class PostgreSQLFunctionProcedureTest extends BaseEntityManagerFunctional } @Test - @TestForIssue(jiraKey = "HHH-11863") + @JiraKey(value = "HHH-11863") public void testSysRefCursorAsOutParameterOld() { doInJPA( this::entityManagerFactory, entityManager -> { StoredProcedureQuery function = entityManager.createStoredProcedureQuery( "singleRefCursor" ); @@ -335,7 +335,7 @@ public class PostgreSQLFunctionProcedureTest extends BaseEntityManagerFunctional } @Test - @TestForIssue(jiraKey = "HHH-12905") + @JiraKey(value = "HHH-12905") public void testFunctionProcedureNullParameterHibernate() { doInJPA( this::entityManagerFactory, entityManager -> { @@ -364,7 +364,7 @@ public class PostgreSQLFunctionProcedureTest extends BaseEntityManagerFunctional } @Test - @TestForIssue(jiraKey = "HHH-12905") + @JiraKey(value = "HHH-12905") public void testFunctionProcedureNullParameterHibernateWithoutEnablePassingNulls() { doInJPA( this::entityManagerFactory, entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java index 4578c83321..ee8271d04a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java @@ -15,7 +15,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.orm.junit.Jpa; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Vlad Mihalcea */ @RequiresDialect(value = SQLServerDialect.class, majorVersion = 11) -@TestForIssue( jiraKey = "HHH-12704" ) +@JiraKey( value = "HHH-12704" ) @Jpa( annotatedClasses = { Person.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureForcePositionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureForcePositionalTest.java index c168dafc2c..34195e99af 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureForcePositionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureForcePositionalTest.java @@ -6,19 +6,13 @@ */ package org.hibernate.orm.test.procedure; -import java.sql.CallableStatement; import java.sql.Timestamp; -import java.sql.Types; import java.time.LocalDateTime; import java.time.ZoneOffset; -import java.util.List; -import java.util.regex.Pattern; -import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -34,11 +28,8 @@ import jakarta.persistence.ParameterMode; import jakarta.persistence.StoredProcedureQuery; import jakarta.persistence.Table; -import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.testing.transaction.TransactionUtil.doInAutoCommit; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Vlad Mihalcea diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureTest.java index 32071447f5..0bc12b632a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/SQLServerStoredProcedureTest.java @@ -18,7 +18,7 @@ import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -235,7 +235,7 @@ public class SQLServerStoredProcedureTest { @Test - @TestForIssue(jiraKey = "HHH-18280") + @JiraKey(value = "HHH-18280") public void testStoredProcedureInAndOutParametersInvertedParamRegistationOrder2(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -255,7 +255,7 @@ public class SQLServerStoredProcedureTest { @Test - @TestForIssue(jiraKey = "HHH-18280") + @JiraKey(value = "HHH-18280") public void testStoredProcedureInAndOutParametersInvertedParamRegistationOrder2_(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { @@ -276,7 +276,7 @@ public class SQLServerStoredProcedureTest { } @Test - @TestForIssue(jiraKey = "HHH-18280") + @JiraKey(value = "HHH-18280") public void testStoredProcedureInAndOutParametersInvertedParamRegistationOrder3(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoreProcedureStatementsClosedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoreProcedureStatementsClosedTest.java index b96d935476..1584e7a791 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoreProcedureStatementsClosedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoreProcedureStatementsClosedTest.java @@ -7,7 +7,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -23,7 +23,7 @@ import jakarta.persistence.StoredProcedureQuery; import static org.junit.jupiter.api.Assertions.assertTrue; @RequiresDialect(H2Dialect.class) -@TestForIssue( jiraKey = "HHH-15403") +@JiraKey( value = "HHH-15403") public class StoreProcedureStatementsClosedTest extends BaseSessionFactoryFunctionalTest { private final PreparedStatementSpyConnectionProvider connectionProvider = new PreparedStatementSpyConnectionProvider( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java index f4f9e787da..03bee8c7c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java @@ -36,7 +36,7 @@ import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.TrueFalseConverter; import org.hibernate.type.YesNoConverter; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -58,7 +58,7 @@ public class StoredProcedureParameterTypeTest { private static final byte[] TEST_BYTE_ARRAY = TEST_STRING.getBytes(); @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testNumericBooleanTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery( "test" ) @@ -69,7 +69,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testNumericBooleanTypeConverterInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery( "test" ) @@ -80,7 +80,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testYesNoTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery( "test" ) @@ -91,7 +91,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testYesNoTypeConverterInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery( "test" ) @@ -102,7 +102,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testTrueFalseTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -112,7 +112,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testTrueFalseTypeConverterInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -122,7 +122,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testStringTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -132,7 +132,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testMaterializedClobTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -142,7 +142,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testTextTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -152,7 +152,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testCharacterTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -162,7 +162,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testBooleanTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -172,7 +172,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testByteTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -182,7 +182,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testShortTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -192,7 +192,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testIntegerTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -202,7 +202,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testLongTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -221,7 +221,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testDoubleTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -231,7 +231,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testBigIntegerTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -241,7 +241,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testBigDecimalTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -251,7 +251,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testTimestampTypeDateInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -261,7 +261,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testTimestampTypeTimestampInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -271,7 +271,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testTimeTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -281,7 +281,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testDateTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -291,7 +291,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testCalendarTypeCalendarInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -301,7 +301,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testCurrencyTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -311,7 +311,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testLocaleTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -321,7 +321,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testTimeZoneTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -331,7 +331,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testUrlTypeInParameter(SessionFactoryScope scope) throws MalformedURLException { final URL url = new URL( "http://example.com"); scope.inTransaction( @@ -342,7 +342,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testClassTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -352,7 +352,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testBlobTypeInParameter(SessionFactoryScope scope) throws SQLException { final Blob blob = new SerialBlob( TEST_BYTE_ARRAY); scope.inTransaction( @@ -363,7 +363,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testClobTypeInParameter(SessionFactoryScope scope) throws SQLException { final Clob clob = new SerialClob( TEST_CHAR_ARRAY); scope.inTransaction( @@ -374,7 +374,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testBinaryTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -384,7 +384,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testCharArrayTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -394,7 +394,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue( jiraKey = "HHH-12661" ) + @JiraKey( value = "HHH-12661" ) public void testUUIDBinaryTypeInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> session.createStoredProcedureQuery("test") @@ -404,7 +404,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-12905") + @JiraKey(value = "HHH-12905") public void testStringTypeInParameterIsNull(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -416,7 +416,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-12905") + @JiraKey(value = "HHH-12905") public void testStringTypeInParameterIsNullWithoutEnablePassingNulls(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -429,7 +429,7 @@ public class StoredProcedureParameterTypeTest { @Test - @TestForIssue(jiraKey = "HHH-15618") + @JiraKey(value = "HHH-15618") public void testTypedParameterValueInParameter(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -445,7 +445,7 @@ public class StoredProcedureParameterTypeTest { } @Test - @TestForIssue(jiraKey = "HHH-15618") + @JiraKey(value = "HHH-15618") public void testTypedParameterValueInParameterWithNotSpecifiedType(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java index 9e2ecd3b7a..fc7789bc06 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java @@ -5,7 +5,7 @@ import jakarta.persistence.Query; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; public class ProcedureCallImplTest { @Test - @TestForIssue( jiraKey = "HHH-13644" ) + @JiraKey( value = "HHH-13644" ) @RequiresDialect( H2Dialect.class ) public void testNoNullPointerExceptionThrown(EntityManagerFactoryScope scope) { scope.inTransaction( em -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java index d1188cdb5a..9901b44f43 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.property; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue; @SessionFactory public class DirectPropertyAccessorTest { @Test - @TestForIssue( jiraKey="HHH-3718" ) + @JiraKey( value="HHH-3718" ) public void testDirectIdPropertyAccess(SessionFactoryScope scope) throws Exception { scope.inTransaction( s -> { Item i = new Item(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java index e5fe20d9be..bac201f662 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java @@ -19,7 +19,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.internal.util.ReflectHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -53,7 +53,7 @@ public class GetAndIsVariantGetterTest { } @Test - @TestForIssue( jiraKey = "HHH-10172" ) + @JiraKey( value = "HHH-10172" ) public void testHbmXml() { try { new MetadataSources( ssr ) @@ -67,7 +67,7 @@ public class GetAndIsVariantGetterTest { } @Test - @TestForIssue( jiraKey = "HHH-10172" ) + @JiraKey( value = "HHH-10172" ) public void testAnnotations() { try { new MetadataSources( ssr ) @@ -81,7 +81,7 @@ public class GetAndIsVariantGetterTest { } @Test - @TestForIssue( jiraKey = "HHH-10242" ) + @JiraKey( value = "HHH-10242" ) public void testAnnotationsCorrected() { Metadata metadata = new MetadataSources( ssr ) .addAnnotatedClass( TheEntity2.class ) @@ -91,7 +91,7 @@ public class GetAndIsVariantGetterTest { } @Test - @TestForIssue( jiraKey = "HHH-10309" ) + @JiraKey( value = "HHH-10309" ) public void testAnnotationsFieldAccess() { // this one should be ok because the AccessType is FIELD Metadata metadata = new MetadataSources( ssr ) @@ -102,7 +102,7 @@ public class GetAndIsVariantGetterTest { } @Test - @TestForIssue( jiraKey = "HHH-12046" ) + @JiraKey( value = "HHH-12046" ) public void testInstanceStaticConflict() { Metadata metadata = new MetadataSources( ssr ) .addAnnotatedClass( InstanceStaticEntity.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java index 30d4fd64a4..a2228691d6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.persistence.Transient; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertThat; GetAndIsVariantGetterWithTransientAnnotationTest.TestEntity.class, GetAndIsVariantGetterWithTransientAnnotationTest.SecondTestEntity.class }) -@TestForIssue(jiraKey = "HHH-11716") +@JiraKey(value = "HHH-11716") public class GetAndIsVariantGetterWithTransientAnnotationTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/BasicPropertiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/BasicPropertiesTest.java index 3cbc06bdb3..d36e8ccbda 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/BasicPropertiesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/BasicPropertiesTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.propertyref.basic; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -28,7 +28,7 @@ public class BasicPropertiesTest { * Really simple regression test for HHH-8689. */ @Test - @TestForIssue(jiraKey = "HHH-8689") + @JiraKey(value = "HHH-8689") public void testProperties(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java index 37b81ac5c1..28c4fe7ccc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.propertyref.cachedcollections; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-5853") +@JiraKey(value = "HHH-5853") @DomainModel( xmlMappings = "org/hibernate/orm/test/propertyref/cachedcollections/Mappings.hbm.xml" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java index de31410512..96b510a14b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java @@ -18,7 +18,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.internal.util.SerializationHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -52,7 +52,7 @@ public class MultipleSessionFactoriesProxyTest extends BaseCoreFunctionalTestCas } @Test - @TestForIssue(jiraKey = "HHH-17172") + @JiraKey(value = "HHH-17172") public void testProxySerializationWithMultipleSessionFactories() { Session s = openSession(); Transaction t = s.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java index b5edc7f280..d52a3e21f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java @@ -8,9 +8,8 @@ package org.hibernate.orm.test.proxy; import java.util.List; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompareEntityValuedPathsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompareEntityValuedPathsTest.java index 93789c0cc7..0f781e8c0b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompareEntityValuedPathsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompareEntityValuedPathsTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.query; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; annotatedClasses = { CompareEntityValuedPathsTest.Person.class } ) @SessionFactory(useCollectingStatementInspector = true) -@TestForIssue(jiraKey = "HHH-15349") +@JiraKey(value = "HHH-15349") public class CompareEntityValuedPathsTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompositeKeyNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompositeKeyNativeQueryTest.java index 558deb68af..bfded03e14 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompositeKeyNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CompositeKeyNativeQueryTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.query; import java.io.Serializable; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -17,7 +17,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.IdClass; import jakarta.persistence.Table; -@TestForIssue(jiraKey = "HHH-15418") +@JiraKey(value = "HHH-15418") @DomainModel( annotatedClasses = { CompositeKeyNativeQueryTest.Zone.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java index 0093b0db83..2bd37ce7c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -63,7 +63,7 @@ public class EntityAsParamValueTest { } @Test - @TestForIssue(jiraKey = "HHH-15256") + @JiraKey(value = "HHH-15256") public void testQueryWithLeftJoinEntityAsParamValue(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -94,7 +94,7 @@ public class EntityAsParamValueTest { } @Test - @TestForIssue(jiraKey = "HHH-15223") + @JiraKey(value = "HHH-15223") public void testQueryWithEntityAsParamValue(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingCriteriaTest.java index f2330902b0..260492f5fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingCriteriaTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-13108") +@JiraKey(value = "HHH-13108") @Jpa( annotatedClasses = InClauseParameterPaddingCriteriaTest.Document.class, integrationSettings = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingTest.java index 8dbea28adc..29ad96923f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InClauseParameterPaddingTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12469") +@JiraKey(value = "HHH-12469") @Jpa( annotatedClasses = { InClauseParameterPaddingTest.Person.class }, integrationSettings = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/MaxInExpressionParameterPaddingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/MaxInExpressionParameterPaddingTest.java index a975b5e3d8..e9a4875c89 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/MaxInExpressionParameterPaddingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/MaxInExpressionParameterPaddingTest.java @@ -15,7 +15,7 @@ import java.util.stream.Stream; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -39,7 +39,7 @@ import static org.junit.jupiter.params.provider.Arguments.arguments; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12469") +@JiraKey(value = "HHH-12469") @RequiresDialect(H2Dialect.class) @Jpa( annotatedClasses = { MaxInExpressionParameterPaddingTest.Person.class }, @@ -116,7 +116,7 @@ public class MaxInExpressionParameterPaddingTest { arguments( 15, 15 ) ); } - @TestForIssue(jiraKey = "HHH-16826") + @JiraKey(value = "HHH-16826") @ParameterizedTest @MethodSource public void testInClauseParameterPaddingUpToLimit(int parameters, int expectedBindVariables, EntityManagerFactoryScope scope) { @@ -147,7 +147,7 @@ public class MaxInExpressionParameterPaddingTest { arguments( 8 * MAX_COUNT + 1, 16 ) ); } - @TestForIssue(jiraKey = "HHH-16826") + @JiraKey(value = "HHH-16826") @ParameterizedTest @MethodSource public void testInClauseParameterPaddingAfterLimit(int parameters, int expectedInClauses, EntityManagerFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryDynamicInstantiationAndTupleResultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryDynamicInstantiationAndTupleResultTest.java index 63cb1ef6b2..9eb5f4fcfa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryDynamicInstantiationAndTupleResultTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryDynamicInstantiationAndTupleResultTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.query.spi.QueryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -31,7 +31,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16119") +@JiraKey(value = "HHH-16119") public class NativeQueryDynamicInstantiationAndTupleResultTest { public static final String DEMO_NAME = "it is a demo demo"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java index ac10efbc7d..dda9ed14a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java @@ -4,8 +4,9 @@ import java.util.List; import org.hibernate.query.sql.spi.NativeQueryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; @@ -23,7 +24,10 @@ import static org.hamcrest.MatcherAssert.assertThat; annotatedClasses = { NativeQuerySchemaPlaceholderTest.TestEntity.class } ) @SessionFactory -@TestForIssue(jiraKey = {"HHH-15269", "HHH-18215"}) +@JiraKeyGroup( value = { + @JiraKey( value = "HHH-15269" ), + @JiraKey( value = "HHH-18215" ) +} ) public class NativeQuerySchemaPlaceholderTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java index 493ea102fb..f9996cd400 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.query.NativeQuery; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -40,7 +40,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15608") +@JiraKey(value = "HHH-15608") public class NativeQueryWithDuplicateColumnTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/OneToManyLazyAndEagerProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/OneToManyLazyAndEagerProxyTest.java index aee48e4b9e..70fd5d0b14 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/OneToManyLazyAndEagerProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/OneToManyLazyAndEagerProxyTest.java @@ -13,7 +13,7 @@ import org.hibernate.Hibernate; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.proxy.HibernateProxy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue; * @author Marco Belladelli * @author Tomas Cerskus */ -@TestForIssue(jiraKey = "HHH-16136") +@JiraKey(value = "HHH-16136") public class OneToManyLazyAndEagerProxyTest extends BaseEntityManagerFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java index 69937a770b..560f9f9505 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java @@ -23,7 +23,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider; import org.hibernate.testing.orm.junit.DialectContext; @@ -95,7 +95,7 @@ public class QueryTimeOutTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12075") + @JiraKey(value = "HHH-12075") public void testCreateQuerySetTimeout() { doInHibernate( this::sessionFactory, session -> { @@ -120,7 +120,7 @@ public class QueryTimeOutTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12075") + @JiraKey(value = "HHH-12075") public void testCreateQuerySetTimeoutHint() { doInHibernate( this::sessionFactory, session -> { @@ -145,7 +145,7 @@ public class QueryTimeOutTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12075") + @JiraKey(value = "HHH-12075") public void testCreateNativeQuerySetTimeout() { doInHibernate( this::sessionFactory, session -> { @@ -170,7 +170,7 @@ public class QueryTimeOutTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12075") + @JiraKey(value = "HHH-12075") public void testCreateNativeQuerySetTimeoutHint() { doInHibernate( this::sessionFactory, session -> { @@ -195,7 +195,7 @@ public class QueryTimeOutTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12075") + @JiraKey(value = "HHH-12075") public void testCreateSQLQuerySetTimeout() { doInHibernate( this::sessionFactory, session -> { @@ -220,7 +220,7 @@ public class QueryTimeOutTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-12075") + @JiraKey(value = "HHH-12075") public void testCreateSQLQuerySetTimeoutHint() { doInHibernate( this::sessionFactory, session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java index dbfd744218..6fd81a79cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Convert; import org.hibernate.annotations.Nationalized; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -37,14 +37,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @SessionFactory public class SQLServerNationalizedScalarQueryTest { - @TestForIssue(jiraKey = "HHH-16857") + @JiraKey(value = "HHH-16857") @Test public void testLiteral(SessionFactoryScope scope) { scope.inTransaction(session -> session.createSelectionQuery("from User where name = 'Gavin'").getResultList()); scope.inTransaction(session -> session.createSelectionQuery("from User where role = 'ADMIN'").getResultList()); } - @TestForIssue(jiraKey = "HHH-10183") + @JiraKey(value = "HHH-10183") @Test public void testScalarResult(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java index 836e7df34a..c012abf528 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.query; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; annotatedClasses = { SelectCaseWhenNullLiteralTest.Person.class } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15343") +@JiraKey(value = "HHH-15343") public class SelectCaseWhenNullLiteralTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java index 15037f7196..c4014fef4b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.query; import java.io.Serializable; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15339") +@JiraKey(value = "HHH-15339") public class SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java index f673f444e2..50412be30b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.query; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; annotatedClasses = { SelectNullQueryTest.Person.class } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15278") +@JiraKey(value = "HHH-15278") public class SelectNullQueryTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java index 334d953a95..022d700ce6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java @@ -17,7 +17,7 @@ import org.hibernate.query.spi.QueryImplementor; import org.hibernate.query.sqm.tree.SqmJoinType; import org.hibernate.query.sqm.tree.from.SqmAttributeJoin; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -47,7 +47,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; */ @DomainModel(annotatedClasses = SubQueryInFromEmbeddedIdTests.Contact.class) @SessionFactory -@TestForIssue( jiraKey = "HHH-") +@JiraKey( value = "HHH-") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSubqueryInOnClause.class) @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsOrderByInCorrelatedSubquery.class) public class SubQueryInFromEmbeddedIdTests { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java index 81d0277389..bad6aedbe7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.query; import org.hibernate.query.spi.SqmQuery; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.Jpa; @@ -31,7 +31,7 @@ import static org.hamcrest.MatcherAssert.assertThat; ToHqlStringTest.TestEntitySub.class } ) -@TestForIssue( jiraKey = "HHH-15389") +@JiraKey( value = "HHH-15389") public class ToHqlStringTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaPrimitiveIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaPrimitiveIdTest.java index 798a5dcf8a..dacac280da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaPrimitiveIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaPrimitiveIdTest.java @@ -11,7 +11,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.hibernate.Session; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -24,7 +24,7 @@ import jakarta.persistence.criteria.Root; import jakarta.persistence.metamodel.EntityType; import jakarta.persistence.metamodel.SingularAttribute; -@TestForIssue(jiraKey = "HHH-15073") +@JiraKey(value = "HHH-15073") public class CriteriaPrimitiveIdTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java index d498ab34b6..6f0ac9cf54 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java @@ -16,14 +16,14 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; /** * @author Michiel Haisma * @author Nathan Xu */ -@TestForIssue( jiraKey = "HHH-13889" ) +@JiraKey( value = "HHH-13889" ) public class CriteriaStringInlineLiteralTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SelectCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SelectCaseTest.java index a9deb796eb..1a0b9247b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SelectCaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SelectCaseTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.criteria; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeEach; @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; SelectCaseTest.Person.class } ) -@TestForIssue(jiraKey = "HHH-15482") +@JiraKey(value = "HHH-15482") public class SelectCaseTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryJoinTest.java index 4aae7286ac..d7b2937130 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubqueryJoinTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.query.criteria; import java.util.ArrayList; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; @@ -31,7 +31,7 @@ import jakarta.validation.constraints.NotNull; public class SubqueryJoinTest { @Test - @TestForIssue(jiraKey = "HHH-15260") + @JiraKey(value = "HHH-15260") public void subqueryJoinTest(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { @@ -54,7 +54,7 @@ public class SubqueryJoinTest { } @Test - @TestForIssue(jiraKey = "HHH-15260") + @JiraKey(value = "HHH-15260") public void subqueryJoinTest2(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { @@ -78,7 +78,7 @@ public class SubqueryJoinTest { } @Test - @TestForIssue(jiraKey = "HHH-15260") + @JiraKey(value = "HHH-15260") public void subqueryJoinTest3(EntityManagerFactoryScope scope) { scope.inEntityManager( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java index af10f3e55e..505fb70580 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java @@ -12,7 +12,7 @@ import jakarta.persistence.criteria.Order; import org.hibernate.query.sqm.tree.expression.SqmExpression; import org.hibernate.query.sqm.tree.select.SqmSortSpecification; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -24,7 +24,7 @@ import static org.mockito.Mockito.mock; /** * @author seregamorph */ -@TestForIssue(jiraKey = "HHH-13884") +@JiraKey(value = "HHH-13884") public class HHH13884Test { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/NullPrecedenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/NullPrecedenceTest.java index f8fb5d89ec..8dda06a136 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/NullPrecedenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/NullPrecedenceTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.query.criteria.HibernateCriteriaBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Christian Beikov */ -@TestForIssue(jiraKey = "HHH-14897") +@JiraKey(value = "HHH-14897") @Jpa( annotatedClasses = { NullPrecedenceTest.Foo.class } ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java index 30e08b6938..797cd33d53 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Assert; import org.junit.Test; @@ -81,7 +81,7 @@ public class SearchedCaseExpressionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-13167") + @JiraKey(value = "HHH-13167") public void testMissingElseClause() { doInHibernate( this::sessionFactory, session -> { Event event = new Event(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java index c9ead3b769..d05640e0fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java @@ -9,7 +9,7 @@ import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -18,7 +18,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; * @author Archie Cobbs * @author Nathan Xu */ -@TestForIssue( jiraKey = "HHH-11877" ) +@JiraKey( value = "HHH-11877" ) @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) public class HHH111877Test extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java index b7853c7c92..3c1314a666 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java @@ -13,7 +13,7 @@ import jakarta.persistence.criteria.Subquery; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -25,7 +25,7 @@ import static org.junit.Assert.assertThat; * @author Archie Cobbs * @author Nathan Xu */ -@TestForIssue( jiraKey = "HHH-13058" ) +@JiraKey( value = "HHH-13058" ) public class HHH13058Test extends BaseEntityManagerFunctionalTestCase { private Set validSites; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java index 961fd26dc1..c7d7748503 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java @@ -8,7 +8,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -26,7 +26,7 @@ public class HHH13908Test extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-13908" ) + @JiraKey( value = "HHH-13908" ) public void testTimeFunctionNotThrowException() { doInJPA( this::entityManagerFactory, entityManager -> { final CriteriaBuilder cb = entityManager.getCriteriaBuilder(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java index 4c44b6190c..9b8039afd1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java @@ -11,7 +11,7 @@ import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -20,7 +20,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; * @author Archie Cobbs * @author Nathan Xu */ -@TestForIssue( jiraKey = "HHH-14197" ) +@JiraKey( value = "HHH-14197" ) @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) public class HHH14197Test extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/HHH14916Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/HHH14916Test.java index e411e25192..7a4bf9620d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/HHH14916Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14916/HHH14916Test.java @@ -1,6 +1,6 @@ package org.hibernate.orm.test.query.criteria.internal.hhh14916; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -17,7 +17,7 @@ import jakarta.persistence.criteria.Root; import static org.junit.jupiter.api.Assertions.assertEquals; -@TestForIssue(jiraKey = "HHH-14916") +@JiraKey(value = "HHH-14916") @Jpa( annotatedClasses = { Author.class, Book.class, Chapter.class } ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java index aecc741da5..a40b5720f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java @@ -17,7 +17,7 @@ import java.util.Set; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -46,7 +46,7 @@ import jakarta.persistence.Version; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -@TestForIssue(jiraKey = "HHH-12076") +@JiraKey(value = "HHH-12076") @DomainModel( annotatedClasses = { AnnotationMappingJoinClassTest.Claim.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java index 3ae183ff5e..f9a5bff670 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.hhh12076; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestForIssue(jiraKey = "HHH-12076") +@JiraKey(value = "HHH-12076") @DomainModel( xmlMappings = { "org/hibernate/query/hhh12076/Claim.hbm.xml", diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java index b05bda7853..424a9a993c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.hhh12225; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -18,7 +18,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -@TestForIssue(jiraKey = "HHH-12225") +@JiraKey(value = "HHH-12225") @DomainModel( xmlMappings = { "org/hibernate/orm/test/query/hhh12225/Contract.hbm.xml", diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13670/HHH13670Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13670/HHH13670Test.java index 4ae717e609..860a8e9bab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13670/HHH13670Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13670/HHH13670Test.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.query.hhh13670; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -@TestForIssue(jiraKey = "HHH-13670") +@JiraKey(value = "HHH-13670") public class HHH13670Test extends BaseCoreFunctionalTestCase { @Before diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13712/HHH13712Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13712/HHH13712Test.java index 5736249e97..e911447a86 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13712/HHH13712Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh13712/HHH13712Test.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.hhh13712; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.BeforeAll; @@ -26,7 +26,7 @@ import jakarta.persistence.ManyToOne; import static org.junit.jupiter.api.Assertions.assertEquals; -@TestForIssue(jiraKey = "HHH-13712") +@JiraKey(value = "HHH-13712") @Jpa( annotatedClasses = { HHH13712Test.Super.class, HHH13712Test.SubObject.class, HHH13712Test.SomeOther.class } ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14112/HHH14112Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14112/HHH14112Test.java index a60e7f9269..3bb32b23e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14112/HHH14112Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14112/HHH14112Test.java @@ -9,7 +9,7 @@ import jakarta.persistence.InheritanceType; import org.hibernate.annotations.SQLRestriction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -19,7 +19,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; * @author Ganesh Tiwari * @author Nathan Xu */ -@TestForIssue(jiraKey = "HHH-14112") +@JiraKey(value = "HHH-14112") public class HHH14112Test extends BaseCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14116/HHH14116Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14116/HHH14116Test.java index dd78569de1..5a3b87e0d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14116/HHH14116Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14116/HHH14116Test.java @@ -12,7 +12,7 @@ import jakarta.persistence.ManyToMany; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -22,7 +22,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; * @author Christian Beikov * @author Nathan Xu */ -@TestForIssue( jiraKey = "HHH-14116" ) +@JiraKey( value = "HHH-14116" ) public class HHH14116Test extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14154/HHH14154Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14154/HHH14154Test.java index c3a856c639..afd27f04c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14154/HHH14154Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14154/HHH14154Test.java @@ -11,7 +11,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -22,7 +22,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; * @author Nathan Xu */ @RequiresDialect( H2Dialect.class ) -@TestForIssue( jiraKey = "HHH-14154" ) +@JiraKey( value = "HHH-14154" ) public class HHH14154Test extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14156/HHH14156Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14156/HHH14156Test.java index 45fcabf795..e169e3a2a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14156/HHH14156Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh14156/HHH14156Test.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.query.hhh14156; import java.io.Serializable; import java.util.Objects; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -16,7 +16,7 @@ import jakarta.persistence.Table; * @author Nathan Xu * @author Christian Beikov */ -@TestForIssue( jiraKey = "HHH-14156" ) +@JiraKey( value = "HHH-14156" ) public class HHH14156Test extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java index 63dcbe58b5..1880839634 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.OneToMany; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals; /** * @author bjoern.moritz */ -@TestForIssue(jiraKey = "HHH-9331") +@JiraKey(value = "HHH-9331") @RequiresDialect(H2Dialect.class) @DomainModel( annotatedClasses = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java index 8188d1d675..dba7d9b91c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java @@ -10,7 +10,7 @@ import java.util.List; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -83,7 +83,7 @@ public class CaseStatementTest { } @Test - @TestForIssue( jiraKey = "HHH-13095" ) + @JiraKey( value = "HHH-13095" ) public void testSearchedCaseStatementArithmeticExpression(SessionFactoryScope scope) { scope.inTransaction( (session) -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java index d78a695076..7eef146edf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertNull; public class CastNullSelectExpressionTest { @Test - @TestForIssue(jiraKey = "HHH-10757") + @JiraKey(value = "HHH-10757") public void testSelectCastNull(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -47,7 +47,7 @@ public class CastNullSelectExpressionTest { } @Test - @TestForIssue(jiraKey = "HHH-10757") + @JiraKey(value = "HHH-10757") public void testSelectNewCastNull(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -62,7 +62,7 @@ public class CastNullSelectExpressionTest { } @Test - @TestForIssue(jiraKey = "HHH-16564") + @JiraKey(value = "HHH-16564") public void testSelectNewNull(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -77,7 +77,7 @@ public class CastNullSelectExpressionTest { } @Test - @TestForIssue(jiraKey = "HHH-16564") + @JiraKey(value = "HHH-16564") public void testSelectNull(SessionFactoryScope scope) { scope.inTransaction( (session) -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java index 7a5d25c2b6..b35e3ebea5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Id; import jakarta.persistence.MapKeyColumn; import jakarta.persistence.OneToMany; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -67,7 +67,7 @@ public class CountExpressionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9182") + @JiraKey(value = "HHH-9182") public void testCountDistinctExpression() { doInHibernate( this::sessionFactory, session -> { List results = session.createQuery( @@ -88,7 +88,7 @@ public class CountExpressionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11042") + @JiraKey(value = "HHH-11042") public void testCountDistinctTuple() { doInHibernate( this::sessionFactory, session -> { List results = session.createQuery( @@ -109,7 +109,7 @@ public class CountExpressionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11042") + @JiraKey(value = "HHH-11042") public void testCountDistinctTupleSanity() { doInHibernate( this::sessionFactory, session -> { // A simple concatenation of tuple arguments would produce a distinct count of 1 in this case diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java index 9bf7313afc..6ab98faaf4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.query.hql; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.query.sqm.tree.select.SqmDynamicInstantiation; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -31,7 +31,7 @@ import java.lang.invoke.MethodHandles; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-16061") +@JiraKey( value = "HHH-16061") public class DynamicMapInstantiationTest { private Triggerable triggerable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java index 365379df74..40824c3cb1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java @@ -34,7 +34,7 @@ import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupJoin; import org.hibernate.sql.ast.tree.select.SelectStatement; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.Jira; import org.hibernate.testing.orm.junit.SessionFactory; @@ -115,7 +115,7 @@ public class EntityJoinTest { } @Test - @TestForIssue(jiraKey = "HHH-11337") + @JiraKey(value = "HHH-11337") @SkipForDialect(dialectClass = SybaseDialect.class) public void testLeftOuterEntityJoinsWithImplicitInnerJoinInSelectClause(SessionFactoryScope scope) { scope.inTransaction( @@ -142,7 +142,7 @@ public class EntityJoinTest { } @Test - @TestForIssue(jiraKey = "HHH-11340") + @JiraKey(value = "HHH-11340") public void testJoinOnEntityJoinNode(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -169,7 +169,7 @@ public class EntityJoinTest { } @Test - @TestForIssue(jiraKey = "HHH-11538") + @JiraKey(value = "HHH-11538") public void testNoImpliedJoinGeneratedForEqualityComparison(SessionFactoryScope scope) { final String qry = "select r.id, cust.name " + "from FinancialRecord r " + diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java index a5b9dfdb5b..23ae1510bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.MapsId; import jakarta.persistence.OneToOne; import jakarta.persistence.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -28,7 +28,7 @@ import static jakarta.persistence.CascadeType.ALL; /** * @author Moritz Becker */ -@TestForIssue(jiraKey = "HHH-13201") +@JiraKey(value = "HHH-13201") @Jpa( annotatedClasses = { FetchNonRootRelativeElementCollectionAndAssociationTest.ProductNaturalId.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java index 6d5f0647e9..84f9bb9c12 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.query.hql; import java.util.List; import java.util.Locale; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -23,7 +23,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; annotatedClasses = FunctionAndEnumsTest.TestEntity.class ) @SessionFactory -@TestForIssue( jiraKey = "HHH-15711") +@JiraKey( value = "HHH-15711") public class FunctionAndEnumsTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java index 51f22a6a53..9d17e322ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java @@ -24,7 +24,7 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.SybaseDialect; import org.hibernate.dialect.TiDBDialect; import org.hibernate.query.sqm.produce.function.FunctionArgumentException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.domain.StandardDomainModel; import org.hibernate.testing.orm.domain.gambit.EntityOfBasics; import org.hibernate.testing.orm.domain.gambit.EntityOfLists; @@ -115,7 +115,7 @@ public class FunctionTests { } @Test - @TestForIssue( jiraKey = "HHH-15711") + @JiraKey( value = "HHH-15711") public void testLowerUpperFunctionsWithEnums(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -128,7 +128,7 @@ public class FunctionTests { } @Test - @TestForIssue( jiraKey = "HHH-15711") + @JiraKey( value = "HHH-15711") public void testLowerUpperFunctionsWithConvertedEnums(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -141,7 +141,7 @@ public class FunctionTests { } @Test - @TestForIssue(jiraKey = "HHH-15711") + @JiraKey(value = "HHH-15711") public void testLowerFunctionsOrdinalEnumsShouldFail(SessionFactoryScope scope) { scope.inTransaction( session -> diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java index 8cd14f93e4..c151a78484 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.query.hql; import java.time.LocalDate; import jakarta.persistence.Tuple; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.domain.StandardDomainModel; import org.hibernate.testing.orm.domain.contacts.Contact; @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class GroupByTest { @Test - @TestForIssue( jiraKey = "HHH-1615") + @JiraKey( value = "HHH-1615") public void testGroupByEntity(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -44,7 +44,7 @@ public class GroupByTest { } @Test - @TestForIssue( jiraKey = "HHH-9301" ) + @JiraKey( value = "HHH-9301" ) public void testGroupByAliasedBasicPart(SessionFactoryScope scope) { final SQLStatementInspector sqlStatementInspector = scope.getCollectingStatementInspector(); sqlStatementInspector.clear(); @@ -65,7 +65,7 @@ public class GroupByTest { } @Test - @TestForIssue( jiraKey = "HHH-9301" ) + @JiraKey( value = "HHH-9301" ) public void testGroupByAliasedCompositePart(SessionFactoryScope scope) { final SQLStatementInspector sqlStatementInspector = scope.getCollectingStatementInspector(); sqlStatementInspector.clear(); @@ -90,7 +90,7 @@ public class GroupByTest { @Test - @TestForIssue( jiraKey = "HHH-9301" ) + @JiraKey( value = "HHH-9301" ) public void testGroupByMultipleAliases(SessionFactoryScope scope) { final SQLStatementInspector sqlStatementInspector = scope.getCollectingStatementInspector(); sqlStatementInspector.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java index fef6f270c7..73f8de9bd0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.dialect.SybaseASEDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -24,7 +24,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15766") +@JiraKey(value = "HHH-15766") @SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE does not support order by in subqueries") public class HqlUnionTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java index dda69ee21d..c1d0e83a38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.hql; import org.hibernate.community.dialect.DerbyDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -54,7 +54,7 @@ public class InsertSelectTests { } @Test - @TestForIssue( jiraKey = "HHH-15527") + @JiraKey( value = "HHH-15527") public void testInsertSelectGeneratedAssigned(SessionFactoryScope scope) { final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); scope.inTransaction( @@ -70,7 +70,7 @@ public class InsertSelectTests { } @Test - @TestForIssue( jiraKey = "HHH-15531") + @JiraKey( value = "HHH-15531") @SkipForDialect(dialectClass = DerbyDialect.class, reason = "Derby doesn't really support window functions, " + "but this requires the use of a dense_rank window function. We could emulate this, but don't think it's worth it") public void testInsertSelectDistinct(SessionFactoryScope scope) { @@ -86,7 +86,7 @@ public class InsertSelectTests { } @Test - @TestForIssue( jiraKey = "HHH-15531") + @JiraKey( value = "HHH-15531") @SkipForDialect(dialectClass = DerbyDialect.class, reason = "Derby doesn't really support window functions and " + "its attempt at a row_number function fails to deliver the desired semantics") public void testInsertSelectGroupBy(SessionFactoryScope scope) { @@ -102,7 +102,7 @@ public class InsertSelectTests { } @Test - @TestForIssue( jiraKey = "HHH-16786") + @JiraKey( value = "HHH-16786") public void testInsertSelectParameterInference(SessionFactoryScope scope) { final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java index b19466cec0..48ce60d8dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; /** * @author bjoern.moritz */ -@TestForIssue(jiraKey = "HHH-5274") +@JiraKey(value = "HHH-5274") @DomainModel( annotatedClasses = { InsertWithSubSelectTest.A.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java index 7634d7de06..aca6c41c0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.ElementCollection; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Nathan Xu */ -@TestForIssue(jiraKey = "HHH-6686") +@JiraKey(value = "HHH-6686") @ServiceRegistry @DomainModel( annotatedClasses = IsEmptyPredicateTest.Person.class ) @SessionFactory diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java index 01d5505728..2c4570eb1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Christian Beikov * @author Nathan Xu */ -@TestForIssue( jiraKey = "HHH-14201" ) +@JiraKey( value = "HHH-14201" ) @DomainModel( annotatedClasses = { JoinOrderTest.EntityA.class, JoinOrderTest.EntityB.class, JoinOrderTest.EntityC.class } ) @SessionFactory( useCollectingStatementInspector = true ) public class JoinOrderTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java index 549ad4ec1a..db2259b25b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java @@ -14,7 +14,7 @@ import java.util.Map; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.domain.StandardDomainModel; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ExpectedException; @@ -40,7 +40,7 @@ import static org.junit.Assert.assertThat; @SessionFactory public class LegacyParameterTests { @Test - @TestForIssue( jiraKey = "HHH-9154" ) + @JiraKey( value = "HHH-9154" ) public void testClassAsParameter(SessionFactoryScope scope) { scope.inTransaction( (s) -> { @@ -54,7 +54,7 @@ public class LegacyParameterTests { @Test - @TestForIssue(jiraKey = "HHH-7705") + @JiraKey(value = "HHH-7705") public void testSetPropertiesMapWithNullValues(SessionFactoryScope scope) { scope.inTransaction( @@ -95,7 +95,7 @@ public class LegacyParameterTests { } @Test - @TestForIssue(jiraKey = "HHH-10796") + @JiraKey(value = "HHH-10796") public void testSetPropertiesMapNotContainingAllTheParameters(SessionFactoryScope scope) { scope.inTransaction( (s) -> { @@ -115,7 +115,7 @@ public class LegacyParameterTests { } @Test - @TestForIssue( jiraKey = "HHH-9154" ) + @JiraKey( value = "HHH-9154" ) public void testObjectAsParameter(SessionFactoryScope scope) { scope.inTransaction( (s) -> { @@ -128,7 +128,7 @@ public class LegacyParameterTests { } @Test - @TestForIssue(jiraKey = "HHH-13310") + @JiraKey(value = "HHH-13310") public void testGetParameterListValue(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -142,7 +142,7 @@ public class LegacyParameterTests { } @Test - @TestForIssue(jiraKey = "HHH-13310") + @JiraKey(value = "HHH-13310") public void testGetParameterListValueAfterParameterExpansion(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -158,7 +158,7 @@ public class LegacyParameterTests { @Test @ExpectedException( IllegalStateException.class ) - @TestForIssue(jiraKey = "HHH-13310") + @JiraKey(value = "HHH-13310") public void testGetNotBoundParameterListValue(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -169,7 +169,7 @@ public class LegacyParameterTests { } @Test - @TestForIssue(jiraKey = "HHH-13310") + @JiraKey(value = "HHH-13310") public void testGetPositionalParameterListValue(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -185,7 +185,7 @@ public class LegacyParameterTests { } @Test - @TestForIssue(jiraKey = "HHH-13310") + @JiraKey(value = "HHH-13310") public void testGetPositionalParameterValue(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -201,7 +201,7 @@ public class LegacyParameterTests { } @Test - @TestForIssue(jiraKey = "HHH-13310") + @JiraKey(value = "HHH-13310") public void testGetParameterByPositionListValueAfterParameterExpansion(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -217,7 +217,7 @@ public class LegacyParameterTests { @Test @ExpectedException( IllegalStateException.class ) - @TestForIssue(jiraKey = "HHH-13310") + @JiraKey(value = "HHH-13310") public void testGetPositionalNotBoundParameterListValue(SessionFactoryScope scope) { scope.inTransaction( (session) -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeParameterTest.java index 463b03910c..80237875b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeParameterTest.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.query.hql; import org.hibernate.query.SemanticException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -55,7 +55,7 @@ public class LikeEscapeParameterTest { } @Test - @TestForIssue(jiraKey = "HHH-15745") + @JiraKey(value = "HHH-15745") public void testStringLiteralInSubQuery(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java index 86857eee4e..e443137f3d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Date; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.domain.StandardDomainModel; import org.hibernate.testing.orm.domain.gambit.EntityOfBasics; import org.hibernate.testing.orm.junit.DialectFeatureChecks; @@ -138,7 +138,7 @@ public class OrderedSetAggregateTest { } @Test - @TestForIssue( jiraKey = "HHH-15360") + @JiraKey( value = "HHH-15360") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsStringAggregation.class) public void testListaggWithNullsClause(SessionFactoryScope scope) { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java index aef138afe4..110ebe09a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java @@ -31,7 +31,7 @@ import org.hibernate.query.spi.QueryParameterBindings; import org.hibernate.query.sqm.tree.expression.SqmParameter; import org.hibernate.query.sqm.tree.select.SqmSelectStatement; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.ExpectedException; import org.hibernate.testing.orm.junit.ExpectedExceptionExtension; import org.junit.jupiter.api.Assertions; @@ -182,7 +182,7 @@ public class ParameterTests extends BaseSqmUnitTest { } @Test - @TestForIssue( jiraKey = "HHH-15341") + @JiraKey( value = "HHH-15341") public void testTransientParamValue() { inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java index 972c943e16..2dafeb2e25 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java @@ -31,7 +31,7 @@ import org.hibernate.type.descriptor.jdbc.BasicBinder; import org.hibernate.type.descriptor.jdbc.BasicExtractor; import org.hibernate.type.descriptor.jdbc.JdbcType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-12292") +@JiraKey( value = "HHH-12292") @RequiresDialect(H2Dialect.class) @SkipForDialect(dialectClass = H2Dialect.class, majorVersion = 2, reason = "Array support was changed to now be typed") @Jpa( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java index acae336350..f82603a506 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue( jiraKey = "HHH-11397") +@JiraKey( value = "HHH-11397") @DomainModel( annotatedClasses = QueryParametersValidationTest.TestEntity.class ) @SessionFactory( exportSchema = false ) public class QueryParametersValidationTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java index ea60d51536..5a5d471d3c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java @@ -19,7 +19,7 @@ import org.hibernate.query.Query; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.hamcrest.CoreMatchers.is; @@ -71,7 +71,7 @@ public class ScrollableTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10860") + @JiraKey(value = "HHH-10860") public void testScrollableResults() { final List params = new ArrayList<>(); params.add( 1L ); @@ -97,7 +97,7 @@ public class ScrollableTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10860") + @JiraKey(value = "HHH-10860") public void testScrollableResults2() { final List params = new ArrayList<>(); params.add( 1L ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java index c7b551d57a..9a7a92052f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Table; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -27,7 +27,7 @@ import org.junit.Test; * * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-10024" ) +@JiraKey( value = "HHH-10024" ) public class SizeAttributeReferenceTest extends BaseNonConfigCoreFunctionalTestCase { @Test public void controlGroup() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java index baf7991fdb..fb5a304e1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java @@ -32,7 +32,7 @@ package org.hibernate.orm.test.query.hql; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -60,7 +60,7 @@ import static org.junit.Assert.assertTrue; public class ToOneFetchAndJoinTest { @Test - @TestForIssue( jiraKey = "HHH-9637") + @JiraKey( value = "HHH-9637") public void testFetchJoinsWithImplicitJoinInRestriction(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -79,7 +79,7 @@ public class ToOneFetchAndJoinTest { } @Test - @TestForIssue( jiraKey = "HHH-9637") + @JiraKey( value = "HHH-9637") public void testExplicitJoinBeforeFetchJoins(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -99,7 +99,7 @@ public class ToOneFetchAndJoinTest { } @Test - @TestForIssue( jiraKey = "HHH-9637") + @JiraKey( value = "HHH-9637") public void testExplicitJoinBetweenFetchJoins(SessionFactoryScope scope) { scope.inTransaction( (session) -> { @@ -119,7 +119,7 @@ public class ToOneFetchAndJoinTest { } @Test - @TestForIssue( jiraKey = "HHH-9637") + @JiraKey( value = "HHH-9637") public void testExplicitJoinAfterFetchJoins(SessionFactoryScope scope) { scope.inTransaction( (session) -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java index fa646a5016..51cf75b90e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.hql; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -44,7 +44,7 @@ public class WithClauseJoinRewriteTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11230") + @JiraKey(value = "HHH-11230") public void testInheritanceReAliasing() { Session s = openSession(); Transaction tx = s.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/joinorder/JoinOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/joinorder/JoinOrderTest.java index d5a9f63507..05ff21f6b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/joinorder/JoinOrderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/joinorder/JoinOrderTest.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.query.hql.joinorder; import jakarta.persistence.*; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; @SessionFactory @DomainModel(annotatedClasses = {JoinOrderTest.Task.class, JoinOrderTest.Location.class, JoinOrderTest.TaskLocation.class, JoinOrderTest.Vineyard.class, JoinOrderTest.TaskEventLog.class}) -@TestForIssue(jiraKey="HHH-16522") +@JiraKey(value="HHH-16522") public class JoinOrderTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java index bb5f4d91e6..d62dba5b9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java @@ -15,13 +15,13 @@ import org.hibernate.resource.transaction.spi.TransactionStatus; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10953") +@JiraKey(value = "HHH-10953") public class UpdateEntitiesWithPackageNamesStartingWithKeywordsTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java index 603dd0e56e..fdfe4520d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Embedded; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-14251") +@JiraKey(value = "HHH-14251") @DomainModel( annotatedClasses = UpdateEntityWithEmbeddedTest.Company.class ) @SessionFactory public class UpdateEntityWithEmbeddedTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java index d521fcad72..ff84cd3f49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.hibernate.dialect.OracleDialect; import org.hibernate.query.SemanticException; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.domain.StandardDomainModel; import org.hibernate.testing.orm.domain.gambit.EntityOfLists; import org.hibernate.testing.orm.domain.gambit.EntityWithManyToOneSelfReference; @@ -71,7 +71,7 @@ public class SetOperationTest { } @Test - @TestForIssue( jiraKey = "HHH-14704") + @JiraKey( value = "HHH-14704") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class) public void testUnionAllWithManyToOne(SessionFactoryScope scope) { scope.inSession( @@ -88,7 +88,7 @@ public class SetOperationTest { } @Test - @TestForIssue( jiraKey = "HHH-14704") + @JiraKey( value = "HHH-14704") @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnion.class) public void testUnionAllWithManyToOneFetch(SessionFactoryScope scope) { scope.inSession( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java index a737717a0e..15d5d49e85 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java @@ -19,7 +19,7 @@ import org.hibernate.Hibernate; import org.hibernate.annotations.Imported; import org.hibernate.community.dialect.DerbyDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -@TestForIssue( jiraKey = "HHH-13619" ) +@JiraKey( value = "HHH-13619" ) @DomainModel( annotatedClasses = { ManyToManySizeTest.Company.class, ManyToManySizeTest.Customer.class, ManyToManySizeTest.CompanyDto.class } ) @SessionFactory public class ManyToManySizeTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java index 6e15e13c7d..2ddc723f88 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java @@ -21,7 +21,7 @@ import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.FailureExpected; @@ -37,7 +37,7 @@ import static org.hibernate.testing.jdbc.SQLStatementInspector.extractFromSessio import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@TestForIssue(jiraKey = "HHH-13944") +@JiraKey(value = "HHH-13944") //@ServiceRegistry( // settings = @Setting( name = AvailableSettings.STATEMENT_INSPECTOR, value = "org.hibernate.testing.jdbc.SQLStatementInspector" ) //) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java index 6b8e8deabb..462dea3519 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.community.dialect.DerbyDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -@TestForIssue( jiraKey = "HHH-13619" ) +@JiraKey( value = "HHH-13619" ) @DomainModel( annotatedClasses = { OneToManySizeTest.Company.class, OneToManySizeTest.Customer.class } ) @SessionFactory public class OneToManySizeTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java index 12c24486fa..d026a1ef7f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java @@ -11,7 +11,7 @@ import java.util.Locale; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -@TestForIssue(jiraKey = "HHH-13944") +@JiraKey(value = "HHH-13944") @DomainModel( annotatedClasses = { Skill.class, Teacher.class, Student.class } ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinTest.java index d79ea515a1..e3e20b6b4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/HqlTreatJoinTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.query.spi.QueryImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15839") +@JiraKey(value = "HHH-15839") public class HqlTreatJoinTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java index 4e50bf90bf..8d23c4ea04 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.query.resultmapping; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -35,7 +35,7 @@ import static org.hamcrest.MatcherAssert.assertThat; annotatedClasses = NamedNativeQueryWithCountColumnTest.Sample.class, properties = @Setting(name = AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, value = "true") ) -@TestForIssue(jiraKey = "HHH-15070") +@JiraKey(value = "HHH-15070") class NamedNativeQueryWithCountColumnTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java index 4982be575e..230b297c34 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.sql; import java.util.List; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -26,7 +26,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; annotatedClasses = EmbeddableAndNativeQueryTest.Person.class ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15658") +@JiraKey(value = "HHH-15658") public class EmbeddableAndNativeQueryTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java index 898a8cae36..0527c13b7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java @@ -10,7 +10,7 @@ import java.util.Collections; import org.hibernate.graph.spi.RootGraphImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -28,7 +28,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; annotatedClasses = EmbeddableLazyFetchTest.Person.class ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15778") +@JiraKey(value = "HHH-15778") public class EmbeddableLazyFetchTest { @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java index 58b408f0c4..231ab55326 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java @@ -10,7 +10,7 @@ import java.sql.Statement; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Vlad Mihalcea */ @RequiresDialect(MySQLDialect.class) -@TestForIssue( jiraKey = "HHH-1237") +@JiraKey( value = "HHH-1237") @SessionFactory @DomainModel public class MySQLSetVariableEscapeColonTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/SortSpecificationReversalTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/SortSpecificationReversalTests.java index 4b3d6e4dea..278dd9225e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/SortSpecificationReversalTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/SortSpecificationReversalTests.java @@ -10,7 +10,7 @@ import org.hibernate.query.criteria.JpaOrder; import org.hibernate.query.sqm.tree.expression.SqmExpression; import org.hibernate.query.sqm.tree.select.SqmSortSpecification; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static jakarta.persistence.criteria.Nulls.FIRST; @@ -23,7 +23,7 @@ import static org.mockito.Mockito.mock; /** * @author seregamorph */ -@TestForIssue(jiraKey = "HHH-13884") +@JiraKey(value = "HHH-13884") public class SortSpecificationReversalTests { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/OrderingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/OrderingTests.java index 3b145ba7b0..8151202be5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/OrderingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/OrderingTests.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.query.sqm.exec; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.domain.StandardDomainModel; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -30,7 +30,7 @@ public class OrderingTests { } @Test - @TestForIssue( jiraKey = "HHH-1356" ) + @JiraKey( value = "HHH-1356" ) public void testFunctionBasedOrdering(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -41,7 +41,7 @@ public class OrderingTests { } @Test - @TestForIssue( jiraKey = "HHH-11688" ) + @JiraKey( value = "HHH-11688" ) public void testSelectAliasOrdering(SessionFactoryScope scope) { scope.inTransaction( session -> { @@ -52,7 +52,7 @@ public class OrderingTests { } @Test - @TestForIssue( jiraKey = "HHH-11688" ) + @JiraKey( value = "HHH-11688" ) public void testSelectPositionOrdering(SessionFactoryScope scope) { scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java index 25b70559a3..89525ccadd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.ManyToOne; import org.junit.jupiter.api.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -32,7 +32,7 @@ import org.hibernate.testing.orm.junit.SessionFactoryScope; SubQueryImplicitJoinReferenceTest.TheEntity.class, SubQueryImplicitJoinReferenceTest.RevisionInfoEntity.class }) @SessionFactory -@TestForIssue(jiraKey = "HHH-14482") +@JiraKey(value = "HHH-14482") public class SubQueryImplicitJoinReferenceTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/EmptyEntityCollectionParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/EmptyEntityCollectionParameterTests.java index fd354570fb..10cea7ccbf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/EmptyEntityCollectionParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/EmptyEntityCollectionParameterTests.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.sqm.param; import java.util.Collections; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -26,7 +26,7 @@ import jakarta.persistence.OneToOne; EmptyEntityCollectionParameterTests.ContentEntry.class }) @SessionFactory -@TestForIssue(jiraKey = "HHH-15232") +@JiraKey(value = "HHH-15232") class EmptyEntityCollectionParameterTests { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java index 85dcedd24a..5155c54a03 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java @@ -17,7 +17,7 @@ import org.hibernate.annotations.NaturalId; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.HibernateHints; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12430") +@JiraKey(value = "HHH-12430") @Jpa( annotatedClasses = { QueryCacheJoinFetchTest.Person.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java index a091fc049b..4e21b1b636 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.OneToMany; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Vlad Mihalceca */ -@TestForIssue( jiraKey = "HHH-12107" ) +@JiraKey( value = "HHH-12107" ) @DomainModel( annotatedClasses = { StructuredQueryCacheTest.OneToManyWithEmbeddedId.class, @@ -66,7 +66,7 @@ public class StructuredQueryCacheTest { } @Test - @TestForIssue( jiraKey = "HHH-12107" ) + @JiraKey( value = "HHH-12107" ) public void testEmbeddedIdInOneToMany(SessionFactoryScope scope) { OneToManyWithEmbeddedIdKey key = new OneToManyWithEmbeddedIdKey( 1234 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java index 91c0ee258b..62c77436d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java @@ -12,7 +12,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.OracleDialect; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -139,7 +139,7 @@ public class OracleQueryHintTest { } @Test - @TestForIssue(jiraKey = "HHH-12362") + @JiraKey(value = "HHH-12362") public void testQueryHintAndComment(SessionFactoryScope scope) { final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); statementInspector.clear(); @@ -163,7 +163,7 @@ public class OracleQueryHintTest { } @Test - @TestForIssue(jiraKey = "HHH-13608") + @JiraKey(value = "HHH-13608") public void testQueryHintCaseInsensitive(SessionFactoryScope scope) { final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); statementInspector.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java index cbeffc4df1..eaae3e0823 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java @@ -24,7 +24,7 @@ import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Selectable; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Assert; @@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class ColumnDefinitionQuotingTest { @Test - @TestForIssue( jiraKey = "HHH-9491" ) + @JiraKey( value = "HHH-9491" ) public void testExplicitQuoting() { withStandardServiceRegistry( false, @@ -66,7 +66,7 @@ public class ColumnDefinitionQuotingTest { } @Test - @TestForIssue( jiraKey = "HHH-9491" ) + @JiraKey( value = "HHH-9491" ) public void testExplicitQuotingSkippingColumnDef() { withStandardServiceRegistry( false, @@ -104,7 +104,7 @@ public class ColumnDefinitionQuotingTest { } @Test - @TestForIssue( jiraKey = "HHH-9491" ) + @JiraKey( value = "HHH-9491" ) public void testGlobalQuotingNotSkippingColumnDef() { withStandardServiceRegistry( true, @@ -131,7 +131,7 @@ public class ColumnDefinitionQuotingTest { } @Test - @TestForIssue( jiraKey = "HHH-9491" ) + @JiraKey( value = "HHH-9491" ) public void testGlobalQuotingSkippingColumnDef() { withStandardServiceRegistry( true, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java index 6948264f25..23db99b877 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java @@ -15,7 +15,7 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; import org.hibernate.mapping.UniqueKey; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -48,7 +48,7 @@ import static org.junit.jupiter.api.Assertions.fail; public class QuoteGlobalTest { @Test - @TestForIssue(jiraKey = "HHH-7890") + @JiraKey(value = "HHH-7890") public void testQuotedUniqueConstraint(SessionFactoryScope scope) { Iterator itr = scope.getMetadataImplementor().getEntityBinding(Person.class.getName()) .getTable().getUniqueKeys().values().iterator(); @@ -96,7 +96,7 @@ public class QuoteGlobalTest { } @Test - @TestForIssue(jiraKey = "HHH-8520") + @JiraKey(value = "HHH-8520") public void testHbmQuoting(SessionFactoryScope scope) { final MetadataImplementor metadataImplementor = scope.getMetadataImplementor(); doTestHbmQuoting( DataPoint.class, metadataImplementor ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java index 6dcd9bdf78..207edcd1bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.Table; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -56,7 +56,7 @@ public class QuoteTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8464") + @JiraKey(value = "HHH-8464") public void testDoubleQuoteJoinColumn() { Session s = openSession(); s.getTransaction().begin(); @@ -81,7 +81,7 @@ public class QuoteTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-2988") + @JiraKey(value = "HHH-2988") public void testUnionSubclassEntityQuoting() { Session s = openSession(); s.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java index 83e9b84a6d..628f2d1b7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java @@ -27,7 +27,7 @@ import org.hibernate.tool.schema.internal.SchemaDropperImpl; import org.hibernate.tool.schema.internal.exec.GenerationTarget; import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.AfterEach; @@ -59,7 +59,7 @@ public class TableGeneratorQuotingTest { } @Test - @TestForIssue(jiraKey = "HHH-7927") + @JiraKey(value = "HHH-7927") public void testTableGeneratorQuoting() { final Metadata metadata = new MetadataSources( serviceRegistry ).addAnnotatedClass( TestEntity.class ) .buildMetadata(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java index 6f06bf3e96..24de7fd7e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.reattachment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -86,7 +86,7 @@ public class ProxyReattachmentTest { @Test - @TestForIssue(jiraKey = "HHH-8374") + @JiraKey(value = "HHH-8374") public void testRemoveAndReattachProxyEntity(SessionFactoryScope scope) { Parent p = new Parent( "foo" ); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java index 9392c61822..8e4fde698b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java @@ -6,7 +6,7 @@ import org.hibernate.annotations.EmbeddableInstantiator; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.spi.ValueAccess; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -25,7 +25,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16457") +@JiraKey(value = "HHH-16457") public class EmbeddableInstantiatorTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java index debb59dc2a..6829a6b368 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.refresh; import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.jpa.refresh.TestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11188") +@JiraKey(value = "HHH-11188") @DomainModel( annotatedClasses = TestEntity.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java index 98b61bfb5c..e5264d4d29 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.resource.transaction.jdbc; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-13076") +@JiraKey(value = "HHH-13076") public class AlreadyStartedTransactionTest extends BaseNonConfigCoreFunctionalTestCase { @Test(expected = IllegalStateException.class) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java index f8a47231f5..554306e199 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java @@ -14,7 +14,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Before; @@ -23,7 +23,7 @@ import org.junit.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-13076") +@JiraKey(value = "HHH-13076") public class JpaComplianceAlreadyStartedTransactionTest extends BaseNonConfigCoreFunctionalTestCase { private TransactionManager tm; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java index 3e2e18d579..ba27fd9040 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java @@ -27,7 +27,7 @@ import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.Assert; import org.junit.Test; @@ -35,7 +35,7 @@ import org.junit.Test; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; -@TestForIssue(jiraKey = "HHH-9876") +@JiraKey(value = "HHH-9876") @SuppressWarnings({"rawtypes", "unchecked"}) @RequiresDialectFeature( value = {DialectChecks.SupportSchemaCreation.class}) public class SchemaFilterTest extends BaseUnitTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java index a6929bff24..fc0289419f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java @@ -33,7 +33,7 @@ import org.hibernate.tool.schema.spi.SchemaFilter; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.After; import org.junit.Assert; @@ -46,7 +46,7 @@ import org.hamcrest.Description; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10937") +@JiraKey(value = "HHH-10937") @RequiresDialect(H2Dialect.class) public class SequenceFilterTest extends BaseUnitTestCase { private StandardServiceRegistryImpl serviceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java index 3564381eba..cc94508c2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java @@ -35,7 +35,7 @@ import org.junit.After; import org.junit.Assume; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; @@ -46,7 +46,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10298") +@JiraKey(value = "HHH-10298") public class TestExtraPhysicalTableTypes { private StandardServiceRegistry ssr; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java index 5571ea0433..9e69bf6ca5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.schemaupdate; import org.hibernate.dialect.Dialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.hibernate.testing.orm.junit.DialectContext; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12939") +@JiraKey(value = "HHH-12939") public abstract class AbstractAlterTableQuoteSchemaTest extends BaseSessionFactoryFunctionalTest { private final Dialect dialect = DialectContext.getDialect(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java index 20abe38c87..00fb601d7b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java @@ -28,7 +28,7 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Guillaume Smet */ -@TestForIssue(jiraKey = "HHH-12939") +@JiraKey(value = "HHH-12939") @RequiresDialect(value = H2Dialect.class) @RequiresDialect(value = PostgreSQLDialect.class) @RequiresDialect(value = SQLServerDialect.class, majorVersion = 11) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java index 1c61e4f88f..1f3e9289ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java @@ -27,7 +27,7 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.RequiresDialectFeature; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -44,7 +44,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Guillaume Smet */ -@TestForIssue(jiraKey = "HHH-12939") +@JiraKey(value = "HHH-12939") @RequiresDialect(value = H2Dialect.class) @RequiresDialect(value = PostgreSQLDialect.class) @RequiresDialect(value = SQLServerDialect.class, majorVersion = 11) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java index 4d73dbadbc..e15f6a2ac5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java @@ -24,7 +24,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.hbm2ddl.SchemaValidator; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProviderImpl; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -39,7 +39,7 @@ import static org.hamcrest.core.Is.is; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10443") +@JiraKey(value = "HHH-10443") @RequiresDialect( H2Dialect.class ) public class ConnectionsReleaseTest extends BaseUnitTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java index f12f45e497..2f08a877fc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java @@ -31,7 +31,7 @@ import org.hibernate.mapping.Table; import org.hibernate.mapping.UniqueKey; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; public class ExportIdentifierTest extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-12935" ) + @JiraKey( value = "HHH-12935" ) public void testUniqueExportableIdentifier() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); final MetadataBuilderImpl.MetadataBuildingOptionsImpl options = new MetadataBuilderImpl.MetadataBuildingOptionsImpl( ssr ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/H2DialectDataBaseToUpperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/H2DialectDataBaseToUpperTest.java index acd1e41de6..46bd8539dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/H2DialectDataBaseToUpperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/H2DialectDataBaseToUpperTest.java @@ -12,14 +12,14 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; import org.junit.Test; @RequiresDialect(H2Dialect.class) -@TestForIssue(jiraKey = "HHH-13597") +@JiraKey(value = "HHH-13597") public class H2DialectDataBaseToUpperTest extends BaseUnitTestCase { private StandardServiceRegistry ssr; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java index 0e4fd37b32..ae21901034 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java @@ -31,7 +31,7 @@ import org.junit.After; import org.junit.Test; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.hamcrest.core.Is.is; @@ -97,7 +97,7 @@ public class HANASchemaMigrationTargetScriptCreationTest extends BaseCoreFunctio } @Test - @TestForIssue(jiraKey = "HHH-12302") + @JiraKey(value = "HHH-12302") public void testTargetScriptIsCreatedStringTypeDefault() throws Exception { this.rebuildSessionFactory(); String fileContent = new String( Files.readAllBytes( this.output.toPath() ) ); @@ -110,7 +110,7 @@ public class HANASchemaMigrationTargetScriptCreationTest extends BaseCoreFunctio } @Test - @TestForIssue(jiraKey = "HHH-12302") + @JiraKey(value = "HHH-12302") public void testTargetScriptIsCreatedStringTypeNVarchar() throws Exception { this.rebuildSessionFactory( config -> { config.setProperty( "hibernate.dialect.hana.use_unicode_string_types", "true" ); @@ -125,7 +125,7 @@ public class HANASchemaMigrationTargetScriptCreationTest extends BaseCoreFunctio } @Test - @TestForIssue(jiraKey = "HHH-12302") + @JiraKey(value = "HHH-12302") public void testTargetScriptIsCreatedStringTypeVarchar() throws Exception { this.rebuildSessionFactory( config -> { config.setProperty( "hibernate.dialect.hana.use_unicode_string_types", "false" ); @@ -140,7 +140,7 @@ public class HANASchemaMigrationTargetScriptCreationTest extends BaseCoreFunctio } @Test - @TestForIssue(jiraKey = "HHH-12132") + @JiraKey(value = "HHH-12132") public void testTargetScriptIsCreatedBooleanTypeDefault() throws Exception { this.rebuildSessionFactory(); String fileContent = new String( Files.readAllBytes( this.output.toPath() ) ); @@ -153,7 +153,7 @@ public class HANASchemaMigrationTargetScriptCreationTest extends BaseCoreFunctio } @Test - @TestForIssue(jiraKey = "HHH-12132") + @JiraKey(value = "HHH-12132") public void testTargetScriptIsCreatedBooleanTypeLegacy() throws Exception { this.rebuildSessionFactory( config -> { config.setProperty( "hibernate.dialect.hana.use_legacy_boolean_type", "true" ); @@ -168,7 +168,7 @@ public class HANASchemaMigrationTargetScriptCreationTest extends BaseCoreFunctio } @Test - @TestForIssue(jiraKey = "HHH-12132") + @JiraKey(value = "HHH-12132") public void testTargetScriptIsCreatedBooleanType() throws Exception { this.rebuildSessionFactory( config -> { config.setProperty( "hibernate.dialect.hana.use_legacy_boolean_type", "false" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java index 8cf7756dac..292ae7e3a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java @@ -16,7 +16,7 @@ import org.hibernate.internal.CoreMessageLogger; import org.hibernate.jpa.boot.spi.Bootstrap; import org.hibernate.testing.orm.jpa.PersistenceUnitDescriptorAdapter; import org.hibernate.orm.test.jpa.mapping.ColumnWithExplicitReferenceToPrimaryTableTest.AnEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -33,7 +33,7 @@ public class Hbm2ddlCreateOnlyTest { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - @TestForIssue(jiraKey = "HHH-12955") + @JiraKey(value = "HHH-12955") public void testColumnAnnotationWithExplicitReferenceToPrimaryTable() { final PersistenceUnitDescriptorAdapter pu = new PersistenceUnitDescriptorAdapter() { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java index 7a8be97394..ea0d8596ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java @@ -22,7 +22,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.tool.schema.internal.SchemaCreatorImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -35,7 +35,7 @@ import static org.junit.Assert.fail; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-9865") +@JiraKey(value = "HHH-9865") public class ImplicitCompositeKeyJoinTest { private static final Logger LOGGER = Logger.getLogger( ImplicitCompositeKeyJoinTest.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java index 81a84f0f11..116e543805 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java @@ -20,7 +20,7 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -141,7 +141,7 @@ public class MigrationTest extends BaseUnitTestCase { // * generate any exceptions. // */ // @Test -// @TestForIssue( jiraKey = "HHH-8162" ) +// @JiraKey( value = "HHH-8162" ) // public void testConstraintUpdate() { // doConstraintUpdate(UniqueConstraintSchemaUpdateStrategy.DROP_RECREATE_QUIETLY); // doConstraintUpdate(UniqueConstraintSchemaUpdateStrategy.RECREATE_QUIETLY); @@ -183,7 +183,7 @@ public class MigrationTest extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-9713" ) + @JiraKey( value = "HHH-9713" ) public void testIndexCreationViaSchemaUpdate() { MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( serviceRegistry ) .addAnnotatedClass( EntityWithIndex.class ) @@ -211,7 +211,7 @@ public class MigrationTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9550" ) + @JiraKey( value = "HHH-9550" ) public void testSameTableNameDifferentExplicitSchemas() { MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( serviceRegistry ) .addAnnotatedClass( CustomerInfo.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java index 92abcb056b..15e0e9f8d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java @@ -40,7 +40,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.CustomRunner; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -51,7 +51,7 @@ import org.junit.runner.RunWith; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-9849") +@JiraKey(value = "HHH-9849") @RunWith(CustomRunner.class) @RequiresDialect(MySQLDialect.class) public class MixedFieldPropertyAnnotationTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java index 0fa67151f2..ea7fe00470 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java @@ -37,7 +37,7 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -64,7 +64,7 @@ public class PostgreSQLMultipleSchemaSequenceTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-5538" ) + @JiraKey( value = "HHH-5538" ) public void test() { StandardServiceRegistry ssr1 = ServiceRegistryUtil.serviceRegistry(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java index 396fa5b8ef..be9b423c21 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java @@ -26,7 +26,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.Skip; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -61,7 +61,7 @@ public class QuotedTableNameSchemaUpdateTest extends BaseUnitTestCase { @Test - @TestForIssue(jiraKey = "HHH-10820") + @JiraKey(value = "HHH-10820") @Skip(condition = Skip.OperatingSystem.Windows.class, message = "On Windows, MySQL is case insensitive!") public void testSchemaUpdateWithQuotedTableName() throws Exception { final MetadataSources metadataSources = new MetadataSources( ssr ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java index 10b5d5a770..a869589ba2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java @@ -16,7 +16,7 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -26,7 +26,7 @@ import org.junit.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10197") +@JiraKey(value = "HHH-10197") public class QuotedTableNameWithForeignKeysSchemaUpdateTest extends BaseUnitTestCase { @Before diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java index 91f45f40bf..194c1b077e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java @@ -27,7 +27,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -40,7 +40,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.StringContains.containsString; -@TestForIssue(jiraKey = "HHH-11817") +@JiraKey(value = "HHH-11817") @RequiresDialect(H2Dialect.class) @BaseUnitTest public class SchemaCreationToOutputScriptTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java index 183f889f30..76a3ca7082 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java @@ -38,13 +38,13 @@ import org.junit.Test; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10605") +@JiraKey(value = "HHH-10605") @RequiresDialect(value = HSQLDialect.class) public class SchemaDropTest extends BaseUnitTestCase implements ExecutionOptions, ExceptionHandler { protected ServiceRegistry serviceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java index b5267e27d7..f158f0d6b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java @@ -27,7 +27,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -40,7 +40,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -@TestForIssue(jiraKey = "HHH-11817") +@JiraKey(value = "HHH-11817") @RequiresDialect(H2Dialect.class) @BaseUnitTest public class SchemaDropToOutputScriptTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java index ed1922ccbf..ab1bf0176c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java @@ -17,7 +17,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -36,7 +36,7 @@ import static org.hamcrest.core.Is.is; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-14835") +@JiraKey(value = "HHH-14835") @BaseUnitTest @RequiresDialect(value = SQLServerDialect.class, majorVersion = 12) public class SchemaExportSqlServerWithSequenceDefaultSchemaCatalog { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java index a224e2e502..6010e847e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java @@ -23,7 +23,7 @@ import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.After; import org.junit.Before; @@ -146,7 +146,7 @@ public class SchemaExportTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10678") + @JiraKey(value = "HHH-10678") @RequiresDialectFeature( value = DialectChecks.SupportSchemaCreation.class) public void testHibernateMappingSchemaPropertyIsNotIgnored() throws Exception { File output = File.createTempFile( "update_script", ".sql" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java index 8a3055fbd5..f199d418fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java @@ -42,7 +42,7 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.CustomRunner; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -56,7 +56,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-9866") +@JiraKey(value = "HHH-9866") @RunWith(CustomRunner.class) @RequiresDialect(MySQLDialect.class) public class SchemaExportWithGlobalQuotingEnabledTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java index b6bc768502..3b982fb7aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java @@ -22,7 +22,7 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.CustomRunner; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -36,7 +36,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-9866") +@JiraKey(value = "HHH-9866") @RunWith(CustomRunner.class) @RequiresDialect(PostgreSQLDialect.class) public class SchemaExportWithIndexAndDefaultSchema { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java index f59c91a6d4..5ccf35d9f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java @@ -28,7 +28,7 @@ import org.junit.After; import org.junit.Test; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.hamcrest.core.Is.is; @@ -83,7 +83,7 @@ public class SchemaMigrationTargetScriptCreationTest extends BaseCoreFunctionalT } @Test - @TestForIssue(jiraKey = "HHH-10684") + @JiraKey(value = "HHH-10684") public void testTargetScriptIsCreated() throws Exception { String fileContent = new String( Files.readAllBytes( output.toPath() ) ); Pattern fileContentPattern = Pattern.compile( "create( (column|row))? table test_entity" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java index caec86c9c1..73b4eb168a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java @@ -28,7 +28,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -41,7 +41,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -@TestForIssue(jiraKey = "HHH-11817") +@JiraKey(value = "HHH-11817") @RequiresDialect(H2Dialect.class) @BaseUnitTest public class SchemaMigrationToOutputScriptTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java index e2feb9706b..aa7b14f82b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java @@ -23,7 +23,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-1122") +@JiraKey(value = "HHH-1122") public class SchemaUpdateDelimiterTest { public static final String EXPECTED_DELIMITER = ";"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java index 739d56ec01..bd67ec5010 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java @@ -18,7 +18,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Assert; @@ -28,7 +28,7 @@ import org.junit.Test; * @author Koen Aers */ @RequiresDialect(H2Dialect.class) -@TestForIssue(jiraKey = "HHH-10158") +@JiraKey(value = "HHH-10158") public class SchemaUpdateFormatterTest extends BaseUnitTestCase { private static final String AFTER_FORMAT = diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java index 28d1a69a67..a4fc1fb2f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java @@ -24,7 +24,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "10180") +@JiraKey(value = "10180") public class SchemaUpdateGeneratingOnlyScriptFileTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java index 3300677e62..f2dbb4412a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java @@ -25,7 +25,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -37,7 +37,7 @@ import static org.junit.Assert.assertFalse; * @author Vlad Mihalcea */ @RequiresDialect(H2Dialect.class) -@TestForIssue(jiraKey = "HHH-8805") +@JiraKey(value = "HHH-8805") public class SchemaUpdateJoinColumnNoConstraintSecondaryTableTest extends BaseUnitTestCase { private static final String EXPECTED_SCRIPT = diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java index dea4eb9789..252a65114c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java @@ -26,7 +26,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -37,7 +37,7 @@ import static org.junit.Assert.assertFalse; * @author Vlad Mihalcea */ @RequiresDialect(H2Dialect.class) -@TestForIssue(jiraKey = "HHH-8805") +@JiraKey(value = "HHH-8805") public class SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest extends BaseUnitTestCase { private static final String EXPECTED_SCRIPT = diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java index adf15818f4..6bdf214fa6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java @@ -26,7 +26,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue; * @author Vlad Mihalcea */ @RequiresDialect(H2Dialect.class) -@TestForIssue(jiraKey = "HHH-8805") +@JiraKey(value = "HHH-8805") public class SchemaUpdateJoinColumnNoConstraintTest extends BaseUnitTestCase { private static final String DELIMITER = ";"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java index 7933f3ef6b..d6e06c83f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.hibernate.testing.orm.junit.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; /** @@ -37,7 +37,7 @@ import org.hibernate.testing.util.ServiceRegistryUtil; * @author Chris Cranford */ @RequiresDialect( value = MySQLDialect.class, majorVersion = 5 ) -@TestForIssue(jiraKey = "HHH-11455") +@JiraKey(value = "HHH-11455") public class SchemaUpdateSchemaNameTest { @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java index 11c9acb5dc..b566fd3224 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java @@ -27,7 +27,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -37,7 +37,7 @@ import org.junit.Test; /** * @author Yoann Rodiere */ -@TestForIssue(jiraKey = "HHH-10191") +@JiraKey(value = "HHH-10191") @RequiresDialect(PostgreSQLDialect.class) public class SchemaUpdateWithFunctionIndexTest extends BaseNonConfigCoreFunctionalTestCase { protected ServiceRegistry serviceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java index ca240bd174..660fb04cf1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java @@ -28,7 +28,7 @@ import org.hibernate.tool.hbm2ddl.SchemaValidator; import org.hibernate.tool.schema.JdbcMetadaAccessStrategy; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; @@ -37,7 +37,7 @@ import org.junit.jupiter.params.provider.EnumSource; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -@TestForIssue(jiraKey = "HHH-13788") +@JiraKey(value = "HHH-13788") public class SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest { private File updateOutputFile; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java index 595f59b23a..d339a532a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java @@ -26,7 +26,7 @@ import org.hibernate.tool.hbm2ddl.SchemaValidator; import org.hibernate.tool.schema.JdbcMetadaAccessStrategy; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-13788") +@JiraKey(value = "HHH-13788") public class SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest { private File updateOutputFile; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java index e002c6e128..5f787f77ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java @@ -29,7 +29,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -39,7 +39,7 @@ import org.junit.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-1872") +@JiraKey(value = "HHH-1872") @RequiresDialect(PostgreSQLDialect.class) @SkipForDialect(value = CockroachDialect.class, comment = "https://github.com/cockroachdb/cockroach/issues/24897") public class SchemaUpdateWithViewsTest extends BaseNonConfigCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java index a92419600d..3ed4ff0031 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java @@ -24,7 +24,7 @@ import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNo import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -36,7 +36,7 @@ import org.junit.Test; * * @see */ -@TestForIssue( jiraKey = "HHH-9745" ) +@JiraKey( value = "HHH-9745" ) @RequiresDialect( H2Dialect.class ) public class SequenceReadingTest extends BaseCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java index d4a2061717..7fae523200 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java @@ -21,7 +21,7 @@ import org.hibernate.dialect.SpannerDialect; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.AfterEach; @@ -36,7 +36,7 @@ import jakarta.persistence.Table; import static org.assertj.core.api.Assertions.assertThat; @BaseUnitTest -@TestForIssue(jiraKey = "HHH-15573") +@JiraKey(value = "HHH-15573") public class SpannerSchemaCreationColumnTypesTest { private File output; private StandardServiceRegistry ssr; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java index 6f76da0791..3d18503a59 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java @@ -26,7 +26,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -39,7 +39,7 @@ import static org.junit.Assert.fail; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-12106" ) +@JiraKey( value = "HHH-12106" ) @RequiresDialect( SQLServerDialect.class ) public class SqlServerQuoteSchemaTest extends BaseCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java index 48b03ba2fb..71f1082e3e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java @@ -23,7 +23,7 @@ import org.hibernate.persister.entity.AbstractEntityPersister; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -52,7 +52,7 @@ public class TableCommentTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10451") + @JiraKey(value = "HHH-10451") public void testCommentOnTableStatementIsGenerated() throws IOException { createSchema( new Class[] {TableWithComment.class} ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java index 11a19d8721..d6acdd7404 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java @@ -32,7 +32,7 @@ import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -45,7 +45,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-12271") +@JiraKey(value = "HHH-12271") @RequiresDialectFeature(DialectChecks.SupportDropConstraints.class) public class ForeignKeyDropTest extends BaseUnitTestCase { private File output; @@ -72,7 +72,7 @@ public class ForeignKeyDropTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11236") + @JiraKey(value = "HHH-11236") public void testForeignKeyDropIsCorrectlyGenerated() throws Exception { schemaExport diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java index 25b9f09d0a..f9230416af 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java @@ -24,7 +24,7 @@ import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -57,7 +57,7 @@ public class ForeignKeyGenerationTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9591") + @JiraKey(value = "HHH-9591") public void oneToOneTest() throws Exception { createSchema( new Class[] {User.class, UserSetting.class, Group.class} ); @@ -83,7 +83,7 @@ public class ForeignKeyGenerationTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10396") + @JiraKey(value = "HHH-10396") public void oneToManyTest() throws Exception { createSchema( new Class[] {User.class, UserSetting.class, Group.class} ); @@ -101,7 +101,7 @@ public class ForeignKeyGenerationTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10385") + @JiraKey(value = "HHH-10385") public void oneToManyWithJoinTableTest() throws Exception { createSchema( new Class[] {Person.class, Phone.class} ); @@ -127,7 +127,7 @@ public class ForeignKeyGenerationTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10386") + @JiraKey(value = "HHH-10386") public void manyToManyTest() throws Exception { createSchema( new Class[] {Project.class, Employee.class} ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java index c194beec71..0cf864b5b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java @@ -23,7 +23,7 @@ import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -34,7 +34,7 @@ import org.junit.Test; @RequiresDialectFeature( value = {DialectChecks.SupportCatalogCreation.class}) public class ForeignKeyMigrationTest extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-9716" ) + @JiraKey( value = "HHH-9716" ) // @FailureExpected( jiraKey = "HHH-9716" ) public void testMigrationOfForeignKeys() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java index db7a68aed3..c911404d73 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java @@ -38,7 +38,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -49,7 +49,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10352") +@JiraKey(value = "HHH-10352") public class JoinedInheritanceForeignKeyTest extends BaseUnitTestCase { private File output; private StandardServiceRegistry ssr; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java index e8daff7114..3179339232 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java @@ -24,7 +24,7 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -34,7 +34,7 @@ import org.junit.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11061") +@JiraKey(value = "HHH-11061") public class SchemaUpdateWithKeywordAutoQuotingEnabledTest extends BaseUnitTestCase { private StandardServiceRegistry ssr; private MetadataImplementor metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java index 15bc213579..28a6a13363 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java @@ -47,7 +47,7 @@ import org.hibernate.tool.schema.spi.TargetDescriptor; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -83,7 +83,7 @@ public class CrossSchemaForeignKeyGenerationTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10420") + @JiraKey(value = "HHH-10420") public void testSchemaExportForeignKeysAreGeneratedAfterAllTheTablesAreCreated() throws Exception { final MetadataSources metadataSources = new MetadataSources( ssr ); metadataSources.addAnnotatedClass( SchemaOneEntity.class ); @@ -107,7 +107,7 @@ public class CrossSchemaForeignKeyGenerationTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10802") + @JiraKey(value = "HHH-10802") public void testSchemaUpdateDoesNotFailResolvingCrossSchemaForeignKey() throws Exception { final MetadataSources metadataSources = new MetadataSources( ssr ); metadataSources.addAnnotatedClass( SchemaOneEntity.class ); @@ -134,7 +134,7 @@ public class CrossSchemaForeignKeyGenerationTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10420") + @JiraKey(value = "HHH-10420") public void testSchemaMigrationForeignKeysAreGeneratedAfterAllTheTablesAreCreated() throws Exception { final MetadataSources metadataSources = new MetadataSources( ssr ); metadataSources.addAnnotatedClass( SchemaOneEntity.class ); @@ -204,7 +204,7 @@ public class CrossSchemaForeignKeyGenerationTest extends BaseUnitTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10420") + @JiraKey(value = "HHH-10420") public void testImprovedSchemaMigrationForeignKeysAreGeneratedAfterAllTheTablesAreCreated() throws Exception { final MetadataSources metadataSources = new MetadataSources( ssr ); metadataSources.addAnnotatedClass( SchemaOneEntity.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java index c8d2f277bb..8d79dbdddd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java @@ -18,7 +18,7 @@ import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -73,7 +73,7 @@ public abstract class AbstractForeignKeyDefinitionTest extends BaseUnitTestCase protected abstract boolean validate(String fileContent); @Test - @TestForIssue(jiraKey = "HHH-10643") + @JiraKey(value = "HHH-10643") public void testForeignKeyDefinitionOverridesDefaultNamingStrategy() throws Exception { String fileContent = new String( Files.readAllBytes( output.toPath() ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java index d77a6b2740..da5bc994b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java @@ -20,7 +20,7 @@ import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10373") +@JiraKey(value = "HHH-10373") @RequiresDialectFeature(DialectChecks.SupportsSequences.class) public class IdBagSequenceTest extends BaseUnitTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java index 64a297cefc..c63709e643 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java @@ -20,7 +20,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.tool.schema.internal.SchemaCreatorImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; import org.junit.Before; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue; /** * @author Andrea Boriero */ -@TestForIssue( jiraKey = "HHH-11815") +@JiraKey( value = "HHH-11815") public class ComponentIndexTest { private StandardServiceRegistry ssr; private Metadata metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java index 4b8184b7a5..345e2ebacc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java @@ -17,7 +17,7 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.tool.schema.internal.SchemaCreatorImpl; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; @@ -26,7 +26,7 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; -@TestForIssue(jiraKey = "HHH-11913") +@JiraKey(value = "HHH-11913") @RequiresDialect(H2Dialect.class) @RequiresDialect(PostgreSQLDialect.class) @RequiresDialect(MySQLDialect.class) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/ForeignKeyNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/ForeignKeyNameTest.java index 815d7ba914..3933360bfd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/ForeignKeyNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/ForeignKeyNameTest.java @@ -18,7 +18,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertThat; public class ForeignKeyNameTest extends BaseUnitTestCase { @Test - @TestForIssue(jiraKey = "HHH-10169") + @JiraKey(value = "HHH-10169") public void testJoinedSubclassForeignKeyNameIsNotAutoGeneratedWhenProvided() throws Exception { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( Environment.HBM2DDL_AUTO, "none" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java index 4ae9f76cfd..d38bdbe69d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java @@ -27,7 +27,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import static org.hamcrest.core.Is.is; @@ -56,7 +56,7 @@ public class SchemaCreationTest { } @Test - @TestForIssue(jiraKey = "HHH-10553") + @JiraKey(value = "HHH-10553") public void testUniqueConstraintIsCorrectlyGenerated() throws Exception { final MetadataSources metadataSources = new MetadataSources( ssr ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/ForeignKeyNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/ForeignKeyNameTest.java index cd0afee568..9a76eedd79 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/ForeignKeyNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/ForeignKeyNameTest.java @@ -18,7 +18,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertThat; public class ForeignKeyNameTest extends BaseUnitTestCase { @Test - @TestForIssue(jiraKey = "HHH-10247") + @JiraKey(value = "HHH-10247") public void testJoinedSubclassForeignKeyNameIsNotAutoGeneratedWhenProvided() throws Exception { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( Environment.HBM2DDL_AUTO, "none" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java index 00cce3e07c..d98d7bcea3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java @@ -40,7 +40,7 @@ import org.hibernate.tool.schema.spi.SchemaManagementTool; import org.hibernate.tool.schema.spi.ScriptTargetOutput; import org.hibernate.tool.schema.spi.TargetDescriptor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; import org.junit.Before; @@ -105,7 +105,7 @@ public class UniqueConstraintDropTest { } @Test - @TestForIssue(jiraKey = "HHH-11236") + @JiraKey(value = "HHH-11236") public void testUniqueConstraintIsDropped() throws Exception { new IndividuallySchemaMigratorImpl( tool, DefaultSchemaFilter.INSTANCE ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java index 596aec97dc..db9709cce2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java @@ -27,7 +27,7 @@ import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; import org.junit.Before; @@ -64,7 +64,7 @@ public class UniqueConstraintGenerationTest { } @Test - @TestForIssue(jiraKey = "HHH-11101") + @JiraKey(value = "HHH-11101") public void testUniqueConstraintIsGenerated() throws Exception { new SchemaExport() .setOutputFile( output.getAbsolutePath() ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/EnumValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/EnumValidationTest.java index 5b3ae3deba..d565acd45b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/EnumValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/EnumValidationTest.java @@ -34,7 +34,7 @@ import org.hibernate.tool.schema.spi.ScriptTargetOutput; import org.hibernate.tool.schema.spi.SourceDescriptor; import org.hibernate.tool.schema.spi.TargetDescriptor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; import org.junit.Before; @@ -51,7 +51,7 @@ import jakarta.persistence.Id; /** * Test that an existing tinyint column works even if we switch to smallint type code for enums. */ -@TestForIssue(jiraKey = "HHH-15288") +@JiraKey(value = "HHH-15288") @RunWith(Parameterized.class) public class EnumValidationTest implements ExecutionOptions { @Parameterized.Parameters diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/IdentityGenerationValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/IdentityGenerationValidationTest.java index 5058aa0f6f..de40fec9e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/IdentityGenerationValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/IdentityGenerationValidationTest.java @@ -13,7 +13,7 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.tool.hbm2ddl.SchemaValidator; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -27,7 +27,7 @@ import jakarta.persistence.Table; /** * @author Jan Schatteman */ -@TestForIssue( jiraKey = "HHH-13106" ) +@JiraKey( value = "HHH-13106" ) @RequiresDialect( value = PostgreSQLDialect.class ) public class IdentityGenerationValidationTest extends BaseCoreFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/InstantValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/InstantValidationTest.java index cdc5d39bc3..ee7460d7e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/InstantValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/InstantValidationTest.java @@ -33,7 +33,7 @@ import org.hibernate.tool.schema.spi.ScriptTargetOutput; import org.hibernate.tool.schema.spi.SourceDescriptor; import org.hibernate.tool.schema.spi.TargetDescriptor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; import org.junit.Before; @@ -48,7 +48,7 @@ import jakarta.persistence.Id; /** * Test that an existing timestamp with timezone column works for fields that use java.time.Instant. */ -@TestForIssue(jiraKey = "HHH-15548") +@JiraKey(value = "HHH-15548") @RunWith(Parameterized.class) public class InstantValidationTest implements ExecutionOptions { @Parameterized.Parameters diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java index 664c860a36..84afe6b39c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java @@ -24,7 +24,7 @@ import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -39,7 +39,7 @@ import org.junit.Test; public class JoinTableWithDefaultSchemaTest extends BaseUnitTestCase { @Test - @TestForIssue(jiraKey = "HHH-10978") + @JiraKey(value = "HHH-10978") @RequiresDialect(SQLServerDialect.class) public void testGetTableDataForJoinTableWithDefaultSchema() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java index 33f95c9e35..f74fb0425e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java @@ -33,7 +33,7 @@ import org.hibernate.tool.schema.spi.ScriptTargetOutput; import org.hibernate.tool.schema.spi.SourceDescriptor; import org.hibernate.tool.schema.spi.TargetDescriptor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; import org.junit.Before; @@ -48,7 +48,7 @@ import jakarta.persistence.Table; /** * @author Steve Ebersole */ -@TestForIssue(jiraKey = "HHH-9693") +@JiraKey(value = "HHH-9693") @RunWith(Parameterized.class) public class LongVarcharValidationTest implements ExecutionOptions { @Parameterized.Parameters diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java index 0191a2c800..f8d336b1a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java @@ -36,7 +36,7 @@ import org.hibernate.tool.schema.spi.ScriptTargetOutput; import org.hibernate.tool.schema.spi.SourceDescriptor; import org.hibernate.tool.schema.spi.TargetDescriptor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.After; import org.junit.Before; @@ -47,7 +47,7 @@ import org.junit.runners.Parameterized; /** * @author Jonathan Bregler */ -@TestForIssue(jiraKey = "HHH-12203") +@JiraKey(value = "HHH-12203") @RunWith(Parameterized.class) public class NumericValidationTest implements ExecutionOptions { @Parameterized.Parameters diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java index 6aacf6184c..1609a8556f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java @@ -15,7 +15,7 @@ import org.hibernate.dialect.OracleDialect; import org.hibernate.tool.hbm2ddl.SchemaValidator; import org.hibernate.tool.schema.JdbcMetadaAccessStrategy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.RequiresDialects; @@ -108,7 +108,7 @@ public class SynonymValidationTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue(jiraKey = "HHH-12406") + @JiraKey(value = "HHH-12406") public void testSynonymUsingDefaultStrategySchemaValidator() { // Hibernate should use JdbcMetadaAccessStrategy.INDIVIDUALLY when // AvailableSettings.ENABLE_SYNONYMS is true. @@ -128,7 +128,7 @@ public class SynonymValidationTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue(jiraKey = "HHH-12406") + @JiraKey(value = "HHH-12406") public void testSynonymUsingGroupedSchemaValidator() { // Hibernate should use JdbcMetadaAccessStrategy.INDIVIDUALLY when // AvailableSettings.ENABLE_SYNONYMS is true, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java index 39720da0dc..3486618815 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java @@ -16,13 +16,13 @@ import org.hibernate.tool.hbm2ddl.SchemaValidator; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10718") +@JiraKey(value = "HHH-10718") public class TableNamesWithUnderscoreTest extends BaseNonConfigCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeySerializationTest.java index 0f3260ed21..2ac00e2fe3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeySerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/CacheKeySerializationTest.java @@ -20,7 +20,7 @@ import org.hibernate.orm.test.serialization.entity.PK; import org.hibernate.orm.test.serialization.entity.WithEmbeddedId; import org.hibernate.orm.test.serialization.entity.WithSimpleId; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.cache.CachingRegionFactory; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -53,25 +53,25 @@ public class CacheKeySerializationTest { } @Test - @TestForIssue(jiraKey = "HHH-11202") + @JiraKey(value = "HHH-11202") public void testSimpleCacheKeySimpleId() throws Exception { testId( SimpleCacheKeysFactory.INSTANCE, WithSimpleId.class.getName(), 1L ); } @Test - @TestForIssue(jiraKey = "HHH-11202") + @JiraKey(value = "HHH-11202") public void testSimpleCacheKeyEmbeddedId() throws Exception { testId( SimpleCacheKeysFactory.INSTANCE, WithEmbeddedId.class.getName(), new PK( 1L ) ); } @Test - @TestForIssue(jiraKey = "HHH-11202") + @JiraKey(value = "HHH-11202") public void testDefaultCacheKeySimpleId() throws Exception { testId( DefaultCacheKeysFactory.INSTANCE, WithSimpleId.class.getName(), 1L ); } @Test - @TestForIssue(jiraKey = "HHH-11202") + @JiraKey(value = "HHH-11202") public void testDefaultCacheKeyEmbeddedId() throws Exception { testId( DefaultCacheKeysFactory.INSTANCE, WithEmbeddedId.class.getName(), new PK( 1L ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java index b1b6c6d141..8909f403d6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java @@ -18,7 +18,7 @@ import org.hibernate.internal.util.SerializationHelper; import org.hibernate.proxy.AbstractLazyInitializer; import org.hibernate.proxy.HibernateProxy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -170,7 +170,7 @@ public class EntityProxySerializationTest { * temporary session. */ @Test - @TestForIssue(jiraKey = "HHH-12720") + @JiraKey(value = "HHH-12720") public void testProxyInitializationWithoutTXAfterDeserialization(SessionFactoryScope scope) { final SimpleEntity deserializedParent = scope.fromTransaction( s -> { final ChildEntity child = s.find( ChildEntity.class, 1L ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/GetterSetterSerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/GetterSetterSerializationTest.java index ca65699cd0..f308dc29b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/GetterSetterSerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/GetterSetterSerializationTest.java @@ -23,7 +23,7 @@ import org.hibernate.property.access.spi.Setter; import org.hibernate.property.access.spi.SetterFieldImpl; import org.hibernate.property.access.spi.SetterMethodImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertSame; @@ -36,7 +36,7 @@ import static org.junit.Assert.assertSame; public class GetterSetterSerializationTest { @Test - @TestForIssue( jiraKey = "HHH-11202") + @JiraKey( value = "HHH-11202") public void testPrivateFieldGetter() throws Exception { final AnEntity entity = new AnEntity( new PK( 1L ) ); @@ -58,7 +58,7 @@ public class GetterSetterSerializationTest { } @Test - @TestForIssue( jiraKey = "HHH-11202") + @JiraKey( value = "HHH-11202") public void testPrivateFieldSetter() throws Exception { AnEntity entity = new AnEntity( new PK( 1L ) ); @@ -88,7 +88,7 @@ public class GetterSetterSerializationTest { } @Test - @TestForIssue( jiraKey = "HHH-11202") + @JiraKey( value = "HHH-11202") public void testProtectedMethodGetter() throws Exception { final AnEntity entity = new AnEntity( new PK( 1L ) ); @@ -109,7 +109,7 @@ public class GetterSetterSerializationTest { } @Test - @TestForIssue( jiraKey = "HHH-11202") + @JiraKey( value = "HHH-11202") public void testProtectedMethodSetter() throws Exception { final AnEntity entity = new AnEntity( new PK( 1L ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java index 200731efdc..8d094e1143 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java @@ -18,7 +18,7 @@ import org.hibernate.proxy.AbstractLazyInitializer; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.map.MapProxy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -70,7 +70,7 @@ public class MapProxySerializationTest { */ @SuppressWarnings("unchecked") @Test - @TestForIssue(jiraKey = "HHH-7686") + @JiraKey(value = "HHH-7686") public void testInitializedProxySerializationIfTargetInPersistenceContext(SessionFactoryScope scope) { scope.inTransaction( s -> { final Map child = (Map) s.getReference( "ChildEntity", 1L ); @@ -102,7 +102,7 @@ public class MapProxySerializationTest { */ @SuppressWarnings("unchecked") @Test - @TestForIssue(jiraKey = "HHH-7686") + @JiraKey(value = "HHH-7686") public void testUninitializedProxySerializationIfTargetInPersistenceContext(SessionFactoryScope scope) { scope.inTransaction( s -> { final Map child = (Map) s.getReference( "ChildEntity", 1L ); @@ -160,7 +160,7 @@ public class MapProxySerializationTest { */ @SuppressWarnings("unchecked") @Test - @TestForIssue(jiraKey = "HHH-7686") + @JiraKey(value = "HHH-7686") public void testProxyInitializationWithoutTXAfterDeserialization(SessionFactoryScope scope) { final Map deserializedParent = scope.fromTransaction( s -> { final Map child = (Map) s.getReference( "ChildEntity", 1L ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/TypedValueSerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/TypedValueSerializationTest.java index 4a755086e5..b6926010f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/TypedValueSerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/TypedValueSerializationTest.java @@ -15,7 +15,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import org.hibernate.engine.spi.TypedValue; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.type.Type; import org.junit.Test; @@ -25,7 +25,7 @@ import org.junit.Test; public class TypedValueSerializationTest { @Test - @TestForIssue(jiraKey = "HHH-9024") + @JiraKey(value = "HHH-9024") public void testTypedValueSerialization() throws Exception { final Type mockType = mock(Type.class); final String value = "foo"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java index eb506378cf..7b37e74734 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java @@ -24,7 +24,7 @@ import org.hibernate.integrator.spi.Integrator; import org.hibernate.integrator.spi.IntegratorService; import org.hibernate.internal.util.ConfigHelper; import org.hibernate.service.ServiceRegistry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Assert; import org.junit.Test; @@ -68,7 +68,7 @@ public class ClassLoaderServiceImplTest { * TODO: Is there a way to test that the ServiceLoader was actually reset? */ @Test - @TestForIssue(jiraKey = "HHH-8363") + @JiraKey(value = "HHH-8363") public void testStoppableClassLoaderService() { final BootstrapServiceRegistryBuilder bootstrapBuilder = new BootstrapServiceRegistryBuilder(); bootstrapBuilder.applyClassLoader( new TestClassLoader() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceRegistryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceRegistryTest.java index 8d05194335..fec69b564a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceRegistryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceRegistryTest.java @@ -22,7 +22,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import static org.hamcrest.core.IsInstanceOf.instanceOf; @@ -46,7 +46,7 @@ public class ServiceRegistryTest { } @Test - @TestForIssue(jiraKey = "HHH-10427") + @JiraKey(value = "HHH-10427") public void testOnlyOneInstanceOfTheServiceShouldBeCreated() throws InterruptedException, ExecutionException { Future[] serviceIdentities = execute(); @@ -65,7 +65,7 @@ public class ServiceRegistryTest { } @Test - @TestForIssue(jiraKey = "HHH-11395") + @JiraKey(value = "HHH-11395") public void testGetService() { assertThat( registry.getService( SlowInitializationService.class ), @@ -74,13 +74,13 @@ public class ServiceRegistryTest { } @Test - @TestForIssue(jiraKey = "HHH-11395") + @JiraKey(value = "HHH-11395") public void testGetServiceReturnsNullWhenTheServiceInitiatorInitiateServiceReturnsNull() { assertNull( registry.getService( FakeService.class ) ); } @Test - @TestForIssue(jiraKey = "HHH-11395") + @JiraKey(value = "HHH-11395") public void testRequireService() { assertThat( registry.requireService( SlowInitializationService.class ), @@ -89,7 +89,7 @@ public class ServiceRegistryTest { } @Test(expected = NullServiceException.class) - @TestForIssue(jiraKey = "HHH-11395") + @JiraKey(value = "HHH-11395") public void testRequireServiceThrowsAnExceptionWhenTheServiceInitiatorInitiateServiceReturnsNull() { assertNull( registry.requireService( FakeService.class ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java index cd51fac22d..89d1afe076 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java @@ -18,7 +18,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.proxy.AbstractLazyInitializer; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; @@ -48,7 +48,7 @@ public class AssociateEntityWithTwoSessionsTest { Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, AbstractLazyInitializer.class.getName() ) ); @Test - @TestForIssue( jiraKey = "HHH-12216" ) + @JiraKey( value = "HHH-12216" ) public void test(EntityManagerFactoryScope scope) { final Location location = new Location(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java index b0bdab8d91..8bf3c7718b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java @@ -17,7 +17,7 @@ import org.hibernate.event.spi.PostInsertEventListener; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.resource.jdbc.spi.JdbcSessionOwner; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue; @SessionFactory public class SessionWithSharedConnectionTest { @Test - @TestForIssue( jiraKey = "HHH-7090" ) + @JiraKey( value = "HHH-7090" ) public void testSharedTransactionContextSessionClosing(SessionFactoryScope scope) { Session session = scope.getSessionFactory().openSession(); session.getTransaction().begin(); @@ -84,7 +84,7 @@ public class SessionWithSharedConnectionTest { } @Test - @TestForIssue( jiraKey = "HHH-7090" ) + @JiraKey( value = "HHH-7090" ) public void testSharedTransactionContextAutoClosing(SessionFactoryScope scope) { Session session = scope.getSessionFactory().openSession(); session.getTransaction().begin(); @@ -136,7 +136,7 @@ public class SessionWithSharedConnectionTest { } // @Test -// @TestForIssue( jiraKey = "HHH-7090" ) +// @JiraKey( value = "HHH-7090" ) // public void testSharedTransactionContextAutoJoining() { // Session session = scope.getSessionFactory().openSession(); // session.getTransaction().begin(); @@ -154,7 +154,7 @@ public class SessionWithSharedConnectionTest { // } @Test - @TestForIssue( jiraKey = "HHH-7090" ) + @JiraKey( value = "HHH-7090" ) public void testSharedTransactionContextFlushBeforeCompletion(SessionFactoryScope scope) { Session session = scope.getSessionFactory().openSession(); session.getTransaction().begin(); @@ -190,7 +190,7 @@ public class SessionWithSharedConnectionTest { } @Test - @TestForIssue( jiraKey = "HHH-7239" ) + @JiraKey( value = "HHH-7239" ) public void testChildSessionCallsAfterTransactionAction(SessionFactoryScope scope) throws Exception { Session session = scope.getSessionFactory().openSession(); @@ -238,7 +238,7 @@ public class SessionWithSharedConnectionTest { } @Test - @TestForIssue( jiraKey = "HHH-7239" ) + @JiraKey( value = "HHH-7239" ) public void testChildSessionTwoTransactions(SessionFactoryScope scope) throws Exception { Session session = scope.getSessionFactory().openSession(); @@ -262,7 +262,7 @@ public class SessionWithSharedConnectionTest { } @Test - @TestForIssue(jiraKey = "HHH-11830") + @JiraKey(value = "HHH-11830") public void testSharedSessionTransactionObserver(SessionFactoryScope scope) throws Exception { scope.inTransaction( session -> { Field field = null; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java index 17b302e382..bed82eb083 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.SortNatural; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -29,7 +29,7 @@ public class SortNaturalTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8827" ) + @JiraKey( value = "HHH-8827" ) public void testSortNatural() { Session s = openSession(); s.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CollectionLoaderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CollectionLoaderTest.java index 13c0736933..d4c8ec7e62 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CollectionLoaderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/CollectionLoaderTest.java @@ -30,7 +30,7 @@ import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Before; import org.junit.Test; @@ -79,7 +79,7 @@ public class CollectionLoaderTest extends BaseEntityManagerFunctionalTestCase { }); } - @Test @TestForIssue(jiraKey = "HHH-10557") + @Test @JiraKey(value = "HHH-10557") public void test_HHH10557() { Person _person = doInJPA(this::entityManagerFactory, entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLSelectTest.java index 47ec259a1b..a1245b8510 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLSelectTest.java @@ -21,7 +21,7 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.metamodel.CollectionClassification; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; import org.junit.Before; import org.junit.Test; @@ -77,7 +77,7 @@ public class SQLSelectTest extends BaseEntityManagerFunctionalTestCase { }); } - @Test @TestForIssue(jiraKey = "HHH-10557") + @Test @JiraKey(value = "HHH-10557") public void test_HHH10557() { Person _person = doInJPA(this::entityManagerFactory, entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java index 370cc8ce49..4f815fd759 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java @@ -34,7 +34,7 @@ import org.hibernate.testing.orm.domain.userguide.PhoneType; import org.hibernate.testing.orm.domain.userguide.WireTransferPayment; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -195,7 +195,7 @@ public class SQLTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-15914" ) + @JiraKey( value = "HHH-15914" ) public void test_sql_hibernate_custom_column_selection_scalar_query_example() { doInJPA(this::entityManagerFactory, entityManager -> { Session session = entityManager.unwrap(Session.class); @@ -412,7 +412,7 @@ public class SQLTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10504") + @JiraKey(value = "HHH-10504") public void test_sql_hibernate_entity_associations_query_one_to_many_join_example_1() { doInJPA(this::entityManagerFactory, entityManager -> { Session session = entityManager.unwrap(Session.class); @@ -498,7 +498,7 @@ public class SQLTest extends BaseEntityManagerFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-15914" ) + @JiraKey( value = "HHH-15914" ) public void test_sql_hibernate_multi_entity_query_alias_example() { doInJPA(this::entityManagerFactory, entityManager -> { Session session = entityManager.unwrap(Session.class); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java index b03b26eaea..78ffcb80d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.sql.exec; import org.hibernate.orm.test.mapping.SecondaryTableTests; import org.hibernate.orm.test.mapping.inheritance.joined.JoinedInheritanceTest; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.domain.StandardDomainModel; import org.hibernate.testing.orm.domain.gambit.BasicEntity; import org.hibernate.testing.orm.junit.DomainModel; @@ -50,7 +50,7 @@ public class HqlUpdateExecutionTests { } @Test - @TestForIssue( jiraKey = "HHH-15361") + @JiraKey( value = "HHH-15361") public void testSimpleUpdateAssignability(SessionFactoryScope scope) { scope.inTransaction( session -> session.createQuery( "update EntityOfBasics set theDate = current_date" ) @@ -59,7 +59,7 @@ public class HqlUpdateExecutionTests { } @Test - @TestForIssue( jiraKey = "HHH-15939" ) + @JiraKey( value = "HHH-15939" ) public void testNumericUpdate(SessionFactoryScope scope) { scope.inTransaction( session -> { session.createMutationQuery( "update EntityOfBasics set theShort = 69" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java index 4b1f947dad..d60b15f446 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java @@ -16,7 +16,7 @@ import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.SyntaxException; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -26,7 +26,7 @@ import static org.junit.Assert.fail; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-11233") +@JiraKey( value = "HHH-11233") @RequiresDialect(H2Dialect.class) public class JpaFunctionTest extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java index 003360af1e..e556f91cd1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java @@ -44,7 +44,7 @@ import org.hibernate.transform.ResultTransformer; import org.hibernate.transform.Transformers; import org.hibernate.type.StandardBasicTypes; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -915,7 +915,7 @@ public class NativeSQLQueriesTest { } @Test - @TestForIssue( jiraKey = "HHH-14487") + @JiraKey( value = "HHH-14487") public void testAliasToBeanMap(SessionFactoryScope scope) { Person gavin = new Person( "Gavin" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/CursorFromCallableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/CursorFromCallableTest.java index 783f29d2c9..fe510ded71 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/CursorFromCallableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/refcursor/CursorFromCallableTest.java @@ -22,7 +22,7 @@ import org.hibernate.jdbc.Work; import org.hibernate.procedure.ProcedureCall; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Assert; @@ -63,7 +63,7 @@ public class CursorFromCallableTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8022" ) + @JiraKey( value = "HHH-8022" ) public void testReadResultSetFromRefCursor() { Session session = openSession(); session.getTransaction().begin(); @@ -78,7 +78,7 @@ public class CursorFromCallableTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7984" ) + @JiraKey( value = "HHH-7984" ) public void testStatementClosing() { Session session = openSession(); session.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java index 32ec2a80ed..b8cf4a5903 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java @@ -27,9 +27,8 @@ import org.hibernate.query.spi.QueryImplementor; import org.hibernate.stat.QueryStatistics; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/StatsNamedContainerNullComputedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/StatsNamedContainerNullComputedValueTest.java index d8fb3f99a3..9cae2cc5d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/StatsNamedContainerNullComputedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/StatsNamedContainerNullComputedValueTest.java @@ -10,14 +10,14 @@ import org.hibernate.stat.internal.StatsNamedContainer; import java.util.concurrent.atomic.AtomicInteger; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertNull; -@TestForIssue(jiraKey = "HHH-13645") +@JiraKey(value = "HHH-13645") public class StatsNamedContainerNullComputedValueTest { private final static AtomicInteger invocationCounterNullProducer = new AtomicInteger(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java index cb8bc8a8ec..edd407400c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java @@ -11,7 +11,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.logger.Triggerable; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -48,7 +48,7 @@ public class StatelessSessionConnectionTest { @Test - @TestForIssue(jiraKey = "HHH-11732") + @JiraKey(value = "HHH-11732") public void test(EntityManagerFactoryScope scope) { Triggerable triggerable = logInspection.watchForLogMessages( "HHH000352" ); triggerable.reset(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java index 9d739d8a1d..e358b9dedd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Table; import org.hibernate.StatelessSession; import org.hibernate.query.NativeQuery; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -40,7 +40,7 @@ public class StatelessSessionNativeQueryInsertTest { } @Test - @TestForIssue(jiraKey = "HHH-12141") + @JiraKey(value = "HHH-12141") public void testInsertInStatelessSession(SessionFactoryScope scope) { scope.inSession( session -> diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java index 9e498813aa..3e0c7bb4a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java @@ -20,7 +20,7 @@ import org.hibernate.Transaction; import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -52,7 +52,7 @@ public class StatelessSessionPersistentContextTest { } @Test - @TestForIssue(jiraKey = "HHH-13672") + @JiraKey(value = "HHH-13672") public void testStatelessSessionPersistenceContextIsCleared(SessionFactoryScope scope) { TestEntity testEntity = new TestEntity(); consumeAndCheckPersistenceContextIsClosed( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java index 2d8fb6b9d0..e6749c296b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java @@ -14,7 +14,7 @@ import org.hibernate.dialect.HANADialect; import org.hibernate.query.NativeQuery; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -52,7 +52,7 @@ public class StatelessSessionQueryTest { } @Test - @TestForIssue(jiraKey = "HHH-13194") + @JiraKey(value = "HHH-13194") @SkipForDialect(dialectClass = HANADialect.class, matchSubTypes = true, reason = " HANA doesn't support tables consisting of only a single auto-generated column") public void testNewQueryApis(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoCachingTest.java index 75e51f0c6a..b0e10351c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoCachingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoCachingTest.java @@ -10,7 +10,7 @@ import org.hibernate.cache.internal.NoCachingRegionFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -37,7 +37,7 @@ public class StatisticsWithNoCachingTest { } @Test - @TestForIssue(jiraKey = "HHH-12508") + @JiraKey(value = "HHH-12508") public void testUncachedRegion(SessionFactoryScope scope) { scope.getSessionFactory().getStatistics().getCacheRegionStatistics( "hibernate.test.unknown" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoQueryCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoQueryCachingTest.java index 5d75abeaa5..11d4cb218c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoQueryCachingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoQueryCachingTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.stats; import org.hibernate.cfg.AvailableSettings; import org.hibernate.stat.Statistics; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; public class StatisticsWithNoQueryCachingTest { @Test - @TestForIssue( jiraKey = "HHH-13645") + @JiraKey( value = "HHH-13645") public void testUncachedRegion(SessionFactoryScope scope) { final Statistics statistics = scope.getSessionFactory().getStatistics(); assertNull( statistics.getCacheRegionStatistics( "hibernate.test.unknown" ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java index b71559c61f..90ad4cea5a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -20,7 +20,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; JpaNativeQueryFlushSessionTest.Person.class } ) -@TestForIssue(jiraKey = "HHH-16492") +@JiraKey(value = "HHH-16492") public class JpaNativeQueryFlushSessionTest { @AfterEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java index eb889705c3..a27a1a26b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -22,7 +22,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16492") +@JiraKey(value = "HHH-16492") public class NativeQueryAndFlushSessionTest { @AfterEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/BasicStreamTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/BasicStreamTest.java index e878a2137d..1d1327a450 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/BasicStreamTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/BasicStreamTest.java @@ -11,7 +11,7 @@ import java.util.stream.Stream; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -70,7 +70,7 @@ public class BasicStreamTest { } @Test - @TestForIssue(jiraKey = "HHH-10824") + @JiraKey(value = "HHH-10824") public void testQueryStream(SessionFactoryScope scope) { scope.inTransaction( @@ -117,7 +117,7 @@ public class BasicStreamTest { } @Test - @TestForIssue(jiraKey = "HHH-11743") + @JiraKey(value = "HHH-11743") public void testTupleStream(SessionFactoryScope scope) { scope.inTransaction( session -> { MyEntity entity = new MyEntity(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/JpaStreamTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/JpaStreamTest.java index 67a38f4c46..b5cd7c5c56 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/JpaStreamTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/JpaStreamTest.java @@ -22,8 +22,9 @@ import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.resource.jdbc.ResourceRegistry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -49,7 +50,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class JpaStreamTest { @Test - @TestForIssue(jiraKey = "HHH-11907") + @JiraKey(value = "HHH-11907") public void testQueryStream(SessionFactoryScope scope) { scope.inTransaction( session -> { MyEntity e = new MyEntity(); @@ -91,7 +92,10 @@ public class JpaStreamTest { @Test @RequiresDialect(H2Dialect.class) - @TestForIssue(jiraKey = { "HHH-13872", "HHH-14449" }) + @JiraKeyGroup( value = { + @JiraKey( value = "HHH-13872" ), + @JiraKey( value = "HHH-14449" ) + } ) public void testStreamCloseOnTerminalOperation(SessionFactoryScope scope) { scope.inTransaction( session -> { session.createQuery( "delete from MyEntity" ).executeUpdate(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java index 80d4c78282..eb2c6905c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Assert; import org.junit.Test; @@ -18,7 +18,7 @@ import org.junit.Test; /** * @author Strong Liu */ -@TestForIssue( jiraKey = "HHH-8312") +@JiraKey( value = "HHH-8312") public class CompositeIdTypeBindingTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java index 5193007580..ee73b8b137 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java @@ -11,7 +11,7 @@ import org.hibernate.resource.transaction.spi.TransactionStatus; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.hamcrest.core.Is.is; @@ -21,7 +21,7 @@ import static org.junit.Assert.fail; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "") +@JiraKey(value = "") public class SetSubselectTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/join/SubselectInJoinedTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/join/SubselectInJoinedTableTest.java index 6c0cbabd60..4ccc4773cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/join/SubselectInJoinedTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/join/SubselectInJoinedTableTest.java @@ -13,7 +13,7 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; @@ -32,7 +32,7 @@ public class SubselectInJoinedTableTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-10998") + @JiraKey( value = "HHH-10998") public void testSubselectInJoinedTable() { OrderEntry orderEntry1 = new OrderEntry(); orderEntry1.setOrderEntryId( 1L ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampFspFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampFspFunctionTest.java index 372d21dccc..c492b4c8d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampFspFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampFspFunctionTest.java @@ -11,7 +11,7 @@ import java.sql.Timestamp; import org.hibernate.dialect.MySQLDialect; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue; /** * @author Gail Badner. */ -@TestForIssue( jiraKey = "HHH-8401") +@JiraKey( value = "HHH-8401") @RequiresDialect( value = MySQLDialect.class) @ServiceRegistry @DomainModel diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java index 4dac2d0c01..8941ec1227 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java @@ -16,7 +16,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.query.Query; import org.hibernate.type.StandardBasicTypes; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; * @author Gail Badner */ @RequiresDialect(value = MySQLDialect.class) -@TestForIssue(jiraKey = "HHH-8401") +@JiraKey(value = "HHH-8401") @DomainModel( annotatedClasses = MySQLTimestampPropertyTest.Entity.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java index c3a4568e68..3a5d7c7c0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java @@ -17,7 +17,7 @@ import java.util.TimeZone; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialectFeature; @@ -41,7 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author Vlad Mihalcea */ @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJdbcDriverProxying.class) -@TestForIssue(jiraKey = "HHH-12988") +@JiraKey(value = "HHH-12988") @SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true) @DomainModel( annotatedClasses = JdbcTimestampDSTWithUTCTest.Person.class diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java index 0bfe71c973..61df164f37 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java @@ -21,7 +21,7 @@ import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.resource.transaction.spi.TransactionStatus; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.hibernate.testing.junit4.CustomParameterized; @@ -36,7 +36,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@TestForIssue( jiraKey = "HHH-13326") +@JiraKey( value = "HHH-13326") @RunWith(CustomParameterized.class) public class InterceptorTransactionTest extends BaseJpaOrNativeBootstrapFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java index ac8f5e839b..79cd147a8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java @@ -24,7 +24,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; @@ -53,7 +53,7 @@ public class JtaAfterCompletionTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue(jiraKey = "HHH-12448") + @JiraKey(value = "HHH-12448") public void testAfterCompletionCallbackExecutedAfterTransactionTimeout() throws Exception { // This makes sure that hbm2ddl runs before we start a transaction for a test // This is important for database that only support SNAPSHOT/SERIALIZABLE isolation, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java index 6e9c0a870b..12f38a8715 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java @@ -19,7 +19,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.resource.transaction.jta.JtaPlatformStandardTestingImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.junit.jupiter.api.AfterEach; @@ -63,7 +63,7 @@ public class JtaBeforeCompletionFailureTest extends BaseSessionFactoryFunctional } @Test - @TestForIssue(jiraKey = "HHH-9888") + @JiraKey(value = "HHH-9888") public void testUniqueConstraintViolationDuringManagedFlush() throws Exception { final TransactionManager tm = JtaPlatformStandardTestingImpl.INSTANCE.transactionManager(); assertEquals( Status.STATUS_NO_TRANSACTION, tm.getStatus() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java index 7b11a3f0e5..f21206da07 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java @@ -13,7 +13,7 @@ import org.hibernate.TransactionException; import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.jdbc.Person; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Lukasz Antoniak */ -@TestForIssue(jiraKey = "HHH-6780") +@JiraKey(value = "HHH-6780") @ServiceRegistry( settings = { @Setting( name = AvailableSettings.IMPLICIT_NAMING_STRATEGY, value = "legacy-hbm" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/GroupedSchemaValidatorImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/GroupedSchemaValidatorImplTest.java index 50c7da4551..fb90bb4c1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/GroupedSchemaValidatorImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/GroupedSchemaValidatorImplTest.java @@ -13,12 +13,12 @@ import org.hibernate.tool.schema.internal.GroupedSchemaValidatorImpl; import org.hibernate.tool.schema.spi.ContributableMatcher; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10332") +@JiraKey(value = "HHH-10332") @RequiresDialect(H2Dialect.class) public class GroupedSchemaValidatorImplTest extends IndividuallySchemaValidatorImplTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java index 2864d5dfa6..6bb27ded59 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java @@ -45,7 +45,7 @@ import org.hibernate.tool.schema.spi.SchemaManagementTool; import org.hibernate.tool.schema.spi.SchemaValidator; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.boot.JdbcConnectionAccessImpl; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.logger.LoggerInspectionRule; @@ -64,7 +64,7 @@ import static org.junit.Assert.assertFalse; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-11864") +@JiraKey(value = "HHH-11864") @RequiresDialect(H2Dialect.class) public class IndividuallySchemaValidatorImplConnectionTest extends BaseUnitTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java index 7a5915bccf..119dc0e2d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java @@ -42,7 +42,7 @@ import org.hibernate.tool.schema.spi.SchemaManagementException; import org.hibernate.tool.schema.spi.SchemaManagementTool; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.boot.JdbcConnectionAccessImpl; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.logger.LoggerInspectionRule; @@ -62,7 +62,7 @@ import static org.junit.Assert.assertEquals; /** * @author Dominique Toupin */ -@TestForIssue(jiraKey = "HHH-10332") +@JiraKey(value = "HHH-10332") @RequiresDialect(H2Dialect.class) public class IndividuallySchemaValidatorImplTest extends BaseUnitTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java index 35a708e964..5c3d23482e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java @@ -16,7 +16,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.logger.LoggerInspectionRule; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-12763" ) +@JiraKey( value = "HHH-12763" ) public class JtaPlatformLoggingTest extends BaseNonConfigCoreFunctionalTestCase { @Rule diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java index f726d87fdc..d468b5e301 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java @@ -16,7 +16,7 @@ import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; import org.hibernate.cfg.Configuration; import org.hibernate.internal.util.config.ConfigurationHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -26,7 +26,7 @@ import static org.junit.Assert.fail; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-13621") +@JiraKey(value = "HHH-13621") public class SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest extends BaseCoreFunctionalTestCase { private File dropOutput; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/StandardForeignKeyExporterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/StandardForeignKeyExporterTest.java index c1b87cf026..4c87765f27 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/StandardForeignKeyExporterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/StandardForeignKeyExporterTest.java @@ -21,7 +21,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.mapping.ForeignKey; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals; * @author Jan Schatteman */ @RequiresDialect( value = H2Dialect.class ) -@TestForIssue( jiraKey = "HHH-15704") +@JiraKey( value = "HHH-15704") public class StandardForeignKeyExporterTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java index 2ad2c70943..020127f842 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java @@ -14,12 +14,12 @@ import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; import org.hibernate.tool.schema.spi.SqlScriptCommandExtractor; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Lukasz Antoniak */ -@TestForIssue( jiraKey = "HHH-2403" ) +@JiraKey( value = "HHH-2403" ) @RequiresDialect(value = H2Dialect.class, jiraKey = "HHH-6286", comment = "Only running the tests against H2, because the sql statements in the import file are not generic. " + diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/EmptyImportFilesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/EmptyImportFilesTest.java index d9b8d7c162..82b7d53ce5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/EmptyImportFilesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/EmptyImportFilesTest.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.tool.schema.scripts; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-13089") +@JiraKey(value = "HHH-13089") public class EmptyImportFilesTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java index 079dcc0805..bd51032a89 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java @@ -14,7 +14,7 @@ import java.util.List; import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectContext; import org.junit.Test; @@ -74,7 +74,7 @@ public class MultiLineImportExtractorTest { } @Test - @TestForIssue(jiraKey = "HHH-16279") + @JiraKey(value = "HHH-16279") public void testExtractionFromCommentsOnlyScript() throws IOException { final ClassLoader classLoader = ClassLoader.getSystemClassLoader(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java index 372f0d8501..7d3a2433e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportFileTest.java @@ -13,7 +13,7 @@ import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; /** * @author Lukasz Antoniak */ -@TestForIssue(jiraKey = "HHH-2403") +@JiraKey(value = "HHH-2403") @RequiresDialect(value = H2Dialect.class, jiraKey = "HHH-6286", comment = "Only running the tests against H2, because the sql statements in the import file are not generic. " + diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java index 0c0445a3b7..f54c54e970 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java @@ -12,7 +12,7 @@ import java.util.List; import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectContext; import org.junit.Test; @@ -23,7 +23,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-14249") +@JiraKey(value = "HHH-14249") public class MultiLineImportWithSpacesAfterTheLastStatementTest { public static final String IMPORT_FILE = "org/hibernate/orm/test/tool/schema/scripts/multi-line-statements-with-spaces-after-last-delimiter.sql"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java index 1e548026ba..194c1f4a8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java @@ -12,7 +12,7 @@ import java.util.List; import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectContext; import org.junit.Test; @@ -23,7 +23,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-14249") +@JiraKey(value = "HHH-14249") public class MultiLineImportWithTabsAndSpacesTest { public static final String IMPORT_FILE = "org/hibernate/orm/test/tool/schema/scripts/multi-line-statements-starting-with-tabs-and-spaces.sql"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportExtractorTest.java index d3534ade14..f6ed5b798a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportExtractorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/SingleLineImportExtractorTest.java @@ -18,7 +18,7 @@ import java.util.List; import org.hibernate.tool.schema.internal.script.SingleLineSqlScriptExtractor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DialectContext; import org.junit.Test; @@ -36,7 +36,7 @@ public class SingleLineImportExtractorTest { } @Test - @TestForIssue(jiraKey = "HHH-16279") + @JiraKey(value = "HHH-16279") // Note this worked from the start as HHH-16279 only affects the multi-line extractor public void testExtractionFromCommentsOnlyScript() throws IOException { final ClassLoader classLoader = ClassLoader.getSystemClassLoader(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java index 164abf3fdd..878bbffc92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java @@ -36,7 +36,7 @@ import org.hibernate.tool.schema.spi.SqlScriptException; import org.hibernate.tool.schema.spi.TargetDescriptor; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -52,7 +52,7 @@ import static org.junit.Assert.fail; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-13673") +@JiraKey(value = "HHH-13673") @RequiresDialect(value = H2Dialect.class, jiraKey = "HHH-6286", comment = "Only running the tests against H2, because the sql statements in the import file are not generic. " + diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractJavaTimeTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractJavaTimeTypeTest.java index 7766768cef..4d1ac053d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractJavaTimeTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/AbstractJavaTimeTypeTest.java @@ -30,7 +30,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.HSQLDialect; import org.hibernate.service.ServiceRegistry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProviderImpl; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.CustomParameterized; @@ -117,7 +117,7 @@ public abstract class AbstractJavaTimeTypeTest extends BaseCoreFunctionalT } @Test - @TestForIssue(jiraKey = "HHH-13266") + @JiraKey(value = "HHH-13266") public void writeThenRead() { withDefaultTimeZone( () -> { inTransaction( session -> { @@ -135,7 +135,7 @@ public abstract class AbstractJavaTimeTypeTest extends BaseCoreFunctionalT } @Test - @TestForIssue(jiraKey = "HHH-13266") + @JiraKey(value = "HHH-13266") public void writeThenNativeRead() { assumeNoJdbcTimeZone(); @@ -166,7 +166,7 @@ public abstract class AbstractJavaTimeTypeTest extends BaseCoreFunctionalT } @Test - @TestForIssue(jiraKey = "HHH-13266") + @JiraKey(value = "HHH-13266") public void nativeWriteThenRead() { assumeNoJdbcTimeZone(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTest.java index dfc21ad26d..0d3ad0e673 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LocalDateTest.java @@ -29,13 +29,13 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.SybaseASEDialect; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.runners.Parameterized; /** * Tests for storage of LocalDate properties. */ -@TestForIssue(jiraKey = "HHH-10371") +@JiraKey(value = "HHH-10371") @SkipForDialect(value = HANADialect.class, comment = "HANA systematically returns the wrong date when the JVM default timezone is not UTC") @SkipForDialect(value = MySQLDialect.class, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java index 259478b068..481e1e1758 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java @@ -20,7 +20,7 @@ import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.type.descriptor.java.AbstractClassJavaType; import org.hibernate.type.descriptor.jdbc.LongVarcharJdbcType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.junit.jupiter.api.Test; @@ -57,7 +57,7 @@ public class LongListTypeContributorTest extends EntityManagerFactoryBasedFuncti } @Test - @TestForIssue(jiraKey = "HHH-11409") + @JiraKey(value = "HHH-11409") public void testParameterRegisterredCollection() { LongList longList = new LongList( 5L, 11L, 6123L, -61235L, 24L ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java index 02496c0c47..f53b3c8eb9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OffsetDateTimeTest.java @@ -32,7 +32,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.SybaseDialect; import org.hibernate.type.StandardBasicTypes; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import org.junit.runners.Parameterized; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10372") +@JiraKey(value = "HHH-10372") public class OffsetDateTimeTest extends AbstractJavaTimeTypeTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleLongLobTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleLongLobTypeTest.java index 11d27de6a2..d37393f852 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleLongLobTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleLongLobTypeTest.java @@ -25,7 +25,7 @@ import org.hibernate.type.BasicTypeReference; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; @@ -41,7 +41,7 @@ import static org.junit.Assert.assertSame; public class OracleLongLobTypeTest extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-10345" ) + @JiraKey( value = "HHH-10345" ) public void testOracle12() { check( OracleDialect.class, Primitives.class, StandardBasicTypes.BINARY, StandardBasicTypes.CHAR_ARRAY ); check( OracleDialect.class, LobPrimitives.class, StandardBasicTypes.MATERIALIZED_BLOB, StandardBasicTypes.MATERIALIZED_CLOB_CHAR_ARRAY ); @@ -49,7 +49,7 @@ public class OracleLongLobTypeTest extends BaseUnitTestCase { } @Test - @TestForIssue( jiraKey = "HHH-10345" ) + @JiraKey( value = "HHH-10345" ) public void testOracle12PreferLongRaw() { check( OracleDialect.class, Primitives.class, StandardBasicTypes.BINARY, StandardBasicTypes.CHAR_ARRAY, true ); check( OracleDialect.class, LobPrimitives.class, StandardBasicTypes.MATERIALIZED_BLOB, StandardBasicTypes.MATERIALIZED_CLOB_CHAR_ARRAY, true ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/SQLServerNVarCharTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/SQLServerNVarCharTypeTest.java index 77d605dedc..596a9dfe81 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/SQLServerNVarCharTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/SQLServerNVarCharTypeTest.java @@ -21,7 +21,7 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.AfterEach; @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10529") +@JiraKey(value = "HHH-10529") @RequiresDialect(value = SQLServerDialect.class) public class SQLServerNVarCharTypeTest { private StandardServiceRegistry ssr; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/SmallIntToShortClassMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/SmallIntToShortClassMappingTest.java index cf00787d23..0ff47c703e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/SmallIntToShortClassMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/SmallIntToShortClassMappingTest.java @@ -18,7 +18,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -35,7 +35,7 @@ public class SmallIntToShortClassMappingTest extends BaseEntityManagerFunctional } @Test - @TestForIssue(jiraKey = "HHH-12115") + @JiraKey(value = "HHH-12115") public void testShortType() { doInJPA( this::entityManagerFactory, entityManager -> { Event event = new Event(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeAndTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeAndTimestampTest.java index 4b240aac64..c639fdf6b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeAndTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeAndTimestampTest.java @@ -18,7 +18,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.OracleDialect; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-10465") +@JiraKey(value = "HHH-10465") @SkipForDialect(MariaDBDialect.class) @SkipForDialect(MySQLDialect.class) @SkipForDialect(value = OracleDialect.class, comment = "Oracle date does not support milliseconds ") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java index 6502be63b0..e972cfca2f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -37,7 +37,7 @@ import static org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator.safeRandom } ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15417") +@JiraKey(value = "HHH-15417") public class UUIDTypeConverterTest { @AfterEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java index ff94b271ff..44973eedf0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java @@ -18,7 +18,7 @@ import org.hibernate.dialect.OracleDialect; import org.hibernate.dialect.SybaseDialect; import org.hibernate.type.SqlTypes; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -41,7 +41,7 @@ import jakarta.persistence.TypedQuery; annotatedClasses = VarbinaryArrayTest.EntityWithArrays.class ) @SessionFactory -@TestForIssue(jiraKey = "HHH-16085") +@JiraKey(value = "HHH-16085") @SkipForDialect(dialectClass = SybaseDialect.class, matchSubTypes = true) public class VarbinaryArrayTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java index f9973bc440..a117c7a0d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/ZonedDateTimeTest.java @@ -32,7 +32,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.SybaseDialect; import org.hibernate.type.StandardBasicTypes; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import org.junit.runners.Parameterized; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-10372") +@JiraKey(value = "HHH-10372") public class ZonedDateTimeTest extends AbstractJavaTimeTypeTest { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java index ab3fa4ebf3..05af919f46 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayCustomTypeTest.java @@ -12,7 +12,7 @@ import org.hibernate.annotations.Type; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.Basic; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-11409" ) +@JiraKey( value = "HHH-11409" ) public class ArrayCustomTypeTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java index cdc25e25d8..470b47b53d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeCompositionTest.java @@ -12,7 +12,7 @@ import org.hibernate.annotations.JavaType; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.Query; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.Entity; @@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue; /** * @author Vlad Mihalcea */ -@TestForIssue( jiraKey = "HHH-11409" ) +@JiraKey( value = "HHH-11409" ) public class ArrayTypeCompositionTest extends BaseEntityManagerFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java index 182296ae27..1e13aa7b95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java @@ -30,7 +30,7 @@ import java.util.UUID; import org.hibernate.query.criteria.HibernateCriteriaBuilder; import org.hibernate.query.criteria.JpaCriteriaQuery; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.domain.StandardDomainModel; import org.hibernate.testing.orm.domain.gambit.BasicEntity; import org.hibernate.testing.orm.junit.DomainModel; @@ -43,7 +43,7 @@ import org.junit.jupiter.params.provider.MethodSource; @ServiceRegistry @DomainModel( standardModels = StandardDomainModel.GAMBIT ) @SessionFactory -@TestForIssue(jiraKey = "HHH-15590") +@JiraKey(value = "HHH-15590") public class LiteralRenderingTest { public static List literalValues() throws Exception { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/jdbc/ArrayJdbcTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/jdbc/ArrayJdbcTypeTest.java index 22d5a3125e..6aa80335ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/jdbc/ArrayJdbcTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/jdbc/ArrayJdbcTypeTest.java @@ -1,6 +1,6 @@ package org.hibernate.orm.test.type.descriptor.jdbc; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.type.descriptor.jdbc.ArrayJdbcType; import org.hibernate.type.descriptor.jdbc.BigIntJdbcType; import org.hibernate.type.descriptor.jdbc.IntegerJdbcType; @@ -14,7 +14,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class ArrayJdbcTypeTest { @Test - @TestForIssue(jiraKey = "HHH-17662") + @JiraKey(value = "HHH-17662") public void testEquality() { Map typeMap = new HashMap<>(); JdbcType bigInt = new BigIntJdbcType(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java index ffa056f20e..01b2446712 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.typedescriptor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -48,7 +48,7 @@ public class ByteTest { } @Test - @TestForIssue(jiraKey = "HHH-6533") + @JiraKey(value = "HHH-6533") public void testByteDataPersistenceAndRetrieval(SessionFactoryScope scope) { scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java index 46f52cf5bd..b3a8db2391 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.typedescriptor; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -49,7 +49,7 @@ public class CharInNativeQueryTest { } @Test - @TestForIssue(jiraKey = "HHH-2304") + @JiraKey(value = "HHH-2304") public void testNativeQuery(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefPropertyRefTest.java index 77b874bcac..7d88c0db28 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefPropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefPropertyRefTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.unidir; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-9370") +@JiraKey( value = "HHH-9370") @FailureExpected( jiraKey = "HHH-9370") public class BackrefPropertyRefTest extends BackrefTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java index f888fefee3..0c14c094da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java @@ -19,7 +19,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -39,7 +39,7 @@ public class UnidirectionalOneToManyNonPkJoinColumnTest extends BaseEntityManage } @Test - @TestForIssue( jiraKey = "HHH-12064" ) + @JiraKey( value = "HHH-12064" ) public void test() { doInJPA( this::entityManagerFactory, entityManager -> { // Save the entity on the One side diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java index 14cf8de558..899d4ff3ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java @@ -17,7 +17,7 @@ import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.query.Query; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jdbc.SQLServerSnapshotIsolationConnectionProvider; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.junit.jupiter.api.Test; @@ -466,7 +466,7 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { } @Test - @TestForIssue(jiraKey = "HHH-11740") + @JiraKey(value = "HHH-11740") public void testBulkOperationsWithDifferentConnections() throws Exception { inTransaction( s -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java index eb66d374f3..da122bbdb2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; @@ -20,7 +20,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Strong Liu */ -@TestForIssue( jiraKey = "HHH-4825" ) +@JiraKey( value = "HHH-4825" ) public class SellCarTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/PrimitiveArrayNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/PrimitiveArrayNaturalIdTest.java index d2f93d444c..dde9f2e47e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/PrimitiveArrayNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/uniquekey/PrimitiveArrayNaturalIdTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.uniquekey; import org.hibernate.NaturalIdLoadAccess; import org.hibernate.annotations.NaturalId; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestForIssue(jiraKey = "HHH-15784") +@JiraKey(value = "HHH-15784") @DomainModel(annotatedClasses = PrimitiveArrayNaturalIdTest.HashedContent.class) @SessionFactory public class PrimitiveArrayNaturalIdTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java index 1324844879..84d775551f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Version; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -24,7 +24,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-10026" ) +@JiraKey( value = "HHH-10026" ) public class InstantVersionTest extends BaseNonConfigCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java index d9b8d36865..d8ef1f6272 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Version; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -24,7 +24,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-10026" ) +@JiraKey( value = "HHH-10026" ) public class LocalDateTimeVersionTest extends BaseNonConfigCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java index a197a4ad49..dbf3ef5de3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Version; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -24,7 +24,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-10026" ) +@JiraKey( value = "HHH-10026" ) public class OffsetDateTimeVersionTest extends BaseNonConfigCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/UserVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/UserVersionTest.java index ea266818ae..f6799436de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/UserVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/UserVersionTest.java @@ -12,7 +12,7 @@ import org.hibernate.boot.MetadataBuilder; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.usertype.UserVersionType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ import org.hamcrest.CoreMatchers; import static org.hamcrest.MatcherAssert.assertThat; -@TestForIssue( jiraKey = "HHH-15240") +@JiraKey( value = "HHH-15240") public class UserVersionTest extends BaseSessionFactoryFunctionalTest { private static long versionValue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java index b2d7988bba..ead9c51e29 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java @@ -16,7 +16,7 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; @@ -68,7 +68,7 @@ public class VersionTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-11549") + @JiraKey( value = "HHH-11549") public void testMetamodelContainsHbmVersion() { try (Session session = openSession()) { session.getMetamodel().entity( Person.class ).getAttribute( "version" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java index ba334e7871..83639da82b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Version; import org.hibernate.Session; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -24,7 +24,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * @author Steve Ebersole */ -@TestForIssue( jiraKey = "HHH-10026" ) +@JiraKey( value = "HHH-10026" ) public class ZonedDateTimeVersionTest extends BaseNonConfigCoreFunctionalTestCase { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java index 9cb1aa0711..cd143a8062 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -23,7 +23,7 @@ import static org.junit.Assert.assertThat; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11549") +@JiraKey(value = "HHH-11549") public class HbmMappingMappedSuperclassWithVersionTest extends BaseEntityManagerFunctionalTestCase { @Override public String[] getMappings() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java index 69a2c049c1..992359a039 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java @@ -15,7 +15,7 @@ import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType; import org.hibernate.type.descriptor.jdbc.VarbinaryJdbcType; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue; public class SybaseTimestampComparisonAnnotationsTest extends BaseCoreFunctionalTestCase { @Test - @TestForIssue( jiraKey = "HHH-10413" ) + @JiraKey( value = "HHH-10413" ) public void testComparableTimestamps() { final BasicType versionType = sessionFactory() .getMappingMetamodel() diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java index 6550cec4a6..ae70766785 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java @@ -14,7 +14,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.dialect.SybaseASEDialect; @@ -259,7 +259,7 @@ public class SybaseTimestampVersioningTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-10413" ) + @JiraKey( value = "HHH-10413" ) public void testComparableTimestamps() { final BasicType versionType = sessionFactory() .getMappingMetamodel() diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java index a261e2be2a..7f437eda18 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java @@ -6,7 +6,7 @@ import java.util.List; import org.hibernate.annotations.SQLRestriction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -30,7 +30,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; EagerManyToOne2Test.Parent.class } ) -@TestForIssue(jiraKey = "HHH-15902") +@JiraKey(value = "HHH-15902") public class EagerManyToOne2Test { @AfterEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java index 0b7cd3a3ec..bd55951e55 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java @@ -6,7 +6,7 @@ import java.util.List; import org.hibernate.annotations.SQLRestriction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; @@ -29,7 +29,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; EagerManyToOne3Test.Child.class, EagerManyToOne3Test.Parent.class }) -@TestForIssue(jiraKey = "HHH-15902") +@JiraKey(value = "HHH-15902") public class EagerManyToOne3Test { @AfterEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java index be4e871a7c..7fffd55eba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java @@ -26,7 +26,7 @@ import org.hibernate.annotations.NotFoundAction; import org.hibernate.annotations.SQLRestriction; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -47,7 +47,7 @@ public class EagerManyToOneFetchModeJoinWhereTest extends BaseNonConfigCoreFunct } @Test - @TestForIssue( jiraKey = "HHH-12104" ) + @JiraKey( value = "HHH-12104" ) @FailureExpected( jiraKey = "HHH-12104") public void testAssociatedWhereClause() { Product product = new Product(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java index baf2ed8b98..5666cd56c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java @@ -5,13 +5,10 @@ import java.util.Date; import java.util.List; import org.hibernate.annotations.SQLRestriction; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; -import org.hibernate.testing.orm.junit.Setting; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java index b029b05433..67f0975822 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.Table; import org.hibernate.annotations.SQLJoinTableRestriction; import org.hibernate.annotations.SQLRestriction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -46,7 +46,7 @@ public class EagerToManyWhereTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-13011" ) + @JiraKey( value = "HHH-13011" ) public void testAssociatedWhereClause() { Product product = new Product(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereViaAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereViaAnnotationTest.java index 2c1b4bdac2..8cf67de211 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereViaAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereViaAnnotationTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import org.hibernate.annotations.SQLJoinTableRestriction; import org.hibernate.annotations.SQLRestriction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -44,7 +44,7 @@ public class EagerToManyWhereUseClassWhereViaAnnotationTest extends BaseNonConfi } @Test - @TestForIssue( jiraKey = "HHH-15936" ) + @JiraKey( value = "HHH-15936" ) public void testAssociatedWhereClause() { Product product = new Product(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java index eec4395671..4ac36753eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java @@ -24,7 +24,7 @@ import org.hibernate.annotations.Immutable; import org.hibernate.annotations.SQLRestriction; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -140,7 +140,7 @@ public class LazyElementCollectionBasicNonUniqueIdWhereTest extends BaseCoreFunc } @Test - @TestForIssue( jiraKey = "HHH-12937") + @JiraKey( value = "HHH-12937") public void testInitializeFromUniqueAssociationTable() { Session session = openSession(); session.beginTransaction(); @@ -160,7 +160,7 @@ public class LazyElementCollectionBasicNonUniqueIdWhereTest extends BaseCoreFunc } @Test - @TestForIssue( jiraKey = "HHH-12937") + @JiraKey( value = "HHH-12937") public void testInitializeFromNonUniqueAssociationTable() { Session session = openSession(); session.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java index ea71b3e592..80f166d5a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java @@ -29,7 +29,7 @@ import org.hibernate.annotations.Immutable; import org.hibernate.annotations.SQLRestriction; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -144,7 +144,7 @@ public class LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest extends } @Test - @TestForIssue( jiraKey = "HHH-12937") + @JiraKey( value = "HHH-12937") public void testInitializeFromUniqueAssociationTable() { Session session = openSession(); session.beginTransaction(); @@ -167,7 +167,7 @@ public class LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest extends } @Test - @TestForIssue( jiraKey = "HHH-12937") + @JiraKey( value = "HHH-12937") public void testInitializeFromNonUniqueAssociationTable() { Session session = openSession(); session.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java index a49d225d77..2d36a9692f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java @@ -27,7 +27,7 @@ import org.hibernate.annotations.SQLRestriction; import org.hibernate.cfg.Configuration; import org.hibernate.metamodel.CollectionClassification; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -175,7 +175,7 @@ public class LazyManyToManyNonUniqueIdWhereTest extends BaseCoreFunctionalTestCa } @Test - @TestForIssue( jiraKey = "HHH-12875") + @JiraKey( value = "HHH-12875") public void testInitializeFromUniqueAssociationTable() { doInHibernate( this::sessionFactory, session -> { @@ -202,7 +202,7 @@ public class LazyManyToManyNonUniqueIdWhereTest extends BaseCoreFunctionalTestCa } @Test - @TestForIssue( jiraKey = "HHH-12875") + @JiraKey( value = "HHH-12875") public void testInitializeFromNonUniqueAssociationTable() { doInHibernate( this::sessionFactory, session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java index 232cd76172..e51869c123 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java @@ -24,7 +24,7 @@ import org.hibernate.annotations.SQLRestriction; import org.hibernate.cfg.Configuration; import org.hibernate.metamodel.CollectionClassification; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -111,7 +111,7 @@ public class LazyOneToManyNonUniqueIdWhereTest extends BaseCoreFunctionalTestCas } @Test - @TestForIssue( jiraKey = "HHH-12875") + @JiraKey( value = "HHH-12875") public void testInitializeFromNonUniqueAssociationTable() { doInHibernate( this::sessionFactory, session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java index 71932735a8..ed010a5a04 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.Table; import org.hibernate.annotations.SQLJoinTableRestriction; import org.hibernate.annotations.SQLRestriction; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -46,7 +46,7 @@ public class LazyToManyWhereTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-13011" ) + @JiraKey( value = "HHH-13011" ) public void testAssociatedWhereClause() { Product product = new Product(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/NullWhereClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/NullWhereClauseTest.java index 7ccb5786c7..dde86ff281 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/NullWhereClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/NullWhereClauseTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.where.annotations; import org.hibernate.annotations.SQLRestriction; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; @@ -20,7 +20,7 @@ import jakarta.persistence.Table; @Setting(name = AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, value = "true"), } ) -@TestForIssue(jiraKey = "HHH-15358") +@JiraKey(value = "HHH-15358") public class NullWhereClauseTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java index d829b2bdc4..e3a1e35854 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java @@ -10,7 +10,7 @@ import java.util.HashSet; import java.util.Set; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -36,7 +36,7 @@ public class EagerManyToOneFetchModeJoinWhereTest extends BaseNonConfigCoreFunct } @Test - @TestForIssue( jiraKey = "HHH-12104" ) + @JiraKey( value = "HHH-12104" ) @FailureExpected( jiraKey = "HHH-12104") public void testAssociatedWhereClause() { Product product = new Product(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java index f772be6dc6..3e84b60f5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java @@ -12,7 +12,7 @@ import java.util.Set; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -38,7 +38,7 @@ public class EagerManyToOneFetchModeSelectWhereTest extends BaseNonConfigCoreFun } @Test - @TestForIssue( jiraKey = "HHH-12104" ) + @JiraKey( value = "HHH-12104" ) public void testAssociatedWhereClause() { Product product = new Product(); Category category = new Category(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java index b95bd50e1c..48015f5675 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -39,7 +39,7 @@ public class EagerToManyWhereTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-13011" ) + @JiraKey( value = "HHH-13011" ) public void testAssociatedWhereClause() { Product product = new Product(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereUseClassWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereUseClassWhereTest.java index 189edfa711..2f8a4bb11f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereUseClassWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereUseClassWhereTest.java @@ -8,14 +8,10 @@ package org.hibernate.orm.test.where.hbm; import java.util.Arrays; import java.util.HashSet; -import java.util.Map; import java.util.Set; -import org.hibernate.cfg.AvailableSettings; - -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java index 72ebb37fb7..4f5c06c12c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java @@ -15,7 +15,7 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -137,7 +137,7 @@ public class LazyElementCollectionBasicNonUniqueIdWhereTest extends BaseCoreFunc } @Test - @TestForIssue( jiraKey = "HHH-12937") + @JiraKey( value = "HHH-12937") public void testInitializeFromUniqueAssociationTable() { Session session = openSession(); session.beginTransaction(); @@ -157,7 +157,7 @@ public class LazyElementCollectionBasicNonUniqueIdWhereTest extends BaseCoreFunc } @Test - @TestForIssue( jiraKey = "HHH-12937") + @JiraKey( value = "HHH-12937") public void testInitializeFromNonUniqueAssociationTable() { Session session = openSession(); session.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java index 9e6d4c4db2..8a4bc9ac05 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java @@ -15,7 +15,7 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -136,7 +136,7 @@ public class LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest extends } @Test - @TestForIssue( jiraKey = "HHH-12937") + @JiraKey( value = "HHH-12937") public void testInitializeFromUniqueAssociationTable() { Session session = openSession(); session.beginTransaction(); @@ -158,7 +158,7 @@ public class LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest extends } @Test - @TestForIssue( jiraKey = "HHH-12937") + @JiraKey( value = "HHH-12937") public void testInitializeFromNonUniqueAssociationTable() { Session session = openSession(); session.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java index 49e745038c..6425d02cd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.where.hbm; import java.util.HashSet; import java.util.Set; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -168,7 +168,7 @@ public class LazyManyToManyNonUniqueIdNotFoundWhereTest extends BaseCoreFunction } @Test - @TestForIssue( jiraKey = "HHH-12875" ) + @JiraKey( value = "HHH-12875" ) public void testInitializeFromUniqueAssociationTable() { doInHibernate( this::sessionFactory, session -> { @@ -197,7 +197,7 @@ public class LazyManyToManyNonUniqueIdNotFoundWhereTest extends BaseCoreFunction } @Test - @TestForIssue( jiraKey = "HHH-12875" ) + @JiraKey( value = "HHH-12875" ) public void testInitializeFromNonUniqueAssociationTable() { doInHibernate( this::sessionFactory, session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java index a67cf8de3c..a38b22575b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java @@ -14,7 +14,7 @@ import java.util.Set; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -160,7 +160,7 @@ public class LazyManyToManyNonUniqueIdWhereTest extends BaseCoreFunctionalTestCa } @Test - @TestForIssue( jiraKey = "HHH-12875") + @JiraKey( value = "HHH-12875") public void testInitializeFromUniqueAssociationTable() { doInHibernate( this::sessionFactory, session -> { @@ -187,7 +187,7 @@ public class LazyManyToManyNonUniqueIdWhereTest extends BaseCoreFunctionalTestCa } @Test - @TestForIssue( jiraKey = "HHH-12875") + @JiraKey( value = "HHH-12875") public void testInitializeFromNonUniqueAssociationTable() { doInHibernate( this::sessionFactory, session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java index 680795f4a0..6000f2f799 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java @@ -14,7 +14,7 @@ import java.util.Set; import org.hibernate.Hibernate; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; import org.junit.Before; @@ -97,7 +97,7 @@ public class LazyOneToManyNonUniqueIdWhereTest extends BaseCoreFunctionalTestCas } @Test - @TestForIssue( jiraKey = "HHH-12875") + @JiraKey( value = "HHH-12875") public void testInitializeFromNonUniqueAssociationTable() { doInHibernate( this::sessionFactory, session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereTest.java index a68b3c3f86..9e94135c03 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyToManyWhereTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -39,7 +39,7 @@ public class LazyToManyWhereTest extends BaseNonConfigCoreFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-13011" ) + @JiraKey( value = "HHH-13011" ) public void testAssociatedWhereClause() { Product product = new Product(); diff --git a/hibernate-core/src/test/java/org/hibernate/tool/schema/internal/AbstractSchemaMigratorTest.java b/hibernate-core/src/test/java/org/hibernate/tool/schema/internal/AbstractSchemaMigratorTest.java index 1c56ba8301..a7776095eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/tool/schema/internal/AbstractSchemaMigratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/tool/schema/internal/AbstractSchemaMigratorTest.java @@ -17,7 +17,7 @@ import org.hibernate.boot.model.relational.QualifiedTableName; import org.hibernate.boot.model.relational.SqlStringGenerationContext; import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.internal.Formatter; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.tool.schema.extract.internal.ColumnInformationImpl; import org.hibernate.tool.schema.extract.internal.ForeignKeyInformationImpl; import org.hibernate.tool.schema.extract.spi.DatabaseInformation; @@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock; public class AbstractSchemaMigratorTest { @Test - @TestForIssue(jiraKey = "HHH-13779") + @JiraKey(value = "HHH-13779") public void testForeignKeyPreExistenceDetectionIgnoresCaseForTableAndColumnName() { final AbstractSchemaMigrator schemaMigrator = new AbstractSchemaMigrator(null, null) { @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java index 955ee5d89d..74ab2e7a82 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java @@ -29,7 +29,7 @@ import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9108") +@JiraKey(value = "HHH-9108") public class EmbeddableWithCollectionTest extends BaseEnversJPAFunctionalTestCase { private Long headerId; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/DurationTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/DurationTest.java index f691d43927..9cccc8183c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/DurationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/DurationTest.java @@ -14,7 +14,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.CustomType; import org.hibernate.usertype.UserType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.Entity; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.time.Duration; -@TestForIssue(jiraKey = "HHH-17243") +@JiraKey(value = "HHH-17243") public class DurationTest extends BaseEnversJPAFunctionalTestCase{ @Entity(name = "Duration") diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java index b3ce90a2be..cf2a7a2978 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java @@ -20,7 +20,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.CustomType; import org.hibernate.usertype.UserType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.Entity; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12304") +@JiraKey(value = "HHH-12304") public class ExtendedEnumTypeTest extends BaseEnversJPAFunctionalTestCase { // An extended type to trigger the need for Envers to supply type information in the HBM mappings. diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java index bb138dec0d..a7f726dddb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java @@ -14,14 +14,14 @@ import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7870") +@JiraKey(value = "HHH-7870") public class ObjectUserTypeTest extends BaseEnversJPAFunctionalTestCase { private int id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java index 443d288b6c..7f39355011 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java @@ -21,13 +21,13 @@ import org.hibernate.type.StandardBasicTypes; import org.junit.Assert; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.envers.RequiresAuditStrategy; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7780") +@JiraKey(value = "HHH-7780") @RequiresAuditStrategy(DefaultAuditStrategy.class) public class UnspecifiedEnumTypeTest extends BaseEnversFunctionalTestCase { private Long id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java index e34076140f..4979c1dbd8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java @@ -16,7 +16,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -90,13 +90,13 @@ public class Lobs extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-10734") + @JiraKey(value = "HHH-10734") public void testRevisionsCountsForAuditedArraysWithNoChanges() { assertEquals( Arrays.asList( 3 ), getAuditReader().getRevisions( LobTestEntity.class, id2 ) ); } @Test - @TestForIssue(jiraKey = "HHH-10734") + @JiraKey(value = "HHH-10734") public void testHistoryOfId2() { LobTestEntity ver1 = new LobTestEntity( id2, "abc", new byte[]{ 0, 1, 2 }, new char[]{ 'x', 'y', 'z' } ); assertEquals( getAuditReader().find( LobTestEntity.class, id2, 3 ), ver1 ); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java index ce7456da9d..1b4768458a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java @@ -26,7 +26,7 @@ import org.hibernate.orm.test.envers.integration.components.dynamic.ManyToManyEn import org.hibernate.orm.test.envers.integration.components.dynamic.ManyToOneEntity; import org.hibernate.orm.test.envers.integration.components.dynamic.OneToOneEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import junit.framework.Assert; @@ -36,7 +36,7 @@ import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; * @author Lukasz Zuchowski (author at zuchos dot com) * More advanced tests for dynamic component. */ -@TestForIssue(jiraKey = "HHH-8049") +@JiraKey(value = "HHH-8049") public class AuditedDynamicComponentsAdvancedCasesTest extends BaseEnversFunctionalTestCase { public static final String PROP_BOOLEAN = "propBoolean"; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java index a5afb867c1..be4ad702ac 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java @@ -9,7 +9,7 @@ package org.hibernate.envers.test.integration.manytoone.lazy; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; * * @author Luke Chen */ -@TestForIssue(jiraKey = "HHH-13945") +@JiraKey(value = "HHH-13945") @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) public class ManyToOneLazyDeleteTest extends BaseEnversFunctionalTestCase { private Long shipmentId; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java index 53d6410784..9001fb3549 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java @@ -17,7 +17,7 @@ import org.junit.Test; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-13760") +@JiraKey(value = "HHH-13760") @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class) public class ManyToOneLazyFetchTest extends BaseEnversFunctionalTestCase { private Long shipmentId; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java index c115ce3196..22dfc20ba5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java @@ -13,7 +13,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.onetoone.bidirectional.BiRefedOptionalEntity; import org.hibernate.orm.test.envers.integration.onetoone.bidirectional.BiRefingOptionalEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-8305") +@JiraKey(value = "HHH-8305") public class BidirectionalOneToOneOptionalTest extends BaseEnversJPAFunctionalTestCase { private Integer refingWithNoRefedId; private Integer refingId; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java index d234f5b276..8b922ef598 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java @@ -20,7 +20,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import static org.hibernate.envers.query.AuditEntity.disjunction; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11383") +@JiraKey(value = "HHH-11383") public class InheritanceAssociationToOneInnerJoinTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java index 2bdc98febe..4f23324449 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java @@ -28,7 +28,7 @@ import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12992") +@JiraKey(value = "HHH-12992") public class OrderByOneAuditEntityTest extends BaseEnversJPAFunctionalTestCase { @Entity(name = "Parent") @Audited diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java index 8281018538..52b790fb7e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java @@ -23,7 +23,7 @@ import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12992") +@JiraKey(value = "HHH-12992") public class OrderByThreeEntityTest extends BaseEnversJPAFunctionalTestCase { @Entity(name = "Container") @Audited diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java index 779d1ad5ec..e6c29cb054 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java @@ -27,7 +27,7 @@ import org.hibernate.envers.RelationTargetAuditMode; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12992") +@JiraKey(value = "HHH-12992") public class OrderByTwoEntityOneAuditedTest extends BaseEnversJPAFunctionalTestCase { @Entity(name = "Parent") @Audited diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java index d724b0cee2..d9c03eabd9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java @@ -27,7 +27,7 @@ import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12992") +@JiraKey(value = "HHH-12992") public class OrderByTwoEntityTest extends BaseEnversJPAFunctionalTestCase { @Entity(name = "Parent") @Audited diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java index b371192e63..b202e3ff59 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java @@ -23,7 +23,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import static org.junit.Assert.assertEquals; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11748") +@JiraKey(value = "HHH-11748") public class EmbeddedIdRelatedIdQueryTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java index 9a4fa551f2..771669e741 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java @@ -22,7 +22,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import static org.junit.Assert.assertEquals; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11748") +@JiraKey(value = "HHH-11748") public class IdClassRelatedIdQueryTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java index fe29414634..20798db1dd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java @@ -21,7 +21,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import static org.junit.Assert.assertEquals; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11748") +@JiraKey(value = "HHH-11748") public class MultipleIdRelatedIdQueryTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/BasicModelingTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/BasicModelingTest.java index cd25027e3b..e27ef49ceb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/BasicModelingTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/BasicModelingTest.java @@ -15,7 +15,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.envers.AbstractEnversTest; import org.hibernate.mapping.PersistentClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertNotNull; */ public class BasicModelingTest extends AbstractEnversTest { @Test - @TestForIssue( jiraKey = "HHH-9042" ) + @JiraKey( value = "HHH-9042" ) public void testMetamodelBuilding() { StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder() .applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" ) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java index 2089f6d254..2c766d4ea1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java @@ -16,7 +16,7 @@ import org.hibernate.property.access.internal.PropertyAccessStrategyBasicImpl; import org.hibernate.property.access.spi.PropertyAccess; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12063") +@JiraKey(value = "HHH-12063") public class AttributeAccessorTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java index ec44e86edc..287b0b0a5e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java @@ -16,7 +16,7 @@ import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; @@ -82,7 +82,7 @@ public class AuditReaderAPITest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7555" ) + @JiraKey( value = "HHH-7555" ) public void testFindRevisionEntitiesWithoutDeletions() { List revisionInfos = getAuditReader().createQuery() .forRevisionsOfEntity( AuditedTestEntity.class, false ) @@ -92,7 +92,7 @@ public class AuditReaderAPITest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7555" ) + @JiraKey( value = "HHH-7555" ) public void testFindRevisionEntitiesWithDeletions() { List revisionInfos = getAuditReader().createQuery() .forRevisionsOfEntity( AuditedTestEntity.class, true ) @@ -102,7 +102,7 @@ public class AuditReaderAPITest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-7555" ) + @JiraKey( value = "HHH-7555" ) public void testFindRevisionEntitiesNonAuditedEntity() { try { List revisionInfos = getAuditReader().createQuery() diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/FindByRevisionExactMatchOptionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/FindByRevisionExactMatchOptionTest.java index 4f8978bb80..c69906176f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/FindByRevisionExactMatchOptionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/FindByRevisionExactMatchOptionTest.java @@ -16,7 +16,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.IntNoAutoIdTestEntity; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static junit.framework.TestCase.assertNull; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-13500") +@JiraKey(value = "HHH-13500") public class FindByRevisionExactMatchOptionTest extends BaseEnversJPAFunctionalTestCase { @Override protected void addConfigOptions(Map options) { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java index 48dc817708..6272aceb4a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java @@ -14,7 +14,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.ComparisonFailure; import org.junit.Test; @@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-10844") +@JiraKey(value = "HHH-10844") @RequiresDialect(value = H2Dialect.class) public class BasicTypeColumnDefinitionTest extends BaseEnversJPAFunctionalTestCase { @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java index 36e9259ea9..2d1b2e4156 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java @@ -21,7 +21,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertTrue; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11988") +@JiraKey(value = "HHH-11988") public class BigDecimalTypeTest extends BaseEnversJPAFunctionalTestCase { private Integer entityId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java index 79124e1d59..1d877fc86e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java @@ -15,14 +15,14 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; import org.hibernate.orm.test.envers.integration.basic.ScalePrecisionEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7003") +@JiraKey(value = "HHH-7003") public class ColumnScalePrecisionTest extends BaseEnversJPAFunctionalTestCase { private Table auditTable = null; private Table originalTable = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java index de9a5c996f..998a224d4f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java @@ -15,14 +15,14 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import junit.framework.Assert; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7246") +@JiraKey(value = "HHH-7246") @RequiresDialect(OracleDialect.class) public class EmptyStringTest extends BaseEnversJPAFunctionalTestCase { private Integer emptyId = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java index 00a2588116..ca3842c739 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java @@ -18,13 +18,13 @@ import org.hibernate.orm.test.envers.integration.collection.norevision.Name; import org.hibernate.orm.test.envers.integration.collection.norevision.Person; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-5565") +@JiraKey(value = "HHH-5565") @SkipForDialect(value = MySQLDialect.class, comment = "The test hangs on") public class OutsideTransactionTest extends BaseEnversFunctionalTestCase { @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java index bd51735b9d..091b6fc205 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java @@ -19,7 +19,7 @@ import org.hibernate.event.spi.EventType; import org.hibernate.event.spi.PostInsertEvent; import org.hibernate.event.spi.PostInsertEventListener; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -33,7 +33,7 @@ public class RegisterUserEventListenersTest extends BaseEnversFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-7478") + @JiraKey(value = "HHH-7478") public void testTransactionProcessSynchronization() { final EventListenerRegistry registry = sessionFactory().getServiceRegistry() .getService( EventListenerRegistry.class ); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundConfigTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundConfigTest.java index 189f0c4413..5b3f31b2f8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundConfigTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundConfigTest.java @@ -20,7 +20,7 @@ import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertNotNull; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertNull; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-8051") +@JiraKey(value = "HHH-8051") public class RelationTargetNotFoundConfigTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundLegacyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundLegacyTest.java index 7021196251..144810fffd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundLegacyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundLegacyTest.java @@ -18,7 +18,7 @@ import org.hibernate.envers.RelationTargetAuditMode; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -32,7 +32,7 @@ import static org.junit.Assert.fail; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-8051") +@JiraKey(value = "HHH-8051") public class RelationTargetNotFoundLegacyTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundTest.java index 2c9fb8673b..f9ec97f008 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RelationTargetNotFoundTest.java @@ -18,7 +18,7 @@ import org.hibernate.envers.RelationTargetNotFoundAction; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertNotNull; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertNull; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-8051") +@JiraKey(value = "HHH-8051") public class RelationTargetNotFoundTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java index 890828499b..850eaf479d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java @@ -12,7 +12,7 @@ import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.entities.IntTestEntity; import org.hibernate.internal.SessionImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -37,7 +37,7 @@ public class TransactionRollbackBehaviour extends BaseEnversJPAFunctionalTestCas } @Test - @TestForIssue(jiraKey = "HHH-8189") + @JiraKey(value = "HHH-8189") public void testFlushedAuditRecordsRollback() { // default auto-clear behavior testAuditRecordsRollbackBehavior( true, null ); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.java index a43d086cfa..53c515f5d6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.java @@ -17,7 +17,7 @@ import org.hibernate.orm.test.envers.entities.collection.StringSetEntity; import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11901") +@JiraKey(value = "HHH-11901") public class CollectionNullValueTest extends BaseEnversJPAFunctionalTestCase { private Integer mapId; private Integer listId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java index 44256ba615..00bd6094d7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java @@ -28,12 +28,12 @@ import org.hibernate.orm.test.envers.Priority; import org.junit.Assert; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-13080") +@JiraKey(value = "HHH-13080") public class DetachedCollectionChangeTest extends BaseEnversJPAFunctionalTestCase { @Audited @Entity(name = "Alert") diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java index e88e546b41..9cbf68e637 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java @@ -26,7 +26,7 @@ import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionEntit import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEntity1; import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEntity2; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.junit.Test; @@ -40,7 +40,7 @@ import static org.junit.Assert.assertNotNull; * * @author Erik-Berndt Scheper */ -@TestForIssue(jiraKey = "HHH-6349") +@JiraKey(value = "HHH-6349") @SkipForDialect(value = OracleDialect.class, comment = "Oracle does not support identity key generation") @SkipForDialect(value = AltibaseDialect.class, diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java index 46c1bd5f17..79402e195e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java @@ -12,7 +12,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.entities.collection.EmbeddableSetEntity; import org.hibernate.orm.test.envers.entities.components.Component3; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -28,7 +28,7 @@ public class EmbeddableSet extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-9199") + @JiraKey(value = "HHH-9199") public void testRemoval() { EntityManager em = getEntityManager(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapCompositeElementTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapCompositeElementTest.java index e111ebe10c..2951dd2238 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapCompositeElementTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapCompositeElementTest.java @@ -20,7 +20,7 @@ import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import static org.junit.Assert.assertEquals; @@ -29,7 +29,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11841") +@JiraKey(value = "HHH-11841") public class EntityMapCompositeElementTest extends BaseEnversJPAFunctionalTestCase { private Category category; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java index 5e4dc18a8a..ec2a26113e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java @@ -22,7 +22,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -37,7 +37,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11892") +@JiraKey(value = "HHH-11892") public class EntityMapTest extends BaseEnversJPAFunctionalTestCase { private A a; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java index 6f152a3686..7b32678bb8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java @@ -21,7 +21,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertTrue; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12018") +@JiraKey(value = "HHH-12018") public class EntitySameMapKeyMultiMapValueTest extends BaseEnversJPAFunctionalTestCase { private Integer otherEntityId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java index 68c6f76463..78ec584e70 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java @@ -13,7 +13,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.collection.EnumMapEntity; import org.hibernate.orm.test.envers.entities.collection.EnumMapType; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-6374") +@JiraKey(value = "HHH-6374") public class EnumMapTest extends BaseEnversJPAFunctionalTestCase { private Integer entityId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java index 2489005425..64fcf95d6b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java @@ -28,7 +28,7 @@ import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity.E1; import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity.E2; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.type.SqlTypes; import org.junit.Test; @@ -114,7 +114,7 @@ public class EnumSet extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7780") + @JiraKey(value = "HHH-7780") public void testEnumRepresentation() { EntityManager entityManager = getEntityManager(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java index f8ac78c85f..58d93a291c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java @@ -18,7 +18,7 @@ import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-7940") +@JiraKey(value = "HHH-7940") public class IndexColumnListTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java index 8a172e04a6..deb95c2ba9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-7940") +@JiraKey(value = "HHH-7940") public class OrderColumnListTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java index 8145d6d628..2c0e9eca43 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java @@ -26,7 +26,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -35,7 +35,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9834") +@JiraKey(value = "HHH-9834") @SkipForDialect(OracleDialect.class) @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-11477", comment = "@Lob field in HQL predicate fails with error about text = bigint") @SkipForDialect(value = HANADialect.class, comment = "HANA doesn't support comparing LOBs with the = operator") diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java index ec3c5a9e70..7c80e0ef14 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java @@ -27,7 +27,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9834") +@JiraKey(value = "HHH-9834") @SkipForDialect(OracleDialect.class) @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-11477", comment = "@Lob field in HQL predicate fails with error about text = bigint") @SkipForDialect(value = HANADialect.class, comment = "HANA doesn't support comparing LOBs with the = operator") diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java index 82d59ca5d9..ce31b2de10 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java @@ -12,14 +12,14 @@ import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import junit.framework.Assert; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-6613") +@JiraKey(value = "HHH-6613") public class BasicEmbeddableCollection extends BaseEnversJPAFunctionalTestCase { private int id = -1; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java index db60f582e3..248620a656 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java @@ -16,7 +16,7 @@ import org.hibernate.orm.test.envers.entities.collection.EmbeddableListEntity1; import org.hibernate.orm.test.envers.entities.components.Component3; import org.hibernate.orm.test.envers.entities.components.Component4; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals; /** * @author Kristoffer Lundberg (kristoffer at cambio dot se) */ -@TestForIssue(jiraKey = "HHH-6613") +@JiraKey(value = "HHH-6613") public class EmbeddableList1 extends BaseEnversJPAFunctionalTestCase { private Integer ele1_id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java index c2a84d8923..2072629189 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java @@ -15,7 +15,7 @@ import org.hibernate.orm.test.envers.entities.StrTestNoProxyEntity; import org.hibernate.orm.test.envers.entities.collection.EmbeddableListEntity2; import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneEagerComponent; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue; * * @author thiagolrc */ -@TestForIssue(jiraKey = "HHH-6613") +@JiraKey(value = "HHH-6613") public class EmbeddableList2 extends BaseEnversJPAFunctionalTestCase { private Integer ele_id1 = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList3.java index 30bae58f3d..b6f3d5a1e0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList3.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList3.java @@ -11,7 +11,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestNoProxyEntity; import org.hibernate.orm.test.envers.entities.collection.EmbeddableListEntity3; import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneEagerComponent; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; /** * @author Cankut Guven */ -@TestForIssue(jiraKey = "HHH-11364") +@JiraKey(value = "HHH-11364") public class EmbeddableList3 extends BaseEnversJPAFunctionalTestCase { private Integer ele3_id; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java index 0367403091..f33ce6dde5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java @@ -17,14 +17,14 @@ import org.hibernate.orm.test.envers.entities.components.Component3; import org.hibernate.orm.test.envers.entities.components.Component4; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Kristoffer Lundberg (kristoffer at cambio dot se) */ -@TestForIssue(jiraKey = "HHH-6613") +@JiraKey(value = "HHH-6613") public class EmbeddableMap extends BaseEnversJPAFunctionalTestCase { private Integer eme1_id = null; private Integer eme2_id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java index 15c01b8f10..8c4628e734 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java @@ -16,7 +16,7 @@ import org.hibernate.orm.test.envers.entities.components.Component3; import org.hibernate.orm.test.envers.entities.components.Component4; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals; /** * @author Kristoffer Lundberg (kristoffer at cambio dot se) */ -@TestForIssue(jiraKey = "HHH-6613") +@JiraKey(value = "HHH-6613") public class EmbeddableSet extends BaseEnversJPAFunctionalTestCase { private Integer ese1_id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java index 77c30339d6..6f7c0f979d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java @@ -24,7 +24,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -38,7 +38,7 @@ import static org.junit.Assert.fail; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12607") +@JiraKey(value = "HHH-12607") public class ListEqualsHashCodeTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java index 6161cad447..3f845634f4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java @@ -23,7 +23,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -37,7 +37,7 @@ import static org.junit.Assert.fail; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12607") +@JiraKey(value = "HHH-12607") public class ListNoEqualsHashCodeTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java index de374a72b7..efe6c5cea5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java @@ -23,7 +23,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -60,7 +60,7 @@ import static org.junit.Assert.assertNotNull; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12607") +@JiraKey(value = "HHH-12607") public class MapEqualsHashCodeTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java index 77301bcf5d..9d83ecde2b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java @@ -22,7 +22,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -57,7 +57,7 @@ import static org.junit.Assert.assertNotNull; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12607") +@JiraKey(value = "HHH-12607") public class MapNoEqualsHashCodeTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/NullPointerExceptionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/NullPointerExceptionTest.java index 9c93c58d5b..e82018e984 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/NullPointerExceptionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/NullPointerExceptionTest.java @@ -13,7 +13,7 @@ import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.strategy.ValidityAuditStrategy; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11215") +@JiraKey(value = "HHH-11215") public class NullPointerExceptionTest extends BaseEnversJPAFunctionalTestCase { private Integer productId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java index e22aa3823a..339af58c3c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java @@ -24,7 +24,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -61,7 +61,7 @@ import static org.junit.Assert.assertNotNull; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12607") +@JiraKey(value = "HHH-12607") public class SetEqualsHashCodeTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java index f5b6686e2a..10fefa4971 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java @@ -22,7 +22,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -58,7 +58,7 @@ import static org.junit.Assert.fail; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12607") +@JiraKey(value = "HHH-12607") public class SetNoEqualsHashCodeTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java index cafcd453e8..297db2c337 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java @@ -24,7 +24,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.orm.test.envers.tools.TestTools.checkCollection; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-13655") +@JiraKey(value = "HHH-13655") public class MapKeyEnumeratedNonEntityTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java index 57bb4bf8c7..da911d4957 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java @@ -24,7 +24,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11797") +@JiraKey(value = "HHH-11797") public class MapKeyEnumeratedTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java index 73ae0d6e60..66ab8d6b86 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java @@ -16,7 +16,7 @@ import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; public abstract class AbstractCollectionChangeTest extends BaseEnversFunctionalTestCase { protected Integer personId; @@ -118,13 +118,13 @@ public abstract class AbstractCollectionChangeTest extends BaseEnversFunctionalT } @Test - @TestForIssue(jiraKey = "HHH-10201") + @JiraKey(value = "HHH-10201") public void testParentRevisionCount() { assert getAuditReader().getRevisions( Parent.class, parentId ).equals( getExpectedParentRevisions() ); } @Test - @TestForIssue(jiraKey = "HHH-10201") + @JiraKey(value = "HHH-10201") public void testHouseRevisionCount() { assert getAuditReader().getRevisions( House.class, houseId ).equals( getExpectedHouseRevisions() ); } diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/PropertiesGroupTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/PropertiesGroupTest.java index 0cd550ba5d..bc4f479f33 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/PropertiesGroupTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/PropertiesGroupTest.java @@ -14,14 +14,14 @@ import org.hibernate.orm.test.envers.entities.components.UniquePropsNotAuditedEn import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-6636") +@JiraKey(value = "HHH-6636") public class PropertiesGroupTest extends BaseEnversFunctionalTestCase { private PersistentClass uniquePropsAudit = null; private PersistentClass uniquePropsNotAuditedAudit = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java index d8d848267d..bb34049d24 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java @@ -16,7 +16,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.components.Component1; import org.hibernate.orm.test.envers.entities.components.ComponentSetTestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -81,7 +81,7 @@ public class CollectionOfComponents extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8968") + @JiraKey(value = "HHH-8968") public void testCollectionOfEmbeddableWithNullValue() { final Component1 componentV1 = new Component1( "string1", null ); final ComponentSetTestEntity entityV1 = getAuditReader().find( ComponentSetTestEntity.class, id2, 1 ); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java index 6e5fc820b5..ddbb017d5c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java @@ -14,7 +14,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; /** * @author Gail Badner */ -@TestForIssue( jiraKey = "HHH-9193" ) +@JiraKey( value = "HHH-9193" ) public class CollectionOfMappedSuperclassComponentsTest extends BaseEnversJPAFunctionalTestCase { private Integer id1; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java index c70573f8e7..73b09c1b37 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java @@ -16,7 +16,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -24,7 +24,7 @@ import org.junit.Test; * @author Jakob Braeuchi. * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-9193") +@JiraKey(value = "HHH-9193") public class EmbeddableWithDeclaredDataTest extends BaseEnversJPAFunctionalTestCase { private long id; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java index 11b53c2211..747bc5e579 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java @@ -15,7 +15,7 @@ import org.hibernate.envers.AuditReaderFactory; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -23,7 +23,7 @@ import org.junit.Test; * @author Jakob Braeuchi. * @author Gail Badner */ -@TestForIssue(jiraKey = "HHH-9193") +@JiraKey(value = "HHH-9193") public class EmbeddableWithNoDeclaredDataTest extends BaseEnversJPAFunctionalTestCase { private long id; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java index b022b0edf4..f9e5ac377b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java @@ -13,7 +13,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.customtype.EnumTypeEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -22,7 +22,7 @@ import jakarta.persistence.EntityManager; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7780") +@JiraKey(value = "HHH-7780") public class EnumTypeTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java index 51ab78cec8..7e86e38944 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.dynamicmodel; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.EntityManager; @@ -17,7 +17,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Felix Feisst (feisst dot felix at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-8769") +@JiraKey(value = "HHH-8769") public class DynamicModelTest extends BaseEnversJPAFunctionalTestCase { @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java index 894850f821..8f2c334eee 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java @@ -14,7 +14,7 @@ import org.hibernate.MappingException; import org.hibernate.orm.test.envers.AbstractOneSessionTest; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -55,7 +55,7 @@ public class SingleDomainObjectToMultipleTablesTest extends AbstractOneSessionTe } @Test - @TestForIssue(jiraKey = "HHH-4648") + @JiraKey(value = "HHH-4648") public void testSingleDomainObjectToMultipleTablesMapping() { Car carVer1 = getAuditReader().find( Car.class, carId, 1 ); Person ownerVer1 = getAuditReader().find( Person.class, "Personaje", ownerId, 1 ); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java index a33c4884ec..7a710d53c3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java @@ -16,7 +16,7 @@ import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue( jiraKey = "HHH-8243" ) +@JiraKey( value = "HHH-8243" ) public class CommitFlush extends AbstractFlushTest { private Integer id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java index 2b29969c73..6763039eb4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java @@ -31,13 +31,17 @@ import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.JiraKeyGroup; import org.junit.Test; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12826 and HHH-12846") +@JiraKeyGroup( value = { + @JiraKey(value = "HHH-12826"), + @JiraKey(value = "HHH-12846") +} ) public class CommitFlushCollectionTest extends BaseEnversJPAFunctionalTestCase { @MappedSuperclass diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java index 0744f910d8..76e2315576 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java @@ -14,7 +14,7 @@ import org.hibernate.FlushMode; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.entities.StrTestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; /** @@ -28,7 +28,7 @@ public class CommitFlushSingleRevisionInTransaction extends AbstractFlushTest { } @Test - @TestForIssue(jiraKey = "HHH-11575") + @JiraKey(value = "HHH-11575") public void testSingleRevisionInTransaction() { EntityManager em = getEntityManager(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlushAutoCommitDisabled.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlushAutoCommitDisabled.java index 10ded5e55f..f7849bca7d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlushAutoCommitDisabled.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlushAutoCommitDisabled.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.integration.flush; import java.util.Map; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7017") +@JiraKey(value = "HHH-7017") public class ManualFlushAutoCommitDisabled extends ManualFlush { @Override protected void addConfigOptions(Map options) { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java index f29dde3b78..3f121eeaa5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-10841") +@JiraKey(value = "HHH-10841") public class GeneratedColumnTest extends BaseEnversJPAFunctionalTestCase { private Integer entityId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java index ae2e6b3a83..eed26f08ef 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java @@ -21,7 +21,7 @@ import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11063") +@JiraKey(value = "HHH-11063") public class ComponentCollectionHashcodeChangeTest extends BaseEnversJPAFunctionalTestCase { private Integer id; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java index 553c8a3334..cec56717eb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java @@ -17,7 +17,7 @@ import org.hibernate.envers.NotAudited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.CascadeType; @@ -37,7 +37,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11063") +@JiraKey(value = "HHH-11063") public class ListHashcodeChangeTest extends BaseEnversJPAFunctionalTestCase { private Integer authorId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java index 169c99607c..c48b3a218c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java @@ -18,7 +18,7 @@ import org.hibernate.envers.NotAudited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.CascadeType; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11063") +@JiraKey(value = "HHH-11063") public class SetHashcodeChangeTest extends BaseEnversJPAFunctionalTestCase { private Integer authorId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java index 8903a9c556..2b274eb3c7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java @@ -26,7 +26,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-13564") +@JiraKey(value = "HHH-13564") public class EmbeddedIdGenericsTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/NestedEmbeddedIdentifiersTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/NestedEmbeddedIdentifiersTest.java index 9c18aaca31..e238471204 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/NestedEmbeddedIdentifiersTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/NestedEmbeddedIdentifiersTest.java @@ -14,10 +14,10 @@ import java.util.Arrays; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; -@TestForIssue(jiraKey = "HHH-13361") +@JiraKey(value = "HHH-13361") public class NestedEmbeddedIdentifiersTest extends BaseEnversJPAFunctionalTestCase { private OwnerOfRelationCodeId id; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java index 53ee4ff483..50f4fb3965 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java @@ -25,7 +25,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12498") +@JiraKey(value = "HHH-12498") public class RelationInsideEmbeddableNotAuditedTest extends BaseEnversJPAFunctionalTestCase { private Integer authorId; private BookId bookId1; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java index 893cc3f2a6..9247b0e61c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11107") +@JiraKey(value = "HHH-11107") public class RelationInsideEmbeddableRemoveTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java index cf51bc35ab..8c1a7f46b8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java @@ -12,14 +12,14 @@ import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7690") +@JiraKey(value = "HHH-7690") public class RelationInsideEmbeddableTest extends BaseEnversJPAFunctionalTestCase { private Integer orderId = null; private ItemId itemId = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java index 00df259bc1..4b343efae7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.ids.idclass; import junit.framework.Assert; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import jakarta.persistence.EntityManager; @@ -18,7 +18,7 @@ import java.util.Arrays; /** * @author Matthew Morrissette (yinzara at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-10667") +@JiraKey(value = "HHH-10667") public class IdClassReferenceIdentifierTest extends BaseEnversJPAFunctionalTestCase { private ReferenceIdentifierClassId entityId = null; private Integer typeId = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java index ed8a8eb7ec..1ff6cfa588 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java @@ -12,14 +12,14 @@ import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import junit.framework.Assert; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-4751") +@JiraKey(value = "HHH-4751") public class IdClassWithRelationTest extends BaseEnversJPAFunctionalTestCase { private RelationalClassId entityId = null; private String typeId = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ManyToOneNotAuditedMulIdTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ManyToOneNotAuditedMulIdTest.java index 238623fe90..625cf23962 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ManyToOneNotAuditedMulIdTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ManyToOneNotAuditedMulIdTest.java @@ -14,12 +14,12 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; import org.hibernate.orm.test.envers.entities.ids.MulId; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; -@TestForIssue( jiraKey = "HHH-14280" ) +@JiraKey( value = "HHH-14280" ) public class ManyToOneNotAuditedMulIdTest extends BaseEnversJPAFunctionalTestCase { private final static String str1 = "str1", str2 = "str2"; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java index 36d105ff28..79fa4b954a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java @@ -13,14 +13,14 @@ import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7934") +@JiraKey(value = "HHH-7934") public class ProtectedConstructorTest extends BaseEnversJPAFunctionalTestCase { private final ProtectedConstructorEntity testEntity = new ProtectedConstructorEntity( new WrappedStringId( diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java index b6a622d216..50df3744f8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java @@ -23,7 +23,7 @@ import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11133") +@JiraKey(value = "HHH-11133") public class DiscriminatorJoinedInheritanceTest extends BaseEnversJPAFunctionalTestCase { @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/JoinedSubclassWithEmbeddableIdTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/JoinedSubclassWithEmbeddableIdTest.java index b8f7f7aaa7..21b528c646 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/JoinedSubclassWithEmbeddableIdTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/JoinedSubclassWithEmbeddableIdTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined; import org.hibernate.envers.Audited; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; @@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.fail; } ) @SessionFactory -@TestForIssue( jiraKey = "HHH-15686") +@JiraKey( value = "HHH-15686") public class JoinedSubclassWithEmbeddableIdTest { @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java index 82629f733b..6d6e3deeb5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java @@ -13,14 +13,14 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-3843") +@JiraKey(value = "HHH-3843") public class ParentReferencingChildTest extends BaseEnversJPAFunctionalTestCase { Person expLukaszRev1 = null; Role expAdminRev1 = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java index d6eb23803d..60ba49e16f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java @@ -24,7 +24,7 @@ import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-7249") +@JiraKey(value = "HHH-7249") public class PolymorphicRemovalTest extends BaseEnversJPAFunctionalTestCase { private Integer typeId; private Integer employeeId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java index ca6eddc5a6..51438d4587 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java @@ -12,14 +12,14 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-5910") +@JiraKey(value = "HHH-5910") public class AuditedAbstractParentTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java index f330b5f8b7..13a1962e20 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java @@ -23,7 +23,7 @@ import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.junit.Test; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals; /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-11580") +@JiraKey(value = "HHH-11580") public class DeleteCollectionJtaSessionClosedBeforeCommitTest extends BaseEnversJPAFunctionalTestCase { private static final int ENTITY_ID = 1; private static final int OTHER_ENTITY_ID = 2; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java index 6710f07b40..221d732715 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; @@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey="HHH-13191") +@JiraKey(value="HHH-13191") @RequiresDialectFeature({ DialectChecks.SupportsNoColumnInsert.class, DialectChecks.SupportsIdentityColumns.class }) public class IdentifierProxyJtaSessionClosedBeforeCommitTest extends BaseEnversJPAFunctionalTestCase { @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java index 7be3e91a38..1474d983ae 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java @@ -15,7 +15,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.IntTestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.junit.Test; @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11232") +@JiraKey(value = "HHH-11232") public class JtaSessionClosedBeforeCommitTest extends BaseEnversJPAFunctionalTestCase { private Integer entityId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java index 88326257f8..9c04b018f2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java @@ -27,7 +27,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.IntTestEntity; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; @@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12448") +@JiraKey(value = "HHH-12448") public class JtaTransactionAfterCallbackTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java index b93f173348..3db53d1bf5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java @@ -18,7 +18,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.onetomany.SetRefEdEntity; import org.hibernate.orm.test.envers.entities.onetomany.SetRefIngEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; /** * @author Andrea Boriero */ -@TestForIssue( jiraKey = "HHH-11570") +@JiraKey( value = "HHH-11570") public class OneToManyJtaSessionClosedBeforeCommitTest extends BaseEnversJPAFunctionalTestCase { private Integer entityId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedBytecodeEnhancementTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedBytecodeEnhancementTest.java index 84701b9bf2..6e4ece4e19 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedBytecodeEnhancementTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedBytecodeEnhancementTest.java @@ -18,7 +18,7 @@ import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionEntit import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEntity1; import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEntity2; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import org.junit.runner.RunWith; import static org.junit.Assert.assertEquals; @@ -31,7 +31,7 @@ import org.hibernate.testing.bytecode.enhancement.EnhancementOptions; /** * @author Fabricio Gregorio */ -@TestForIssue(jiraKey = "HHH-15522") +@JiraKey(value = "HHH-15522") @RunWith(BytecodeEnhancerRunner.class) @EnhancementOptions(lazyLoading = true) @SkipForDialect(value = OracleDialect.class, comment = "Oracle does not support identity key generation") diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedTest.java index 1c4291fa39..30fd422ef1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/lazy/IsCollectionInitializedTest.java @@ -18,7 +18,7 @@ import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionEntit import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEntity1; import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEntity2; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; import org.hibernate.Hibernate; @@ -28,7 +28,7 @@ import org.hibernate.envers.AuditReaderFactory; /** * @author Fabricio Gregorio */ -@TestForIssue(jiraKey = "HHH-15522") +@JiraKey(value = "HHH-15522") @SkipForDialect(value = OracleDialect.class, comment = "Oracle does not support identity key generation") @SkipForDialect(value = AltibaseDialect.class, comment = "Altibase does not support identity key generation") public class IsCollectionInitializedTest extends BaseEnversJPAFunctionalTestCase { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java index 5569f369db..44a53ae633 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java @@ -18,7 +18,7 @@ import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-7940") +@JiraKey(value = "HHH-7940") public class IndexColumnListTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java index 98d574e1c0..18a994bca6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java @@ -25,7 +25,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hamcrest.CoreMatchers.hasItem; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -35,7 +35,7 @@ import static org.junit.Assert.assertThat; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12240") +@JiraKey(value = "HHH-12240") public class MappedByEmbeddableAttributeTest extends BaseEnversJPAFunctionalTestCase { @Audited diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java index f477180f78..ab85af715b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-7940") +@JiraKey(value = "HHH-7940") public class OrderColumnListTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java index dc83452736..e8c89418b1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java @@ -14,7 +14,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.orm.test.envers.entities.manytomany.unidirectional.JoinTableEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -23,7 +23,7 @@ import jakarta.persistence.EntityManager; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-8087") +@JiraKey(value = "HHH-8087") public class JoinTableDetachedTest extends BaseEnversJPAFunctionalTestCase { private Long collectionEntityId = null; private Integer element1Id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java index a0874a5ac9..65a6ebd746 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java @@ -27,14 +27,14 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.mapping.Table; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11463") +@JiraKey(value = "HHH-11463") public class EmbeddedIdManyToOneForeignKeyTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java index ab71f22f2a..a89e7d546a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -20,7 +20,7 @@ import static org.junit.Assert.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-8305") +@JiraKey(value = "HHH-8305") public class BidirectionalManyToOneOptionalTest extends BaseEnversJPAFunctionalTestCase { private Integer refingWithNoRefedId; private Integer refingId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java index c64335dd5e..5ba72f9145 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java @@ -15,14 +15,14 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-4962") +@JiraKey(value = "HHH-4962") public class ImplicitMappedByTest extends BaseEnversJPAFunctionalTestCase { private Long ownedId = null; private Long owning1Id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java index 0e74fd99f7..17126638e8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -21,7 +21,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12965") +@JiraKey(value = "HHH-12965") public class ForeignKeyExclusionTest extends BaseEnversJPAFunctionalTestCase { private RootLayer rootLayer; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java index ab8fb2fa03..4be863d2a2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java @@ -13,14 +13,14 @@ import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-6753") +@JiraKey(value = "HHH-6753") public class AddDelTest extends BaseEnversFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java index 3bd367b14b..e668ad5c78 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java @@ -19,7 +19,7 @@ import org.hibernate.orm.test.envers.integration.modifiedflags.entities.EnumEnti import org.hibernate.orm.test.envers.integration.modifiedflags.entities.EnumOption; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; @@ -76,7 +76,7 @@ public class HasChangedAPITest extends AbstractModifiedFlagsEntityTest { } @Test - @TestForIssue(jiraKey = "HHH-13770") + @JiraKey(value = "HHH-13770") public void testHasChangedHasNotChangedEnum() { List list = getAuditReader().createQuery().forRevisionsOfEntity( EnumEntity.class, true, true ) .add( AuditEntity.property( "option" ).hasChanged() ).getResultList(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java index c7eedbebb0..751a0ba6a5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java @@ -15,13 +15,13 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.modifiedflags.entities.Professor; import org.hibernate.orm.test.envers.integration.modifiedflags.entities.Student; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-7510") +@JiraKey(value = "HHH-7510") public class HasChangedAuditedManyToManyRemovalTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java index e409fb10ba..db82f67fae 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-7949") +@JiraKey(value = "HHH-7949") public class HasChangedBidirectionalTest extends AbstractModifiedFlagsEntityTest { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java index 153efcb03a..f1bbbc0b4d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java @@ -14,7 +14,7 @@ import org.hibernate.orm.test.envers.entities.collection.EmbeddableListEntity1; import org.hibernate.orm.test.envers.entities.components.Component3; import org.hibernate.orm.test.envers.entities.components.Component4; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-6613") +@JiraKey(value = "HHH-6613") public class HasChangedComponentCollection extends AbstractModifiedFlagsEntityTest { private Integer ele1_id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java index 3da69774a7..aafe1b4627 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java @@ -18,7 +18,7 @@ import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEn import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEntity2; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7437") +@JiraKey(value = "HHH-7437") @SkipForDialect(value = OracleDialect.class, comment = "Oracle does not support identity key generation") @SkipForDialect(value = AltibaseDialect.class, diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java index 6b27634936..946a5cf14a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java @@ -14,14 +14,14 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.basic.BasicTestEntity1; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11582") +@JiraKey(value = "HHH-11582") public class HasChangedInsertUpdateSameTransactionTest extends AbstractModifiedFlagsEntityTest { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java index 24f133a660..0163cf3bb5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java @@ -12,7 +12,7 @@ import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.basic.BasicTestEntity1; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7918") +@JiraKey(value = "HHH-7918") public class HasChangedManualFlush extends AbstractModifiedFlagsEntityTest { private Integer id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java index b72f6ca83f..6240f3fef3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java @@ -14,7 +14,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.onetomany.ListRefEdEntity; import org.hibernate.orm.test.envers.entities.onetomany.ListRefIngEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; @@ -80,7 +80,7 @@ public class HasChangedMergeTest extends AbstractModifiedFlagsEntityTest { } @Test - @TestForIssue(jiraKey = "HHH-7948") + @JiraKey(value = "HHH-7948") public void testOneToManyInsertChildUpdateParent() { List list = queryForPropertyHasChanged( ListRefEdEntity.class, parent1Id, "data" ); assertEquals( 2, list.size() ); @@ -96,7 +96,7 @@ public class HasChangedMergeTest extends AbstractModifiedFlagsEntityTest { } @Test - @TestForIssue(jiraKey = "HHH-7948") + @JiraKey(value = "HHH-7948") public void testOneToManyUpdateParentInsertChild() { List list = queryForPropertyHasChanged( ListRefEdEntity.class, parent2Id, "data" ); assertEquals( 2, list.size() ); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java index e2682b2cdd..fc20d26972 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java @@ -28,7 +28,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.type.StandardBasicTypes; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-7681") +@JiraKey(value = "HHH-7681") public class GroupMemberTest extends BaseEnversJPAFunctionalTestCase { private Integer uniqueGroupId; private Integer groupMemberId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java index 4db0c9458d..e107694fce 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java @@ -13,14 +13,14 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7073") +@JiraKey(value = "HHH-7073") public class MultipleAssociationsTest extends BaseEnversJPAFunctionalTestCase { private long lukaszId = 0; private long kingaId = 0; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java index cc315750fc..8d9fc55f56 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java @@ -12,7 +12,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -22,7 +22,7 @@ import ee.estonia.entities.Parent; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-6738") +@JiraKey(value = "HHH-6738") public class EstonianTableAlias extends BaseEnversJPAFunctionalTestCase { private Long parentId = null; private Long childId = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java index 7507e10711..78291fac23 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Query; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hamcrest.core.Is.is; @@ -38,7 +38,7 @@ public class EntityResultNativeQueryTest extends BaseEnversJPAFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-12776") + @JiraKey(value = "HHH-12776") public void testNativeQueryResultHandling() { doInJPA( this::entityManagerFactory, entityManager -> { Query query = entityManager.createNativeQuery( "select * from SimpleEntity", SimpleEntity.class ); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java index a057c7c356..dbc3a069f3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -18,7 +18,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-10246") +@JiraKey(value = "HHH-10246") public class JoinColumnNaturalIdTest extends BaseEnversJPAFunctionalTestCase { private Integer customerId; private Integer deviceId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java index 919c067f3f..d94d47a4bb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java @@ -15,14 +15,14 @@ import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import junit.framework.Assert; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-5411") +@JiraKey(value = "HHH-5411") public class PropertyNotUpdatableTest extends BaseEnversJPAFunctionalTestCase { private Long id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java index 1684731443..0071693d99 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java @@ -19,7 +19,7 @@ import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-7940") +@JiraKey(value = "HHH-7940") public class IndexColumnListTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java index 7bb7fc6b71..2d3a0b1d4c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-7940") +@JiraKey(value = "HHH-7940") public class OrderColumnListTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java index 12326f905a..3c72d54676 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java @@ -14,7 +14,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.orm.test.envers.entities.onetomany.detached.ListRefCollEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import junit.framework.Assert; @@ -32,7 +32,7 @@ public class DetachedTest extends BaseEnversFunctionalTestCase { @Test @Priority(10) - @TestForIssue(jiraKey = "HHH-7543") + @JiraKey(value = "HHH-7543") public void testUpdatingDetachedEntityWithRelation() { Session session = getSession(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java index 51184440d3..ddc2328726 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java @@ -16,7 +16,7 @@ import org.hibernate.orm.test.envers.integration.onetomany.embeddedid.Constant; import org.hibernate.orm.test.envers.integration.onetomany.embeddedid.Person; import org.hibernate.orm.test.envers.integration.onetomany.embeddedid.PersonTuple; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SkipForDialect; import org.junit.Assert; import org.junit.Test; @@ -24,7 +24,7 @@ import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7157") +@JiraKey(value = "HHH-7157") @SkipForDialect( dialectClass = AltibaseDialect.class, reason = "'CONSTANT' is not escaped even though autoQuoteKeywords is enabled") public class MapsIdTest extends BaseEnversJPAFunctionalTestCase { private PersonTuple tuple1Ver1 = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java index fe503dd993..b58906c791 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java @@ -34,7 +34,7 @@ import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11770") +@JiraKey(value = "HHH-11770") public class OneToManyCompositeKeyTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java index ef107d213e..a4c03b0257 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java @@ -13,14 +13,14 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-6661") +@JiraKey(value = "HHH-6661") public class HierarchyTest extends BaseEnversJPAFunctionalTestCase { private Long parentId = null; private Long child1Id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyCompositeKeyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyCompositeKeyTest.java index 685b580c78..032cfa646e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyCompositeKeyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyCompositeKeyTest.java @@ -12,7 +12,7 @@ import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-7625") +@JiraKey(value = "HHH-7625") public class OneToManyCompositeKeyTest extends BaseEnversJPAFunctionalTestCase { private ManyToManyCompositeKey.ManyToManyId owning1Id = null; private ManyToManyCompositeKey.ManyToManyId owning2Id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java index 8e5230c6e0..ba7577b7c6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java @@ -15,7 +15,7 @@ import org.hibernate.envers.query.AuditQuery; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hamcrest.core.Is.is; @@ -25,7 +25,7 @@ import static org.junit.Assert.assertThat; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-8070") +@JiraKey(value = "HHH-8070") public class AuditRelatedIdInTest extends BaseEnversJPAFunctionalTestCase { private Integer company1Id; private Integer company2Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java index 91e3c85142..b6166a6f2b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java @@ -13,7 +13,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.onetoone.BidirectionalEagerAnnotationRefEdOneToOne; import org.hibernate.orm.test.envers.entities.onetoone.BidirectionalEagerAnnotationRefIngOneToOne; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertNotNull; @@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Erik-Berndt Scheper */ -@TestForIssue(jiraKey = "HHH-3854") +@JiraKey(value = "HHH-3854") public class BidirectionalEagerAnnotationTest extends BaseEnversJPAFunctionalTestCase { private Integer refIngId1 = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java index c11d848d7a..b1cd2c75cb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java @@ -13,7 +13,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.onetoone.BidirectionalEagerHbmRefEdPK; import org.hibernate.orm.test.envers.entities.onetoone.BidirectionalEagerHbmRefIngPK; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertNotNull; @@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull; /** * @author Erik-Berndt Scheper, Amar Singh */ -@TestForIssue(jiraKey = "HHH-3854") +@JiraKey(value = "HHH-3854") public class BidirectionalEagerHbmTest extends BaseEnversJPAFunctionalTestCase { private Long refIngId1 = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java index 46f0211bf2..0672c51dba 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java @@ -14,7 +14,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.proxy.HibernateProxy; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -23,7 +23,7 @@ import jakarta.persistence.EntityManager; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-6825") +@JiraKey(value = "HHH-6825") public class OneToOneWithPrimaryKeyJoinTest extends BaseEnversJPAFunctionalTestCase { private Long personId = null; private Long accountId = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java index caae5292ad..89f2642301 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java @@ -19,7 +19,7 @@ import org.hibernate.orm.test.envers.entities.onetomany.OneToManyNotAuditedNullE import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -124,7 +124,7 @@ public class ProxyIdentifier extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8174" ) + @JiraKey( value = "HHH-8174" ) public void testNullReferenceWithNotFoundActionIgnore() { ManyToOneNotAuditedNullEntity mtoRev2 = getAuditReader().find( ManyToOneNotAuditedNullEntity.class, mtonane1.getId(), 2 ); Assert.assertEquals( mtonane1, mtoRev2 ); @@ -140,7 +140,7 @@ public class ProxyIdentifier extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-8912" ) + @JiraKey( value = "HHH-8912" ) public void testNullReferenceWithNotFoundActionIgnoreInParent() { ExtManyToOneNotAuditedNullEntity emtoRev2 = getAuditReader().find( ExtManyToOneNotAuditedNullEntity.class, emtonane1.getId(), 2 ); Assert.assertEquals( emtonane1, emtoRev2 ); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java index af3af1a513..90c05b82fd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java @@ -13,7 +13,7 @@ import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -41,7 +41,7 @@ public class QueryingWithProxyObjectTest extends BaseEnversFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-4760") + @JiraKey(value = "HHH-4760") @SuppressWarnings("unchecked") public void testQueryingWithProxyObject() { StrTestEntity originalSte = new StrTestEntity( "data", id ); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java index 7bf400ec09..dbf87e0b27 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java @@ -38,14 +38,14 @@ import org.hibernate.orm.test.envers.integration.manytomany.ternary.TernaryMapEn import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-5845") +@JiraKey(value = "HHH-5845") public class RemovedObjectQueryTest extends BaseEnversJPAFunctionalTestCase { private Integer stringSetId = null; private Integer ternaryMapId = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java index fd5a336e89..2cbc9729ce 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java @@ -25,7 +25,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-8058" ) +@JiraKey( value = "HHH-8058" ) public abstract class AbstractEntityWithChangesQueryTest extends BaseEnversJPAFunctionalTestCase { private Integer simpleId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java index 5e39ab0b7e..1abfb56efb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java @@ -17,7 +17,7 @@ import org.hibernate.orm.test.envers.entities.IntTestEntity; import org.hibernate.orm.test.envers.entities.ids.UnusualIdNamingEntity; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -96,7 +96,7 @@ public class AggregateQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8036") + @JiraKey(value = "HHH-8036") public void testEntityIdProjection() { Integer maxId = (Integer) getAuditReader().createQuery().forRevisionsOfEntity( IntTestEntity.class, true, true ) .addProjection( AuditEntity.id().max() ) @@ -106,7 +106,7 @@ public class AggregateQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8036") + @JiraKey(value = "HHH-8036") public void testEntityIdRestriction() { List list = getAuditReader().createQuery().forRevisionsOfEntity( IntTestEntity.class, @@ -124,7 +124,7 @@ public class AggregateQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8036") + @JiraKey(value = "HHH-8036") public void testEntityIdOrdering() { List list = getAuditReader().createQuery().forRevisionsOfEntity( IntTestEntity.class, @@ -138,7 +138,7 @@ public class AggregateQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8036") + @JiraKey(value = "HHH-8036") public void testUnusualIdFieldName() { UnusualIdNamingEntity entity = (UnusualIdNamingEntity) getAuditReader().createQuery() .forRevisionsOfEntity( UnusualIdNamingEntity.class, true, true ) @@ -148,7 +148,7 @@ public class AggregateQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8036") + @JiraKey(value = "HHH-8036") public void testEntityIdModifiedFlagNotSupported() { try { getAuditReader().createQuery().forRevisionsOfEntity( IntTestEntity.class, true, true ) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java index 1af6b13a69..0c6515b1bf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java @@ -19,7 +19,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11981") +@JiraKey(value = "HHH-11981") public class AssociationEntitiesModifiedQueryTest extends BaseEnversJPAFunctionalTestCase { @Entity(name = "TemplateType") @Audited(withModifiedFlag = true) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationQueryWithOnClauseTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationQueryWithOnClauseTest.java index 370013d355..c95e6ab779 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationQueryWithOnClauseTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationQueryWithOnClauseTest.java @@ -26,7 +26,7 @@ import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.order.NullPrecedence; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.*; @@ -34,7 +34,7 @@ import static org.junit.Assert.*; /** * @author Felix Feisst (feisst dot felix at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-11896") +@JiraKey(value = "HHH-11896") public class AssociationQueryWithOnClauseTest extends BaseEnversJPAFunctionalTestCase { private EntityA a1; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryStoreAtDeletionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryStoreAtDeletionTest.java index 004f95d7cf..b915b3d4ab 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryStoreAtDeletionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryStoreAtDeletionTest.java @@ -10,12 +10,12 @@ import java.util.Map; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-13817" ) +@JiraKey( value = "HHH-13817" ) public class AssociationRevisionsOfEntitiesQueryStoreAtDeletionTest extends AssociationRevisionsOfEntitiesQueryTest { @Override protected void addSettings(Map settings) { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java index 24878eac92..9864a5ad89 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java @@ -24,7 +24,6 @@ import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.JiraKey; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToManyJoinQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToManyJoinQueryTest.java index a590cc009f..07ee3193c3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToManyJoinQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToManyJoinQueryTest.java @@ -28,13 +28,13 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; /** * @author Felix Feisst (feisst dot felix at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-11735") +@JiraKey(value = "HHH-11735") public class AssociationToManyJoinQueryTest extends BaseEnversJPAFunctionalTestCase { private EntityA aEmpty; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToNotAuditedManyJoinQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToNotAuditedManyJoinQueryTest.java index ed9ce7b334..65a6825cc9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToNotAuditedManyJoinQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToNotAuditedManyJoinQueryTest.java @@ -28,13 +28,13 @@ import org.hibernate.envers.RelationTargetAuditMode; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; /** * @author Felix Feisst (feisst dot felix at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-11735") +@JiraKey(value = "HHH-11735") public class AssociationToNotAuditedManyJoinQueryTest extends BaseEnversJPAFunctionalTestCase { private EntityA aEmpty; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ComponentQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ComponentQueryTest.java index 7d69fcfb37..0a9d0a5f49 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ComponentQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ComponentQueryTest.java @@ -29,14 +29,14 @@ import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.order.NullPrecedence; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; /** * @author Felix Feisst (feisst dot felix at gmail dot com) */ @SuppressWarnings("rawtypes") -@TestForIssue(jiraKey = "HHH-11895") +@JiraKey(value = "HHH-11895") public class ComponentQueryTest extends BaseEnversJPAFunctionalTestCase { @Embeddable @@ -335,7 +335,7 @@ public class ComponentQueryTest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11896") + @JiraKey(value = "HHH-11896") public void testOnClauseOnSingleSymbol() { List actual = getAuditReader().createQuery() .forEntitiesAtRevision( Asset.class, 1 ) @@ -351,7 +351,7 @@ public class ComponentQueryTest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11896") + @JiraKey(value = "HHH-11896") public void testOnClauseOnMultiSymbol() { List actual = getAuditReader().createQuery() .forEntitiesAtRevision( Asset.class, 1 ) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityTypeQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityTypeQueryTest.java index 19cd3b1dfd..464705e675 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityTypeQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityTypeQueryTest.java @@ -22,7 +22,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals; /** * @author Felix Feisst (feisst dot felix at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-11573") +@JiraKey(value = "HHH-11573") public class EntityTypeQueryTest extends BaseEnversJPAFunctionalTestCase { @Entity(name = "EntityA") diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java index a8af00d666..ca4ee2a900 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.query; import org.hibernate.envers.exception.AuditException; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; import static org.junit.Assert.fail; @@ -17,7 +17,7 @@ import static org.junit.Assert.fail; /** * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-8058" ) +@JiraKey( value = "HHH-8058" ) public class EntityWithChangesQueryNoModifiedFlagTest extends AbstractEntityWithChangesQueryTest { @Test public void testEntityRevisionsWithChangesQueryNoDeletions() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java index 2295a00273..efa7c30f9a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java @@ -10,12 +10,12 @@ import java.util.Map; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-8058" ) +@JiraKey( value = "HHH-8058" ) public class EntityWithChangesQueryStoreDeletionDataTest extends AbstractEntityWithChangesQueryTest { @Override protected void addConfigOptions(Map options) { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryTest.java index 06061681b7..2de2fbf399 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryTest.java @@ -10,12 +10,12 @@ import java.util.Map; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-8058" ) +@JiraKey( value = "HHH-8058" ) public class EntityWithChangesQueryTest extends AbstractEntityWithChangesQueryTest { @Override protected void addConfigOptions(Map options) { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java index 4fe2b96bd6..a41293a4ac 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java @@ -20,7 +20,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import static org.junit.Assert.assertEquals; @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11416") +@JiraKey(value = "HHH-11416") public class JoinedInheritancePropertyJoinTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java index bfa38ae5f7..183f266772 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java @@ -20,7 +20,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrIntTestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -148,7 +148,7 @@ public class MaximalizePropertyQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7800") + @JiraKey(value = "HHH-7800") public void testMaximizeInDisjunction() { List idsToQuery = Arrays.asList( id1, id3 ); @@ -174,7 +174,7 @@ public class MaximalizePropertyQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7827") + @JiraKey(value = "HHH-7827") public void testAllLatestRevisionsOfEntityType() { List result = getAuditReader().createQuery() .forRevisionsOfEntity( StrIntTestEntity.class, false, true ) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NestedComponentQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NestedComponentQueryTest.java index f7ee375969..983daaff01 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NestedComponentQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NestedComponentQueryTest.java @@ -23,13 +23,13 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; /** * @author Felix Feisst (feisst dot felix at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-11895") +@JiraKey(value = "HHH-11895") public class NestedComponentQueryTest extends BaseEnversJPAFunctionalTestCase { @Embeddable diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java index 52fe03baa1..d56b001151 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java @@ -13,7 +13,7 @@ import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; import static org.junit.Assert.fail; @@ -28,7 +28,7 @@ public class NotAuditedQueryTest extends BaseEnversFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11558") + @JiraKey(value = "HHH-11558") public void testRevisionsOfEntityNotAuditedMultipleResults() { try { getAuditReader().createQuery() @@ -42,7 +42,7 @@ public class NotAuditedQueryTest extends BaseEnversFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11558") + @JiraKey(value = "HHH-11558") public void testRevisionsOfEntityNotAuditedSingleResult() { try { getAuditReader().createQuery() @@ -57,7 +57,7 @@ public class NotAuditedQueryTest extends BaseEnversFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11558") + @JiraKey(value = "HHH-11558") public void testForEntitiesAtRevisionNotAuditedMultipleResults() { try { getAuditReader().createQuery() @@ -71,7 +71,7 @@ public class NotAuditedQueryTest extends BaseEnversFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11558") + @JiraKey(value = "HHH-11558") public void testForEntitiesAtRevisionNotAuditedSingleResult() { try { getAuditReader().createQuery() @@ -86,7 +86,7 @@ public class NotAuditedQueryTest extends BaseEnversFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11558") + @JiraKey(value = "HHH-11558") public void testForEntitiesModifiedAtRevisionNotAuditedMultipleResults() { try { getAuditReader().createQuery() @@ -100,7 +100,7 @@ public class NotAuditedQueryTest extends BaseEnversFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-11558") + @JiraKey(value = "HHH-11558") public void testForEntitiesModifiedAtRevisionNotAuditedSingleResult() { try { getAuditReader().createQuery() diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPrecedenceTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPrecedenceTest.java index c323fb8e7b..9b0366fad6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPrecedenceTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPrecedenceTest.java @@ -18,7 +18,7 @@ import org.hibernate.orm.test.envers.entities.StrIntTestEntity; import org.junit.Assert; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; /** @@ -26,7 +26,7 @@ import org.hibernate.testing.transaction.TransactionUtil; * * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-14981" ) +@JiraKey( value = "HHH-14981" ) public class NullPrecedenceTest extends BaseEnversJPAFunctionalTestCase { Integer id1; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java index d1de29d7dd..e46b927214 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java @@ -24,7 +24,7 @@ import org.hibernate.orm.test.envers.entities.ids.MulId; import org.hibernate.orm.test.envers.entities.ids.MulIdTestEntity; import org.hibernate.orm.test.envers.tools.TestTools; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -365,7 +365,7 @@ public class SimpleQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7800") + @JiraKey(value = "HHH-7800") public void testBetweenInsideDisjunction() { List result = getAuditReader().createQuery() .forRevisionsOfEntity( StrIntTestEntity.class, true, true ) @@ -384,7 +384,7 @@ public class SimpleQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8495") + @JiraKey(value = "HHH-8495") public void testIlike() { StrIntTestEntity site1 = new StrIntTestEntity( "aBc", 10, id1 ); @@ -397,7 +397,7 @@ public class SimpleQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8495") + @JiraKey(value = "HHH-8495") public void testIlikeWithMatchMode() { StrIntTestEntity site1 = new StrIntTestEntity( "aBc", 10, id1 ); @@ -410,7 +410,7 @@ public class SimpleQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8567") + @JiraKey(value = "HHH-8567") public void testIdPropertyRestriction() { StrIntTestEntity ver2 = (StrIntTestEntity) getAuditReader().createQuery() .forEntitiesAtRevision( StrIntTestEntity.class, 2 ) @@ -421,7 +421,7 @@ public class SimpleQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8567") + @JiraKey(value = "HHH-8567") public void testMultipleIdPropertyRestriction() { MulIdTestEntity ver2 = (MulIdTestEntity) getAuditReader().createQuery() .forEntitiesAtRevision( MulIdTestEntity.class, 2 ) @@ -433,7 +433,7 @@ public class SimpleQuery extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-8567") + @JiraKey(value = "HHH-8567") public void testEmbeddedIdPropertyRestriction() { EmbIdTestEntity ver2 = (EmbIdTestEntity) getAuditReader().createQuery() .forEntitiesAtRevision( EmbIdTestEntity.class, 2 ) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java index 75329697d2..ba8b6a4756 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java @@ -21,7 +21,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrIntTestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import junit.framework.Assert; @@ -96,7 +96,7 @@ public class StoreDeletedData extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-7800") + @JiraKey(value = "HHH-7800") public void testMaximizeInDisjunction() { List queryIds = Arrays.asList( id2, id3 ); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java index 69abb52cf8..eb6773ef5e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java @@ -15,7 +15,7 @@ import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQuery; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9178") +@JiraKey(value = "HHH-9178") public class EmbeddableQuery extends BaseEnversJPAFunctionalTestCase { private Integer personId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java index bf5b27f0e3..090f32919c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java @@ -14,14 +14,14 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-6696") +@JiraKey(value = "HHH-6696") public class GloballyConfiguredRevListenerTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java index 2d9e0cfe52..02ed94dae0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java @@ -15,7 +15,7 @@ import java.util.Date; import jakarta.persistence.EntityManager; import org.hibernate.envers.test.entities.reventity.CustomLocalDateTimeRevEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -31,7 +31,7 @@ import static org.junit.Assert.fail; /** * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-10496" ) +@JiraKey( value = "HHH-10496" ) public class LocalDateTimeTest extends BaseEnversJPAFunctionalTestCase { private Instant timestampStart; private Instant timestampEnd; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/MonotonicRevisionNumberTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/MonotonicRevisionNumberTest.java index 5445291c07..4523b85aa5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/MonotonicRevisionNumberTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/MonotonicRevisionNumberTest.java @@ -23,14 +23,14 @@ import org.hibernate.id.IdentifierGenerator; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7669") +@JiraKey(value = "HHH-7669") @RequiresDialect(OracleDialect.class) public class MonotonicRevisionNumberTest extends BaseEnversFunctionalTestCase { @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideCustomRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideCustomRevListenerTest.java index 1ef2258763..3cb777333c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideCustomRevListenerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideCustomRevListenerTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.integration.reventity; import org.hibernate.internal.util.collections.ArrayHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-6696") +@JiraKey(value = "HHH-6696") public class OverrideCustomRevListenerTest extends GloballyConfiguredRevListenerTest { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideDefaultRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideDefaultRevListenerTest.java index c8d85446f5..267ad539c3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideDefaultRevListenerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideDefaultRevListenerTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.integration.reventity; import org.hibernate.internal.util.collections.ArrayHelper; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-6696") +@JiraKey(value = "HHH-6696") public class OverrideDefaultRevListenerTest extends GloballyConfiguredRevListenerTest { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java index 3e3d4944c2..1c8be00480 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java @@ -25,7 +25,7 @@ import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.id.enhanced.TableGenerator; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-6615") +@JiraKey(value = "HHH-6615") public class RevisionNumberOverflowTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java index 84a835b8eb..1f90db4388 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java @@ -18,14 +18,14 @@ import org.hibernate.orm.test.envers.entities.manytomany.ListOwningEntity; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue( jiraKey = "HHH-7807" ) +@JiraKey( value = "HHH-7807" ) @RequiresDialectFeature(DialectChecks.SupportsCascadeDeleteCheck.class) public abstract class AbstractRevisionEntityRemovalTest extends BaseEnversJPAFunctionalTestCase { @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AuditStraegySelectorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AuditStraegySelectorTest.java index 8dc560cfb8..6999966ee1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AuditStraegySelectorTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/AuditStraegySelectorTest.java @@ -22,7 +22,7 @@ import org.hibernate.service.ServiceRegistry; import org.junit.Test; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; /** @@ -31,7 +31,7 @@ import org.hibernate.testing.util.ServiceRegistryUtil; * * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-12077" ) +@JiraKey( value = "HHH-12077" ) public class AuditStraegySelectorTest { @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/IdentifierReuseTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/IdentifierReuseTest.java index 224d356cb3..385737e69c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/IdentifierReuseTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/IdentifierReuseTest.java @@ -15,7 +15,7 @@ import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.entities.IntNoAutoIdTestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertNotNull; * * @author adar */ -@TestForIssue(jiraKey = "HHH-8280") +@JiraKey(value = "HHH-8280") public class IdentifierReuseTest extends BaseEnversJPAFunctionalTestCase { @Override protected void addConfigOptions(Map options) { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndNumericTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndNumericTypeTest.java index 6c9dd40afc..da84ecb55d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndNumericTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndNumericTypeTest.java @@ -22,7 +22,7 @@ import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.type.BasicType; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.envers.RequiresAuditStrategy; /** @@ -31,7 +31,7 @@ import org.hibernate.testing.envers.RequiresAuditStrategy; * * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-6210" ) +@JiraKey( value = "HHH-6210" ) @RequiresAuditStrategy( value = ValidityAuditStrategy.class, jiraKey = "HHH-6210" ) public class RevisionEndNumericTypeTest extends BaseEnversJPAFunctionalTestCase { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampJoinedInheritanceTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampJoinedInheritanceTest.java index 351d305efc..285707a86d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampJoinedInheritanceTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampJoinedInheritanceTest.java @@ -11,7 +11,7 @@ import org.hibernate.envers.strategy.ValidityAuditStrategy; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.envers.RequiresAuditStrategy; import jakarta.persistence.DiscriminatorColumn; @@ -26,7 +26,7 @@ import jakarta.persistence.InheritanceType; /** * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-9092" ) +@JiraKey( value = "HHH-9092" ) @RequiresAuditStrategy( ValidityAuditStrategy.class ) public class RevisionEndTimestampJoinedInheritanceTest extends AbstractRevisionEndTimestampTest { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java index a3ce1a94cc..95e3b67ef8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java @@ -22,7 +22,7 @@ import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.type.BasicType; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.envers.RequiresAuditStrategy; /** @@ -31,7 +31,7 @@ import org.hibernate.testing.envers.RequiresAuditStrategy; * * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-6210" ) +@JiraKey( value = "HHH-6210" ) @RequiresAuditStrategy( value = ValidityAuditStrategy.class, jiraKey = "HHH-6210" ) public class RevisionEndTimestampTypeTest extends BaseEnversJPAFunctionalTestCase { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java index 6d95d2b9e5..1f703ec10b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java @@ -25,7 +25,7 @@ import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.strategy.ValidityAuditStrategy; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11214") +@JiraKey(value = "HHH-11214") public class ValidityAuditStrategyComponentCollectionRevEndTest extends BaseEnversJPAFunctionalTestCase { private Integer productId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java index 8faf95be0d..a02ea48c0a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java @@ -13,14 +13,14 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-4439") +@JiraKey(value = "HHH-4439") public class AuditClassOverrideTest extends BaseEnversJPAFunctionalTestCase { private Integer classAuditedEntityId = null; private Integer classNotAuditedEntityId = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java index ee1a324083..a1c4d332f9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java @@ -29,7 +29,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.orm.test.envers.tools.TestTools.checkCollection; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -40,7 +40,7 @@ import static org.junit.Assert.fail; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-12913") +@JiraKey(value = "HHH-12913") public class AuditOverrideAuditJoinTableTest extends BaseEnversJPAFunctionalTestCase { private Long entityId; private Long overrideEntityId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java index 0e6832d02f..8a834869f0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java @@ -13,14 +13,14 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-4439") +@JiraKey(value = "HHH-4439") public class AuditPropertyOverrideTest extends BaseEnversJPAFunctionalTestCase { private Integer propertyEntityId = null; private Integer transitiveEntityId = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/EmbeddableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/EmbeddableTest.java index a74c5fe4d4..5414e1635c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/EmbeddableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/EmbeddableTest.java @@ -20,7 +20,7 @@ import org.hibernate.envers.AuditOverrides; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; import org.hibernate.mapping.PersistentClass; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; @@ -134,7 +134,7 @@ public class EmbeddableTest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9228" ) + @JiraKey( value = "HHH-9228" ) public void testAuditOverrideOnAuditedEmbeddable() { final PersistentClass clazz = getPersistentClass( AuditedEmbeddableOverrideEntity.class, auditedId, 1 ); assertTrue( clazz.hasProperty( "name" ) ); @@ -145,7 +145,7 @@ public class EmbeddableTest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9229" ) + @JiraKey( value = "HHH-9229" ) public void testEmptyEmbeddableWithFullAudit() { final PersistentClass clazz = getPersistentClass( FullOverrideEmbeddableEntity.class, fullOverrideId, 1 ); assertTrue( clazz.hasProperty( "embeddable_intValue" ) ); @@ -153,7 +153,7 @@ public class EmbeddableTest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9229" ) + @JiraKey( value = "HHH-9229" ) public void testEmptyEmbeddableWithNoAudited() { final PersistentClass clazz = getPersistentClass( NotAuditedEmbeddableEntity.class, notAuditedId, 1 ); // not mapped because @NotAudited should override any other behavior. @@ -162,7 +162,7 @@ public class EmbeddableTest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9229" ) + @JiraKey( value = "HHH-9229" ) public void testEmptyEmbeddableWithAuditOverride() { final PersistentClass clazz = getPersistentClass( OverrideEmbeddableEntity.class, overridedId, 1 ); assertFalse( clazz.hasProperty( "embeddable_strValue" ) ); @@ -170,7 +170,7 @@ public class EmbeddableTest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9229" ) + @JiraKey( value = "HHH-9229" ) public void testEmptyEmbeddableNoAuditOverrides() { final PersistentClass clazz = getPersistentClass( SimpleEmbeddableEntity.class, simpleId, 1 ); assertFalse( clazz.hasProperty( "embeddable_strValue" ) ); @@ -178,7 +178,7 @@ public class EmbeddableTest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9229" ) + @JiraKey( value = "HHH-9229" ) public void testEmptyEmbeddableWithAuditOverrideForMappedSuperclass() { final PersistentClass clazz = getPersistentClass( SimpleEmbeddableWithOverrideEntity.class, @@ -190,7 +190,7 @@ public class EmbeddableTest extends BaseEnversJPAFunctionalTestCase { } @Test - @TestForIssue( jiraKey = "HHH-9229" ) + @JiraKey( value = "HHH-9229" ) public void testEmptyEmbeddableWithPropertyAuditOverride() { final PersistentClass clazz = getPersistentClass( SimpleEmbeddableWithPropertyOverrideEntity.class, diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java index dba883a7c5..aee120f205 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java @@ -13,14 +13,14 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-4439") +@JiraKey(value = "HHH-4439") public class MixedOverrideTest extends BaseEnversJPAFunctionalTestCase { private Integer mixedEntityId = null; private Table mixedTable = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java index be247fc7e4..fff352c3cb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java @@ -19,7 +19,7 @@ import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertTrue; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11131") +@JiraKey(value = "HHH-11131") @RequiresDialectFeature( DialectChecks.SupportsSequences.class ) public class OrderSequenceGenerationTest extends BaseEnversJPAFunctionalTestCase { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java index 9c29c51e0f..b4f814d637 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java @@ -13,14 +13,14 @@ import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-7106") +@JiraKey(value = "HHH-7106") public class SchemaExportTest extends BaseEnversFunctionalTestCase { private Integer id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java index 3e8132d900..ca866246fc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Id; import org.hibernate.cfg.Configuration; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -24,7 +24,7 @@ public class BasicIntegratorTest { * to be on the classpath but we have no audited entities */ @Test - @TestForIssue( jiraKey = "HHH-9675" ) + @JiraKey( value = "HHH-9675" ) public void testNoAudited() { new Configuration().buildSessionFactory( ServiceRegistryUtil.serviceRegistry()).close(); new Configuration().addAnnotatedClass( SimpleNonAuditedEntity.class ).buildSessionFactory(ServiceRegistryUtil.serviceRegistry()).close(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java index 9146956f84..90a820819a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java @@ -22,7 +22,7 @@ import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.orm.test.envers.entities.onetomany.SetRefEdEntity; import org.hibernate.orm.test.envers.entities.onetomany.SetRefIngEntity; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -36,7 +36,7 @@ public class EvictAuditDataAfterCommitTest extends BaseEnversFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-6614") + @JiraKey(value = "HHH-6614") public void testSessionCacheClear() { Session session = openSession(); session.getTransaction().begin(); @@ -47,7 +47,7 @@ public class EvictAuditDataAfterCommitTest extends BaseEnversFunctionalTestCase } @Test - @TestForIssue(jiraKey = "HHH-6614") + @JiraKey(value = "HHH-6614") public void testSessionCacheCollectionClear() { final String[] auditEntityNames = new String[] { "org.hibernate.orm.test.envers.entities.onetomany.SetRefEdEntity_AUD", diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/ExportIdentifierTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/ExportIdentifierTest.java index d53ca0306b..f68198fb8f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/ExportIdentifierTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/ExportIdentifierTest.java @@ -20,7 +20,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.id.enhanced.SequenceStructure; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.Test; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; public class ExportIdentifierTest extends BaseUnitTestCase { @Test - @TestForIssue( jiraKey = "HHH-12935" ) + @JiraKey( value = "HHH-12935" ) public void testUniqueExportableIdentifier() { final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry(); final MetadataBuilderImpl.MetadataBuildingOptionsImpl options = new MetadataBuilderImpl.MetadataBuildingOptionsImpl( ssr ); diff --git a/hibernate-envers/src/test_legacy/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java b/hibernate-envers/src/test_legacy/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java index d2a3bc8708..e0a5f37931 100644 --- a/hibernate-envers/src/test_legacy/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java +++ b/hibernate-envers/src/test_legacy/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java @@ -10,12 +10,12 @@ import java.util.Map; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-8497") +@JiraKey(value = "HHH-8497") public class ClassicQueryTranslatorFactoryTest extends Simple { @Override protected void addConfigOptions(Map options) { diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java index 83837ec5a1..ac85e9b32d 100644 --- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java +++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java @@ -28,7 +28,7 @@ import org.hibernate.dialect.SybaseASEDialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.service.ServiceRegistry; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.orm.junit.DialectContext; import org.hibernate.testing.orm.junit.SkipForDialect; @@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Zhenlei Huang */ -@TestForIssue(jiraKey = "HHH-10649") +@JiraKey(value = "HHH-10649") @BaseUnitTest public class RefreshUpdatedDataTest { private ServiceRegistry serviceRegistry; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/hhh15669/TestStWithinBug.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/hhh15669/TestStWithinBug.java index 37533c50ce..6050361478 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/hhh15669/TestStWithinBug.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/oracle/hhh15669/TestStWithinBug.java @@ -14,7 +14,7 @@ import org.hibernate.dialect.OracleDialect; import org.hibernate.spatial.HibernateSpatialConfigurationSettings; import org.hibernate.spatial.testing.SpatialSessionFactoryAware; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -40,7 +40,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hibernate.testing.hamcrest.CollectionMatchers.hasSize; -@TestForIssue(jiraKey = "HHH-15669") +@JiraKey(value = "HHH-15669") @DomainModel(annotatedClasses = { Foo.class }) @RequiresDialect(value = OracleDialect.class) @SessionFactory diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/DirtyCheckingTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/DirtyCheckingTest.java index edb4c93bee..99938a0554 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/DirtyCheckingTest.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14523/DirtyCheckingTest.java @@ -23,7 +23,7 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import org.geolatte.geom.codec.Wkt; @@ -33,7 +33,7 @@ import org.locationtech.jts.geom.Point; import static org.junit.Assert.assertEquals; -@TestForIssue(jiraKey = "HHH-14523") +@JiraKey(value = "HHH-14523") @RequiresDialect(PostgreSQLDialect.class) public class DirtyCheckingTest extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14932/TestUsingPostgisWkb221AndLater.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14932/TestUsingPostgisWkb221AndLater.java index 164ee22725..c79bfdcad7 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14932/TestUsingPostgisWkb221AndLater.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/hhh14932/TestUsingPostgisWkb221AndLater.java @@ -12,7 +12,7 @@ import java.util.List; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.geolatte.geom.crs.CoordinateReferenceSystems.WGS84; import static org.junit.Assert.assertEquals; -@TestForIssue(jiraKey = "HHH-14932") +@JiraKey(value = "HHH-14932") @RequiresDialect(PostgreSQLDialect.class) public class TestUsingPostgisWkb221AndLater extends BaseCoreFunctionalTestCase { diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/geometry/JTSUtilsTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/geometry/JTSUtilsTest.java index 300aae732b..d7da732368 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/geometry/JTSUtilsTest.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/geometry/JTSUtilsTest.java @@ -7,8 +7,7 @@ package org.hibernate.spatial.geometry; -import org.hibernate.testing.TestForIssue; -import org.junit.Ignore; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import org.geolatte.geom.codec.Wkt; @@ -21,7 +20,7 @@ import static org.junit.Assert.assertTrue; public class JTSUtilsTest { @Test - @TestForIssue(jiraKey = "HHH-14757") + @JiraKey(value = "HHH-14757") public void testGeometryCollection() { Geometry elem2a = JTS.to( Wkt.fromWkt( "GEOMETRYCOLLECTION(POINT(2 3),LINESTRING(2 3,3 4))" ) ); Geometry elem2b = JTS.to( Wkt.fromWkt( "GEOMETRYCOLLECTION(POINT(2 3),LINESTRING(2 3,3 4))" ) ); diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/TestForIssue.java b/hibernate-testing/src/main/java/org/hibernate/testing/TestForIssue.java deleted file mode 100644 index 962a89c21a..0000000000 --- a/hibernate-testing/src/main/java/org/hibernate/testing/TestForIssue.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.testing; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -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. - * @return The jira issue key - */ - String[] jiraKey(); -} diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java index 2c9531dba0..85c1569c92 100644 --- a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java +++ b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java @@ -11,7 +11,7 @@ import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.nullValue; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.jboss.logging.Logger; import org.jboss.logging.Logger.Level; import org.junit.Test; @@ -23,7 +23,7 @@ import org.junit.Test; * * @author Sanne Grinovero (C) 2015 Red Hat Inc. */ -@TestForIssue(jiraKey = "HHH-9658") +@JiraKey(value = "HHH-9658") public class LogDelegationTest { private static final Logger LOG = Logger.getLogger( LogDelegationTest.class.getName() ); diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java index f4aa1e7bac..e10507eaeb 100644 --- a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java +++ b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java @@ -8,7 +8,7 @@ package org.hibernate.testing.logger; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.SessionImpl; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Rule; @@ -21,7 +21,7 @@ import java.lang.invoke.MethodHandles; * * @author Sanne Grinovero (C) 2015 Red Hat Inc. */ -@TestForIssue(jiraKey = "HHH-9658") +@JiraKey(value = "HHH-9658") public class LoggingRuleTest { //Taking this specific logger as a representative example of a Logger