Skip to content

Commit 54a3b51

Browse files
committed
Re-enable all Db2 test that were causing IllegalStateException
1 parent 6cc86b1 commit 54a3b51

17 files changed

+79
-155
lines changed

hibernate-reactive-core/src/test/java/org/hibernate/reactive/FilterWithPaginationTest.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,11 @@
55
*/
66
package org.hibernate.reactive;
77

8-
import java.util.Collection;
9-
import java.util.List;
10-
import java.util.Objects;
11-
import java.util.concurrent.CompletionStage;
12-
138
import org.hibernate.annotations.Filter;
149
import org.hibernate.annotations.FilterDef;
1510
import org.hibernate.annotations.ParamDef;
1611
import org.hibernate.reactive.mutiny.Mutiny;
1712
import org.hibernate.reactive.stage.Stage;
18-
import org.hibernate.reactive.annotations.DisabledFor;
1913
import org.hibernate.type.descriptor.java.StringJavaType;
2014

2115
import org.junit.jupiter.api.BeforeEach;
@@ -29,18 +23,20 @@
2923
import jakarta.persistence.Enumerated;
3024
import jakarta.persistence.Id;
3125
import jakarta.persistence.NamedQuery;
26+
import java.util.Collection;
27+
import java.util.List;
28+
import java.util.Objects;
29+
import java.util.concurrent.CompletionStage;
3230

3331
import static java.util.concurrent.TimeUnit.MINUTES;
3432
import static org.assertj.core.api.Assertions.assertThat;
3533
import static org.hibernate.query.Page.first;
3634
import static org.hibernate.query.Page.page;
37-
import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.DB2;
3835

