diff --git a/gradle/databases.gradle b/gradle/databases.gradle index 9e4ac21bb51d..55b6314399c1 100644 --- a/gradle/databases.gradle +++ b/gradle/databases.gradle @@ -386,7 +386,7 @@ if ( processTestResourcesTask != null ) { processTestResourcesTask.inputs.property( 'dbHost', dbHost ) // processTestResourcesTask.inputs.property( "gradle.libs.versions.h2", project.getProperty( "gradle.libs.versions.h2", "2.1.214" ) ) // processTestResourcesTask.inputs.property( "gradle.libs.versions.h2gis", project.getProperty( "gradle.libs.versions.h2gis", "2.1.0" ) ) -// processTestResourcesTask.inputs.property( "gradle.libs.versions.hsqldb", project.getProperty( "gradle.libs.versions.hsqldb", "2.7.2" ) ) +// processTestResourcesTask.inputs.property( "gradle.libs.versions.hsqldb", project.getProperty( "gradle.libs.versions.hsqldb", "2.7.4" ) ) // processTestResourcesTask.inputs.property( "gradle.libs.versions.derby", project.getProperty( "gradle.libs.versions.derby", "10.15.2.0" ) ) processTestResourcesTask.filter( ReplaceTokens, tokens: dbBundle[db] ) } 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 337277c44c46..48c2a8f0ca4f 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 @@ -13,11 +13,13 @@ import org.hibernate.c3p0.internal.C3P0ConnectionProvider; import org.hibernate.cfg.Environment; +import org.hibernate.dialect.SybaseASEDialect; import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.ConnectionProviderJdbcConnectionAccess; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.testing.orm.junit.SkipForDialect; import org.junit.Test; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; @@ -27,6 +29,8 @@ /** * @author Strong Liu */ +@SkipForDialect(dialectClass = SybaseASEDialect.class, + reason = "JtdsConnection.isValid not implemented") public class C3P0ConnectionProviderTest extends BaseCoreFunctionalTestCase { @Override diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3p0TransactionIsolationConfigTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3p0TransactionIsolationConfigTest.java index 8cb4cbfaf755..a7e23c5da70a 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3p0TransactionIsolationConfigTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3p0TransactionIsolationConfigTest.java @@ -8,6 +8,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.c3p0.internal.C3P0ConnectionProvider; import org.hibernate.community.dialect.AltibaseDialect; +import org.hibernate.dialect.SybaseASEDialect; import org.hibernate.dialect.TiDBDialect; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.ServiceRegistryImplementor; @@ -21,6 +22,7 @@ */ @SkipForDialect(value = TiDBDialect.class, comment = "Doesn't support SERIALIZABLE isolation") @SkipForDialect(value = AltibaseDialect.class, comment = "Altibase cannot change isolation level in autocommit mode") +@SkipForDialect(value = SybaseASEDialect.class, comment = "JtdsConnection.isValid not implemented") public class C3p0TransactionIsolationConfigTest extends BaseTransactionIsolationConfigTest { private StandardServiceRegistry ssr; 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 61cb5df93e5d..75e287d132d5 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 @@ -9,6 +9,9 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; +import org.hibernate.dialect.SQLServerDialect; +import org.hibernate.dialect.SybaseASEDialect; +import org.hibernate.testing.orm.junit.SkipForDialect; import org.junit.Assert; import org.junit.Test; @@ -20,9 +23,13 @@ * * @author Shawn Clowater */ +@SkipForDialect(dialectClass = SybaseASEDialect.class, + reason = "JtdsConnection.isValid not implemented") public class StatementCacheTest extends BaseCoreFunctionalTestCase { @Test @JiraKey(value = "HHH-7193") + @SkipForDialect(dialectClass = SQLServerDialect.class, + reason = "started failing after upgrade to c3p0 0.10") public void testStatementCaching() { inSession( session -> { @@ -56,7 +63,8 @@ public void testStatementCaching() { } ); - //only one entity should have been inserted to the database (if the statement in the cache wasn't cleared then it would have inserted both entities) + // only one entity should have been inserted to the database + // (if the statement in the cache wasn't cleared then it would have inserted both entities) inTransaction( session -> { CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlRestrictionOverridesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlRestrictionOverridesTest.java index 2a898baa9633..18d16f011963 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlRestrictionOverridesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlRestrictionOverridesTest.java @@ -34,7 +34,7 @@ @RequiresDialect(MySQLDialect.class) @RequiresDialect(SQLServerDialect.class) @RequiresDialect(PostgreSQLDialect.class) -@RequiresDialect(DB2Dialect.class) +@RequiresDialect(value = DB2Dialect.class, majorVersion = 11) @RequiresDialect(OracleDialect.class) public class CustomSqlRestrictionOverridesTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/ReSaveReferencedDeletedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/ReSaveReferencedDeletedEntity.java index 855055d7cb2d..fb6a21e8c30e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/ReSaveReferencedDeletedEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/ReSaveReferencedDeletedEntity.java @@ -6,14 +6,18 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; +import org.hibernate.dialect.HANADialect; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.testing.orm.junit.SkipForDialect; import org.junit.Test; import jakarta.persistence.*; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; +@SkipForDialect( dialectClass = HANADialect.class, + reason = "The INSERT statement for table [Child] contains no column, and this is not supported") public class ReSaveReferencedDeletedEntity extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-testing/hibernate-testing.gradle b/hibernate-testing/hibernate-testing.gradle index 68d556ff9a70..00c4916b89a1 100644 --- a/hibernate-testing/hibernate-testing.gradle +++ b/hibernate-testing/hibernate-testing.gradle @@ -21,13 +21,13 @@ dependencies { api testLibs.assertjCore api testLibs.mockito - api testLibs.mockitoInline +// api testLibs.mockitoInline api testLibs.byteman api testLibs.bytemanInstall api testLibs.bytemanBmunit - api testLibs.xapool +// api testLibs.xapool api( testLibs.jbossTxSpi ) { transitive=false; } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil2.java b/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil2.java index a5629bc64b95..7bd0c8a059c3 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil2.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil2.java @@ -28,7 +28,7 @@ public class TransactionUtil2 { public static void inSession(SessionFactoryImplementor sfi, Consumer action) { log.trace( "#inSession(SF,action)" ); - try (SessionImplementor session = (SessionImplementor) sfi.openSession()) { + try (SessionImplementor session = sfi.openSession()) { log.trace( "Session opened, calling action" ); action.accept( session ); log.trace( "called action" ); @@ -41,7 +41,7 @@ public static void inSession(SessionFactoryImplementor sfi, Consumer R fromSession(SessionFactoryImplementor sfi, Function action) { log.trace( "#inSession(SF,action)" ); - try (SessionImplementor session = (SessionImplementor) sfi.openSession()) { + try (SessionImplementor session = sfi.openSession()) { log.trace( "Session opened, calling action" ); return action.apply( session ); } @@ -54,7 +54,7 @@ public static R inSessionReturn(SessionFactoryImplementor sfi, Function