Skip to content

Commit d722178

Browse files
committed
Drop JUnit 4 usage
1 parent 69740f1 commit d722178

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalTransactionIsolationConfigTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@
1010
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
1111

1212
import org.hibernate.test.agroal.util.GradleParallelTestingAgroalConnectionProvider;
13-
import org.hibernate.testing.SkipForDialect;
1413
import org.hibernate.testing.orm.common.BaseTransactionIsolationConfigTest;
1514
import org.hibernate.testing.orm.junit.ServiceRegistryScope;
15+
import org.hibernate.testing.orm.junit.SkipForDialect;
1616

1717
/**
1818
* @author Steve Ebersole
1919
*/
20-
@SkipForDialect(value = TiDBDialect.class, comment = "Doesn't support SERIALIZABLE isolation")
21-
@SkipForDialect(value = AltibaseDialect.class, comment = "Altibase cannot change isolation level in autocommit mode")
22-
@SkipForDialect(value = GaussDBDialect.class, comment = "GaussDB does not support SERIALIZABLE isolation")
20+
@SkipForDialect(dialectClass = TiDBDialect.class,
21+
reason = "Doesn't support SERIALIZABLE isolation")
22+
@SkipForDialect(dialectClass = AltibaseDialect.class,
23+
reason = "Altibase cannot change isolation level in autocommit mode")
24+
@SkipForDialect(dialectClass = GaussDBDialect.class,
25+
reason = "GaussDB does not support SERIALIZABLE isolation")
2326
public class AgroalTransactionIsolationConfigTest extends BaseTransactionIsolationConfigTest {
2427
@Override
2528
protected ConnectionProvider getConnectionProviderUnderTest(ServiceRegistryScope registryScope) {

hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPConnectionProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @author Brett Meyer
3030
*/
3131
@SuppressWarnings("JUnitMalformedDeclaration")
32-
@SkipForDialect(dialectClass = SybaseDialect.class, reason = "The jTDS driver doesn't implement Connection#isValid so this fails")
32+
@SkipForDialect(dialectClass = SybaseDialect.class, matchSubTypes = true, reason = "The jTDS driver doesn't implement Connection#isValid so this fails")
3333
@ServiceRegistry
3434
@SessionFactory
3535
public class HikariCPConnectionProviderTest {

hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @author Vlad Mihalcea
3030
*/
3131
@SuppressWarnings("JUnitMalformedDeclaration")
32-
@SkipForDialect(dialectClass = SybaseDialect.class, reason = "The jTDS driver doesn't implement Connection#isValid so this fails")
32+
@SkipForDialect(dialectClass = SybaseDialect.class, matchSubTypes = true, reason = "The jTDS driver doesn't implement Connection#isValid so this fails")
3333
@ServiceRegistry(
3434
settings = {
3535
@Setting( name = CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT, value = "true" ),

hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariTransactionIsolationConfigTest.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,22 @@
1111
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
1212

1313
import org.hibernate.test.hikaricp.util.GradleParallelTestingHikariCPConnectionProvider;
14-
import org.hibernate.testing.SkipForDialect;
1514
import org.hibernate.testing.orm.common.BaseTransactionIsolationConfigTest;
1615
import org.hibernate.testing.orm.junit.ServiceRegistryScope;
16+
import org.hibernate.testing.orm.junit.SkipForDialect;
1717

1818
/**
1919
* @author Steve Ebersole
2020
*/
21-
@SkipForDialect(value = SybaseDialect.class, comment = "The jTDS driver doesn't implement Connection#getNetworkTimeout() so this fails")
22-
@SkipForDialect(value = TiDBDialect.class, comment = "Doesn't support SERIALIZABLE isolation")
23-
@SkipForDialect(value = AltibaseDialect.class, comment = "Altibase cannot change isolation level in autocommit mode")
24-
@SkipForDialect(value = GaussDBDialect.class, comment = "GaussDB does not support SERIALIZABLE isolation")
21+
@SkipForDialect(dialectClass = SybaseDialect.class,
22+
matchSubTypes = true,
23+
reason = "The jTDS driver doesn't implement Connection#getNetworkTimeout() so this fails")
24+
@SkipForDialect(dialectClass = TiDBDialect.class,
25+
reason = "Doesn't support SERIALIZABLE isolation")
26+
@SkipForDialect(dialectClass = AltibaseDialect.class,
27+
reason = "Altibase cannot change isolation level in autocommit mode")
28+
@SkipForDialect(dialectClass = GaussDBDialect.class,
29+
reason = "GaussDB does not support SERIALIZABLE isolation")
2530
public class HikariTransactionIsolationConfigTest extends BaseTransactionIsolationConfigTest {
2631
@Override
2732
protected ConnectionProvider getConnectionProviderUnderTest(ServiceRegistryScope registryScope) {

0 commit comments

Comments
 (0)