3936
/**
4037
* Test the combination of filters, max results, first result, and {@link org.hibernate.query.Page}.
4138
*/
4239
@Timeout(value = 10, timeUnit = MINUTES)
43-
@DisabledFor(value = DB2, reason = "IllegalStateException: Needed to have 6 in buffer but only had 0")
4440
public class FilterWithPaginationTest extends BaseReactiveTest {
4541

4642
FamousPerson margaret = new FamousPerson( 1L, "Margaret Howe Lovatt", Status.LIVING, "the woman who lived in a half-flooded home with a dolphin." );

hibernate-reactive-core/src/test/java/org/hibernate/reactive/HQLQueryParameterNamedLimitTest.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
*/
66
package org.hibernate.reactive;
77

8-
import java.util.Collection;
9-
import java.util.List;
10-
import java.util.Objects;
11-
12-
import org.hibernate.reactive.annotations.DisabledFor;
13-
148
import org.junit.jupiter.api.BeforeEach;
159
import org.junit.jupiter.api.Test;
1610

@@ -19,18 +13,19 @@
1913
import jakarta.persistence.Entity;
2014
import jakarta.persistence.Id;
2115
import jakarta.persistence.Table;
16+
import java.util.Collection;
17+
import java.util.List;
18+
import java.util.Objects;
2219

2320
import static java.util.concurrent.TimeUnit.MINUTES;
2421
import static org.assertj.core.api.Assertions.assertThat;
25-
import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.DB2;
2622
import static org.junit.jupiter.api.Assertions.assertEquals;
2723

2824
/**
2925
* Tests queries using named parameters like ":name",
3026
* as defined by the JPA specification, along with limit parameters
3127
*/
3228
@Timeout(value = 10, timeUnit = MINUTES)
33-
@DisabledFor(value = DB2, reason = "java.lang.IllegalStateException: Needed to have 6 in buffer but only had 0")
3429
public class HQLQueryParameterNamedLimitTest extends BaseReactiveTest {
3530

3631
Flour spelt = new Flour( 1, "Spelt", "An ancient grain, is a hexaploid species of wheat.", "Wheat flour" );

hibernate-reactive-core/src/test/java/org/hibernate/reactive/HQLQueryParameterPositionalLimitTest.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
*/
66
package org.hibernate.reactive;
77

8-
import java.util.Collection;
9-
import java.util.List;
10-
import java.util.Objects;
11-
12-
import org.hibernate.reactive.annotations.DisabledFor;
13-
148
import org.junit.jupiter.api.BeforeEach;
159
import org.junit.jupiter.api.Test;
1610

@@ -19,10 +13,12 @@
1913
import jakarta.persistence.Entity;
2014
import jakarta.persistence.Id;
2115
import jakarta.persistence.Table;
16+
import java.util.Collection;
17+
import java.util.List;
18+
import java.util.Objects;
2219

2320
import static java.util.concurrent.TimeUnit.MINUTES;
2421
import static org.assertj.core.api.Assertions.assertThat;
25-
import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.DB2;
2622
import static org.junit.jupiter.api.Assertions.assertEquals;
2723

2824
/**
@@ -76,7 +72,6 @@ public void testFirstResultNoResults(VertxTestContext context) {
7672
}
7773

7874
@Test
79-
@DisabledFor(value = DB2, reason = "Exception: IllegalStateException: Needed to have 6 in buffer but only had 0")
8075
public void testFirstResultSingleResult(VertxTestContext context) {
8176
test( context, openSession()
8277
.thenCompose( s -> s
@@ -90,7 +85,6 @@ public void testFirstResultSingleResult(VertxTestContext context) {
9085
}
9186

9287
@Test
93-
@DisabledFor(value = DB2, reason = "Exception: IllegalStateException: Needed to have 6 in buffer but only had 0")
9488
public void testFirstResultMultipleResults(VertxTestContext context) {
9589
test( context, openSession()
9690
.thenCompose( s -> s
@@ -103,7 +97,6 @@ public void testFirstResultMultipleResults(VertxTestContext context) {
10397
}
10498

10599
@Test
106-
@DisabledFor(value = DB2, reason = "Exception: IllegalStateException: Needed to have 6 in buffer but only had 0")
107100
public void testFirstResultMaxResultsSingleResult(VertxTestContext context) {
108101
test( context, openSession()
109102
.thenCompose( s -> s

hibernate-reactive-core/src/test/java/org/hibernate/reactive/IdentifierGenerationTypeTest.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55
*/
66
package org.hibernate.reactive;
77

8-
import java.util.Arrays;
9-
import java.util.Collection;
10-
import java.util.List;
11-
import java.util.Objects;
12-
13-
import org.hibernate.reactive.annotations.DisabledFor;
14-
158
import org.junit.jupiter.api.Test;
169

1710
import io.vertx.junit5.Timeout;
@@ -20,10 +13,13 @@
2013
import jakarta.persistence.Entity;
2114
import jakarta.persistence.GeneratedValue;
2215
import jakarta.persistence.Id;
16+
import java.util.Arrays;
17+
import java.util.Collection;
18+
import java.util.List;
19+
import java.util.Objects;
2320
import org.assertj.core.api.Assertions;
2421

2522
import static java.util.concurrent.TimeUnit.MINUTES;
26-
import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.DB2;
2723
import static org.junit.jupiter.api.Assertions.assertEquals;
2824
import static org.junit.jupiter.api.Assertions.assertNotEquals;
2925
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -34,8 +30,6 @@
3430
* @see org.hibernate.reactive.id.impl.IdentifierGeneration
3531
*/
3632
@Timeout(value = 10, timeUnit = MINUTES)
37-
@DisabledFor(value = DB2, reason = "Exception: IllegalStateException: Needed to have 6 in buffer but only had 0. " +
38-
"See https://github.com/eclipse-vertx/vertx-sql-client/issues/899")
3933
public class IdentifierGenerationTypeTest extends BaseReactiveTest {
4034

4135
@Override

hibernate-reactive-core/src/test/java/org/hibernate/reactive/LazyReplaceOrphanedEntityTest.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@
55
*/
66
package org.hibernate.reactive;
77

8-
import java.io.Serializable;
9-
import java.time.OffsetDateTime;
10-
import java.util.Collection;
11-
import java.util.List;
12-
import java.util.UUID;
13-
import java.util.concurrent.CompletionStage;
14-
15-
import org.hibernate.reactive.annotations.DisabledFor;
168
import org.hibernate.reactive.util.impl.CompletionStages;
179

1810
import org.junit.jupiter.api.BeforeEach;
@@ -33,13 +25,17 @@
3325
import jakarta.persistence.InheritanceType;
3426
import jakarta.persistence.JoinColumn;
3527
import jakarta.persistence.OneToOne;
28+
import java.io.Serializable;
29+
import java.time.OffsetDateTime;
30+
import java.util.Collection;
31+
import java.util.List;
32+
import java.util.UUID;
33+
import java.util.concurrent.CompletionStage;
3634

3735
import static java.util.concurrent.TimeUnit.MINUTES;
3836
import static org.assertj.core.api.Assertions.assertThat;
39-
import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.DB2;
4037

4138
@Timeout(value = 10, timeUnit = MINUTES)
42-
@DisabledFor(value = DB2, reason = "Exception: IllegalStateException: Needed to have 6 in buffer but only had 0")
4339
public class LazyReplaceOrphanedEntityTest extends BaseReactiveTest {
4440

4541
private Campaign theCampaign;

hibernate-reactive-core/src/test/java/org/hibernate/reactive/MutinyExceptionsTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import static org.hibernate.reactive.testing.ReactiveAssertions.assertThrown;
3030

3131
@Timeout(value = 10, timeUnit = MINUTES)
32-
3332
public class MutinyExceptionsTest extends BaseReactiveTest {
3433

3534
@Override

hibernate-reactive-core/src/test/java/org/hibernate/reactive/ORMReactivePersistenceTest.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
*/
66
package org.hibernate.reactive;
77

8-
import java.util.Collection;
9-
import java.util.List;
10-
import java.util.Objects;
11-
128
import org.hibernate.Session;
139
import org.hibernate.SessionFactory;
1410
import org.hibernate.boot.registry.StandardServiceRegistry;
@@ -25,22 +21,22 @@
2521
import jakarta.persistence.Entity;
2622
import jakarta.persistence.Id;
2723
import jakarta.persistence.Table;
24+
import java.util.Collection;
25+
import java.util.List;
26+
import java.util.Objects;
2827

2928
import static java.util.concurrent.TimeUnit.MINUTES;
3029
import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.COCKROACHDB;
31-
import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.DB2;
3230
import static org.hibernate.reactive.containers.DatabaseConfiguration.dbType;
3331
import static org.hibernate.reactive.provider.Settings.DIALECT;
3432
import static org.hibernate.reactive.provider.Settings.DRIVER;
3533
import static org.junit.jupiter.api.Assertions.assertEquals;
3634

37-
@Timeout(value = 10, timeUnit = MINUTES)
38-
3935
/**
4036
* This test class verifies that data can be persisted and queried on the same database
4137
* using both JPA/hibernate and reactive session factories.
4238
*/
43-
@DisabledFor(value = DB2, reason = "Exception: IllegalStateException: Needed to have 6 in buffer but only had 0")
39+
@Timeout(value = 10, timeUnit = MINUTES)
4440
@DisabledFor(value = COCKROACHDB, reason = "We need to change the URL schema we normally use for testing")
4541
public class ORMReactivePersistenceTest extends BaseReactiveTest {
4642

hibernate-reactive-core/src/test/java/org/hibernate/reactive/OrderQueriesTestBase.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,10 @@
55
*/
66
package org.hibernate.reactive;
77

8-
import java.util.ArrayList;
9-
import java.util.Collection;
10-
import java.util.List;
11-
import java.util.Objects;
12-
138
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
149
import org.hibernate.cfg.Configuration;
1510
import org.hibernate.reactive.provider.Settings;
1611
import org.hibernate.reactive.testing.SqlStatementTracker;
17-
import org.hibernate.reactive.annotations.DisabledFor;
1812

1913
import org.junit.jupiter.api.AfterEach;
2014
import org.junit.jupiter.api.Test;
@@ -25,19 +19,20 @@
2519
import jakarta.persistence.Entity;
2620
import jakarta.persistence.Id;
2721
import jakarta.persistence.Table;
22+
import java.util.ArrayList;
23+
import java.util.Collection;
24+
import java.util.List;
25+
import java.util.Objects;
2826

2927
import static java.util.concurrent.TimeUnit.MINUTES;
3028
import static org.assertj.core.api.Assertions.assertThat;
31-
import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.DB2;
3229

3330
/**
3431
* Test {@code hibernate.order_updates} and {@code hibernate.order_inserts} configurations.
3532
*
3633
* @see Settings#ORDER_INSERTS
3734
* @see Settings#ORDER_UPDATES
3835
*/
39-
40-
@DisabledFor(value = DB2, reason = "Exception: IllegalStateException: Needed to have 6 in buffer but only had 0")
4136
public abstract class OrderQueriesTestBase extends BaseReactiveTest {
4237

4338
public static class OrderUpdatesTest extends OrderQueriesTestBase {

hibernate-reactive-core/src/test/java/org/hibernate/reactive/OrphanRemovalTest.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@
55
*/
66
package org.hibernate.reactive;
77

8-
import java.util.Collection;
9-
import java.util.HashSet;
10-
import java.util.List;
11-
import java.util.Objects;
12-
import java.util.Set;
13-
import java.util.concurrent.CompletionStage;
14-
15-
16-
import org.hibernate.reactive.annotations.DisabledFor;
17-
188
import org.junit.jupiter.api.Test;
199

2010
import io.vertx.junit5.Timeout;
@@ -25,16 +15,20 @@
2515
import jakarta.persistence.ManyToOne;
2616
import jakarta.persistence.OneToMany;
2717
import jakarta.persistence.Table;
18+
import java.util.Collection;
19+
import java.util.HashSet;
20+
import java.util.List;
21+
import java.util.Objects;
22+
import java.util.Set;
23+
import java.util.concurrent.CompletionStage;
2824

2925
import static jakarta.persistence.CascadeType.ALL;
3026
import static jakarta.persistence.CascadeType.PERSIST;
3127
import static jakarta.persistence.CascadeType.REMOVE;
3228
import static java.util.concurrent.TimeUnit.MINUTES;
3329
import static org.assertj.core.api.Assertions.assertThat;
34-
import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.DB2;
3530

3631
@Timeout( value = 10, timeUnit = MINUTES)
37-
@DisabledFor( value = DB2, reason = "IllegalStateException: Needed to have 6 in buffer but only had 0" )
3832
public class OrphanRemovalTest extends BaseReactiveTest {
3933

4034
@Override

hibernate-reactive-core/src/test/java/org/hibernate/reactive/RowIdUpdateAndDeleteTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@
55
*/
66
package org.hibernate.reactive;
77

8-
import java.util.Collection;
9-
import java.util.List;
10-
118
import org.hibernate.annotations.RowId;
129
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
1310
import org.hibernate.cfg.Configuration;
14-
import org.hibernate.reactive.testing.SqlStatementTracker;
1511
import org.hibernate.reactive.annotations.DisabledFor;
12+
import org.hibernate.reactive.testing.SqlStatementTracker;
1613

1714
import org.junit.jupiter.api.BeforeEach;
1815
import org.junit.jupiter.api.Test;
@@ -25,15 +22,15 @@
2522
import jakarta.persistence.MapsId;
2623
import jakarta.persistence.OneToOne;
2724
import jakarta.persistence.Table;
25+
import java.util.Collection;
26+
import java.util.List;
2827

2928
import static org.assertj.core.api.Assertions.assertThat;
30-
import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.DB2;
3129
import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.ORACLE;
3230

3331
/**
3432
* Adapted from the test with the same name in Hibernate ORM: {@literal org.hibernate.orm.test.rowid.RowIdUpdateAndDeleteTest}
3533
*/
36-
@DisabledFor(value = DB2, reason = "Exception: IllegalStateException: Needed to have 6 in buffer but only had 0")
3734
@DisabledFor(value = ORACLE, reason = "Vert.x driver doesn't support RowId type parameters")
3835
public class RowIdUpdateAndDeleteTest extends BaseReactiveTest {
3936

0 commit comments

Comments
 (0)