Skip to content

Commit 6c1d266

Browse files
committed
[#1582] Specify the timeout for each test class
The annotation `@TimeOut` in Vert.x JUnit 5 is not inherited like before. See eclipse-vertx/vertx-junit5#121
1 parent 1e2bbd2 commit 6c1d266

File tree

149 files changed

+584
-35
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+584
-35
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import java.util.List;
1010
import java.util.concurrent.CompletableFuture;
1111
import java.util.concurrent.CompletionStage;
12-
import java.util.concurrent.TimeUnit;
1312
import java.util.function.Supplier;
1413

1514
import org.hibernate.SessionFactory;
@@ -46,6 +45,7 @@
4645
import io.vertx.junit5.VertxTestContext;
4746
import jakarta.persistence.criteria.CriteriaQuery;
4847

48+
import static java.util.concurrent.TimeUnit.MINUTES;
4949
import static org.hibernate.reactive.containers.DatabaseConfiguration.dbType;
5050
import static org.hibernate.reactive.util.impl.CompletionStages.loop;
5151
import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
@@ -65,7 +65,6 @@
6565
*/
6666
@ExtendWith(VertxExtension.class)
6767
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
68-
@Timeout(value = 20, timeUnit = TimeUnit.MINUTES)
6968
public abstract class BaseReactiveTest {
7069
/**
7170
* Configure Vertx JUnit5 test context
@@ -76,7 +75,7 @@ public abstract class BaseReactiveTest {
7675
private static VertxOptions vertxOptions() {
7776
return new VertxOptions()
7877
.setBlockedThreadCheckInterval( 10 )
79-
.setBlockedThreadCheckIntervalUnit( TimeUnit.MINUTES );
78+
.setBlockedThreadCheckIntervalUnit( MINUTES );
8079
}
8180

8281
/**
@@ -179,6 +178,7 @@ private <T> CriteriaQuery<T> queryForDelete(Class<T> entityClass) {
179178
}
180179

181180
@BeforeEach
181+
@Timeout(value = 10, timeUnit = MINUTES)
182182
public void before(VertxTestContext context) {
183183
test( context, setupSessionFactory( this::constructConfiguration ) );
184184
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.junit.jupiter.api.Disabled;
1919
import org.junit.jupiter.api.Test;
2020

21+
import io.vertx.junit5.Timeout;
2122
import io.vertx.junit5.VertxTestContext;
2223
import jakarta.persistence.CascadeType;
2324
import jakarta.persistence.Entity;
@@ -37,10 +38,13 @@
3738
import jakarta.persistence.Transient;
3839
import jakarta.persistence.Version;
3940

41+
import static java.util.concurrent.TimeUnit.MINUTES;
4042
import static org.junit.jupiter.api.Assertions.assertEquals;
4143
import static org.junit.jupiter.api.Assertions.assertFalse;
4244
import static org.junit.jupiter.api.Assertions.assertTrue;
4345

46+
@Timeout(value = 10, timeUnit = MINUTES)
47+
4448
public class BatchFetchTest extends BaseReactiveTest {
4549

4650
@Override

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,17 @@
1919

2020
import org.junit.jupiter.api.Test;
2121

22+
import io.vertx.junit5.Timeout;
2223
import io.vertx.junit5.VertxTestContext;
2324
import jakarta.persistence.Entity;
2425
import jakarta.persistence.Id;
2526

27+
import static java.util.concurrent.TimeUnit.MINUTES;
2628
import static org.hibernate.reactive.containers.DatabaseConfiguration.dbType;
2729
import static org.junit.jupiter.api.Assertions.assertEquals;
2830

31+
@Timeout(value = 10, timeUnit = MINUTES)
32+
2933
public class BatchQueryOnConnectionTest extends BaseReactiveTest {
3034

3135
private static final int BATCH_SIZE = 20;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@
2020
import org.junit.jupiter.api.BeforeEach;
2121
import org.junit.jupiter.api.Test;
2222

23+
import io.vertx.junit5.Timeout;
2324
import io.vertx.junit5.VertxTestContext;
2425

26+
import static java.util.concurrent.TimeUnit.MINUTES;
2527
import static org.assertj.core.api.Assertions.assertThat;
2628
import static org.hibernate.reactive.util.impl.CompletionStages.loop;
2729
import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
2830
import static org.junit.jupiter.api.Assertions.assertEquals;
2931

32+
@Timeout(value = 10, timeUnit = MINUTES)
33+
3034
public class BatchingConnectionTest extends ReactiveSessionTest {
3135

3236
private static SqlStatementTracker sqlTracker;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import org.junit.jupiter.api.Test;
1313

14+
import io.vertx.junit5.Timeout;
1415
import io.vertx.junit5.VertxTestContext;
1516
import jakarta.persistence.Entity;
1617
import jakarta.persistence.GeneratedValue;
@@ -19,9 +20,12 @@
1920
import jakarta.persistence.Table;
2021
import jakarta.persistence.Version;
2122

23+
import static java.util.concurrent.TimeUnit.MINUTES;
2224
import static org.junit.jupiter.api.Assertions.assertEquals;
2325
import static org.junit.jupiter.api.Assertions.assertNotNull;
2426

27+
@Timeout(value = 10, timeUnit = MINUTES)
28+
2529
public class BlockSequenceGeneratorTest extends BaseReactiveTest {
2630

2731
@Override

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import org.junit.jupiter.api.Test;
1313

14+
import io.vertx.junit5.Timeout;
1415
import io.vertx.junit5.VertxTestContext;
1516
import jakarta.persistence.Entity;
1617
import jakarta.persistence.GeneratedValue;
@@ -19,9 +20,12 @@
1920
import jakarta.persistence.TableGenerator;
2021
import jakarta.persistence.Version;
2122

23+
import static java.util.concurrent.TimeUnit.MINUTES;
2224
import static org.junit.jupiter.api.Assertions.assertEquals;
2325
import static org.junit.jupiter.api.Assertions.assertNotNull;
2426

27+
@Timeout(value = 10, timeUnit = MINUTES)
28+
2529
public class BlockTableGeneratorTest extends BaseReactiveTest {
2630

2731
@Override

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,22 @@
1414
import org.junit.jupiter.api.AfterEach;
1515
import org.junit.jupiter.api.Test;
1616

17+
import io.vertx.junit5.Timeout;
1718
import io.vertx.junit5.VertxTestContext;
1819
import jakarta.persistence.Cacheable;
1920
import jakarta.persistence.Entity;
2021
import jakarta.persistence.GeneratedValue;
2122
import jakarta.persistence.Id;
2223
import jakarta.persistence.Table;
2324

25+
import static java.util.concurrent.TimeUnit.MINUTES;
2426
import static org.hibernate.annotations.CacheConcurrencyStrategy.NONSTRICT_READ_WRITE;
2527
import static org.junit.jupiter.api.Assertions.assertEquals;
2628
import static org.junit.jupiter.api.Assertions.assertFalse;
2729
import static org.junit.jupiter.api.Assertions.assertTrue;
2830

31+
@Timeout(value = 10, timeUnit = MINUTES)
32+
2933
public class CacheTest extends BaseReactiveTest {
3034

3135
@Override

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,17 @@
1515
import org.junit.jupiter.api.Test;
1616

1717
import io.smallrye.mutiny.Uni;
18+
import io.vertx.junit5.Timeout;
1819
import io.vertx.junit5.VertxTestContext;
1920

21+
import static java.util.concurrent.TimeUnit.MINUTES;
2022
import static org.junit.jupiter.api.Assertions.assertEquals;
2123

2224
/**
2325
* Checks the # of cache hits when the configuration property Settings.GENERATE_STATISTICS is set to TRUE
2426
*/
27+
@Timeout(value = 10, timeUnit = MINUTES)
28+
2529
public class CachedQueryResultsGenerateStatisticsTest extends BaseReactiveTest {
2630

2731
@Override

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.junit.jupiter.api.Test;
2020

2121
import io.smallrye.mutiny.Uni;
22+
import io.vertx.junit5.Timeout;
2223
import io.vertx.junit5.VertxTestContext;
2324
import jakarta.persistence.Column;
2425
import jakarta.persistence.Entity;
@@ -31,6 +32,7 @@
3132
import jakarta.persistence.criteria.CriteriaQuery;
3233
import jakarta.persistence.criteria.Root;
3334

35+
import static java.util.concurrent.TimeUnit.MINUTES;
3436
import static org.assertj.core.api.Assertions.assertThat;
3537
import static org.junit.jupiter.api.Assertions.assertEquals;
3638

@@ -46,6 +48,8 @@
4648
* If the entities aren't in the cache it will load them from the db.
4749
* </p>
4850
*/
51+
@Timeout(value = 10, timeUnit = MINUTES)
52+
4953
public class CachedQueryResultsTest extends BaseReactiveTest {
5054

5155
private static final Fruit[] FRUITS = {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.junit.jupiter.api.BeforeEach;
1616
import org.junit.jupiter.api.Test;
1717

18+
import io.vertx.junit5.Timeout;
1819
import io.vertx.junit5.VertxTestContext;
1920
import jakarta.persistence.Basic;
2021
import jakarta.persistence.CascadeType;
@@ -28,6 +29,7 @@
2829
import jakarta.persistence.MappedSuperclass;
2930
import jakarta.persistence.OneToMany;
3031

32+
import static java.util.concurrent.TimeUnit.MINUTES;
3133
import static org.junit.jupiter.api.Assertions.assertEquals;
3234
import static org.junit.jupiter.api.Assertions.assertFalse;
3335
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -82,6 +84,7 @@
8284
* Entities are inserted in the following order:
8385
* c, e, d, b, g, f.
8486
*/
87+
@Timeout(value = 10, timeUnit = MINUTES)
8588
public class CascadeComplicatedTest extends BaseReactiveTest {
8689

8790
private B b;

0 commit comments

Comments
 (0)