From c53abc52700ddfe4ce7af6801dee296bca1c5dbd Mon Sep 17 00:00:00 2001 From: Fabio Massimo Ercoli Date: Thu, 18 Feb 2021 09:49:46 +0100 Subject: [PATCH] HSEARCH-4157 Raise and uniform the timeout on JSR-351 tests --- .../batch/jsr352/massindexing/AbstractBatchIndexingIT.java | 2 ++ .../batch/jsr352/massindexing/BatchIndexingJobIT.java | 2 -- .../jsr352/massindexing/EntityManagerFactoryRetrievalIT.java | 2 -- .../jsr352/massindexing/MassIndexingJobWithCompositeIdIT.java | 3 +-- .../jsr352/massindexing/MassIndexingJobWithMultiTenancyIT.java | 3 +-- .../batch/jsr352/massindexing/RestartChunkIT.java | 3 +-- 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/AbstractBatchIndexingIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/AbstractBatchIndexingIT.java index 558a977f84e..06ea0bc9e1b 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/AbstractBatchIndexingIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/AbstractBatchIndexingIT.java @@ -41,6 +41,8 @@ public abstract class AbstractBatchIndexingIT { // We have three data templates per entity type (see setup) protected static final int INSTANCE_PER_ENTITY_TYPE = INSTANCES_PER_DATA_TEMPLATE * 3; + static final int JOB_TIMEOUT_MS = 30_000; + protected JobOperator jobOperator; protected EntityManagerFactory emf; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/BatchIndexingJobIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/BatchIndexingJobIT.java index c1ffc875610..f9056039b58 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/BatchIndexingJobIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/BatchIndexingJobIT.java @@ -45,8 +45,6 @@ public class BatchIndexingJobIT extends AbstractBatchIndexingIT { private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() ); - private static final int JOB_TIMEOUT_MS = 30_000; - /* * Make sure to have more than one checkpoint, * because we had errors related to that in the past. diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/EntityManagerFactoryRetrievalIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/EntityManagerFactoryRetrievalIT.java index 365e184ffbc..6c5d74ca9eb 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/EntityManagerFactoryRetrievalIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/EntityManagerFactoryRetrievalIT.java @@ -30,8 +30,6 @@ public class EntityManagerFactoryRetrievalIT extends AbstractBatchIndexingIT { private static final String SESSION_FACTORY_NAME = "primary_session_factory"; - private static final int JOB_TIMEOUT_MS = 10_000; - @Test public void defaultNamespace() throws Exception { List companies = JobTestUtil.findIndexedResults( emf, Company.class, "name", "Google" ); diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithCompositeIdIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithCompositeIdIT.java index 203abd83d06..568e989d8f3 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithCompositeIdIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithCompositeIdIT.java @@ -7,6 +7,7 @@ package org.hibernate.search.integrationtest.batch.jsr352.massindexing; import static org.assertj.core.api.Assertions.assertThat; +import static org.hibernate.search.integrationtest.batch.jsr352.massindexing.AbstractBatchIndexingIT.JOB_TIMEOUT_MS; import java.time.LocalDate; import java.time.temporal.ChronoUnit; @@ -41,8 +42,6 @@ public class MassIndexingJobWithCompositeIdIT { private static final String PERSISTENCE_UNIT_NAME = PersistenceUnitTestUtil.getPersistenceUnitName(); - private static final int JOB_TIMEOUT_MS = 30_000; - private static final LocalDate START = LocalDate.of( 2017, 6, 1 ); private static final LocalDate END = LocalDate.of( 2017, 8, 1 ); diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithMultiTenancyIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithMultiTenancyIT.java index 60794127623..86dbaf1e1fd 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithMultiTenancyIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithMultiTenancyIT.java @@ -8,6 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil.findIndexedResultsInTenant; +import static org.hibernate.search.integrationtest.batch.jsr352.massindexing.AbstractBatchIndexingIT.JOB_TIMEOUT_MS; import java.io.IOException; import java.util.Arrays; @@ -45,8 +46,6 @@ public class MassIndexingJobWithMultiTenancyIT { private static final String UNUSED_TENANT_ID = "unusedTenant"; - private static final int JOB_TIMEOUT_MS = 10_000; - private SessionFactory sessionFactory; private JobOperator jobOperator; diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/RestartChunkIT.java b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/RestartChunkIT.java index e3f473200c6..d781c4b4953 100644 --- a/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/RestartChunkIT.java +++ b/integrationtest/mapper/orm-batch-jsr352/src/test/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/RestartChunkIT.java @@ -7,6 +7,7 @@ package org.hibernate.search.integrationtest.batch.jsr352.massindexing; import static org.junit.Assert.assertEquals; +import static org.hibernate.search.integrationtest.batch.jsr352.massindexing.AbstractBatchIndexingIT.JOB_TIMEOUT_MS; import java.io.IOException; import java.util.List; @@ -41,8 +42,6 @@ public class RestartChunkIT { private static final String PERSISTENCE_UNIT_NAME = PersistenceUnitTestUtil.getPersistenceUnitName(); - private static final int JOB_TIMEOUT_MS = 10_000; - protected static final long DB_COMP_ROWS = 150; private JobOperator jobOperator;