HSEARCH-3269 Move component tests to IT test module

hibernate · Oct 15, 2020 · da010c7 · da010c7
1 parent 38ea821
commit da010c7
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 199 deletions.
diff --git a/batch-jsr352/core/pom.xml b/batch-jsr352/core/pom.xml
@@ -68,25 +68,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>**/test/util/*</include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/...org/hibernate/search/batch/jsr352/core/massindexing/step/lucene/impl/PartitionMapper.java b/...org/hibernate/search/batch/jsr352/core/massindexing/step/lucene/impl/PartitionMapper.java
@@ -107,7 +107,7 @@ public PartitionMapper() {
 	/**
 	 * Constructor for unit test.
 	 */
-	PartitionMapper(
+	public PartitionMapper(
 				String serializedIdFetchSize,
 				String customQueryHql,
 				String serializedMaxThreads,

diff --git a/...ava/org/hibernate/search/batch/jsr352/core/massindexing/step/lucene/spi/EntityReader.java b/...ava/org/hibernate/search/batch/jsr352/core/massindexing/step/lucene/spi/EntityReader.java
@@ -149,10 +149,7 @@ public class EntityReader extends AbstractItemReader {
 	public EntityReader() {
 	}
 
-	/**
-	 * Constructor for unit test
-	 */
-	EntityReader(String serializedCacheMode,
+	public EntityReader(String serializedCacheMode,
 			String entityName,
 			String serializedEntityFetchSize,
 			String serializedCheckpointInterval,

diff --git a/...rc/test/java/org/hibernate/search/batch/jsr352/core/massindexing/test/entity/Company.java b/...rc/test/java/org/hibernate/search/batch/jsr352/core/massindexing/test/entity/Company.java
diff --git a/...src/test/java/org/hibernate/search/batch/jsr352/core/massindexing/test/entity/Person.java b/...src/test/java/org/hibernate/search/batch/jsr352/core/massindexing/test/entity/Person.java
diff --git a/integrationtest/batch-jsr352/pom.xml b/integrationtest/batch-jsr352/pom.xml
@@ -34,12 +34,6 @@
             <artifactId>hibernate-search-batch-jsr352-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.hibernate.search</groupId>
-            <artifactId>hibernate-search-batch-jsr352-core</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.hibernate.search</groupId>
             <artifactId>hibernate-search-util-internal-integrationtest-mapper-orm</artifactId>

diff --git a/...ing/step/lucene/spi/EntityReaderTest.java → ...52/component/EntityReaderComponentIT.java b/...ing/step/lucene/spi/EntityReaderTest.java → ...52/component/EntityReaderComponentIT.java
@@ -4,13 +4,12 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.batch.jsr352.core.massindexing.step.lucene.spi;
+package org.hibernate.search.integrationtest.batch.jsr352.component;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
@@ -24,8 +23,9 @@
 import org.hibernate.CacheMode;
 import org.hibernate.search.batch.jsr352.core.massindexing.impl.JobContextData;
 import org.hibernate.search.batch.jsr352.core.massindexing.step.lucene.impl.IndexScope;
-import org.hibernate.search.batch.jsr352.core.massindexing.test.entity.Company;
-import org.hibernate.search.batch.jsr352.core.massindexing.test.util.JobTestUtil;
+import org.hibernate.search.batch.jsr352.core.massindexing.step.lucene.spi.EntityReader;
+import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Company;
+import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
 
 import org.junit.After;
 import org.junit.Before;
@@ -37,13 +37,13 @@
 import org.mockito.quality.Strictness;
 
 /**
- * Unit test for item reader validation.
+ * Single-component test for item reader validation.
  *
  * @author Mincong Huang
  */
-public class EntityReaderTest {
+public class EntityReaderComponentIT {
 
-	private static final String PERSISTENCE_UNIT_NAME = "primary_pu";
+	private static final String PERSISTENCE_UNIT_NAME = "lucene_pu";
 
 	private static final List<Company> COMPANIES = Arrays.asList(
 			new Company( "Red Hat" ),
@@ -119,7 +119,7 @@ public void testReadItem_withoutBoundary() throws Exception {
 		jobData.setEntityTypeDescriptors( Arrays.asList( JobTestUtil.createSimpleEntityTypeDescriptor( emf, Company.class ) ) );
 
 		when( mockedJobContext.getTransientUserData() ).thenReturn( jobData );
-		verify( mockedStepContext ).setTransientUserData( any() );
+		mockedStepContext.setTransientUserData( any() );
 
 		try {
 			entityReader.open( null );

diff --git a/...MassIndexingJobParametersBuilderTest.java → ...t/MassIndexingJobParametersBuilderIT.java b/...MassIndexingJobParametersBuilderTest.java → ...t/MassIndexingJobParametersBuilderIT.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.batch.jsr352.core.massindexing;
+package org.hibernate.search.integrationtest.batch.jsr352.component;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
@@ -18,6 +18,8 @@
 import javax.persistence.Persistence;
 
 import org.hibernate.CacheMode;
+import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob;
+import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJobParameters;
 import org.hibernate.search.util.common.SearchException;
 
 import org.junit.After;
@@ -27,7 +29,7 @@
 /**
  * @author Mincong Huang
  */
-public class MassIndexingJobParametersBuilderTest {
+public class MassIndexingJobParametersBuilderIT {
 
 	private static final String SESSION_FACTORY_NAME = "someUniqueString";
 
@@ -44,7 +46,7 @@ public class MassIndexingJobParametersBuilderTest {
 	private static final int CHECKPOINT_INTERVAL = 200;
 	private static final CacheMode CACHE_MODE = CacheMode.GET;
 
-	private static final String PERSISTENCE_UNIT_NAME = "primary_pu";
+	private static final String PERSISTENCE_UNIT_NAME = "lucene_pu";
 	private EntityManagerFactory emf;
 
 	@Before

diff --git a/...step/lucene/impl/PartitionMapperTest.java → ...component/PartitionMapperComponentIT.java b/...step/lucene/impl/PartitionMapperTest.java → ...component/PartitionMapperComponentIT.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.batch.jsr352.core.massindexing.step.lucene.impl;
+package org.hibernate.search.integrationtest.batch.jsr352.component;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -20,23 +20,24 @@
 import javax.persistence.Persistence;
 
 import org.hibernate.search.batch.jsr352.core.massindexing.impl.JobContextData;
-import org.hibernate.search.batch.jsr352.core.massindexing.test.entity.Company;
-import org.hibernate.search.batch.jsr352.core.massindexing.test.entity.Person;
-import org.hibernate.search.batch.jsr352.core.massindexing.test.util.JobTestUtil;
+import org.hibernate.search.batch.jsr352.core.massindexing.step.lucene.impl.PartitionMapper;
 import org.hibernate.search.batch.jsr352.core.massindexing.util.impl.MassIndexingPartitionProperties;
+import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Company;
+import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Person;
+import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Unit test for partition plan validation.
+ * Single-component test for partition plan validation.
  *
  * @author Mincong Huang
  */
-public class PartitionMapperTest {
+public class PartitionMapperComponentIT {
 
-	private static final String PERSISTENCE_UNIT_NAME = "primary_pu";
+	private static final String PERSISTENCE_UNIT_NAME = "lucene_pu";
 	private static final int COMP_ROWS = 3;
 	private static final int PERS_ROWS = 8;
 

diff --git a/...ndexing/util/impl/ValidationUtilTest.java → .../component/ValidationUtilComponentIT.java b/...ndexing/util/impl/ValidationUtilTest.java → .../component/ValidationUtilComponentIT.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.batch.jsr352.core.massindexing.util.impl;
+package org.hibernate.search.integrationtest.batch.jsr352.component;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -13,8 +13,9 @@
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
-import org.hibernate.search.batch.jsr352.core.massindexing.test.entity.Company;
-import org.hibernate.search.batch.jsr352.core.massindexing.test.entity.Person;
+import org.hibernate.search.batch.jsr352.core.massindexing.util.impl.ValidationUtil;
+import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Company;
+import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Person;
 import org.hibernate.search.util.common.SearchException;
 
 import org.junit.After;
@@ -24,9 +25,9 @@
 /**
  * @author Mincong Huang
  */
-public class ValidationUtilTest {
+public class ValidationUtilComponentIT {
 
-	private static final String PERSISTENCE_UNIT_NAME = "primary_pu";
+	private static final String PERSISTENCE_UNIT_NAME = "lucene_pu";
 
 	private static final String EMF_SCOPE = "persistence-unit-name";
 
@@ -123,5 +124,4 @@ private NotIndexed() {
 			// Private constructor, do not use it.
 		}
 	}
-
 }
diff --git a/...va/org/hibernate/search/integrationtest/batch/jsr352/massindexing/BatchIndexingJobIT.java b/...va/org/hibernate/search/integrationtest/batch/jsr352/massindexing/BatchIndexingJobIT.java
@@ -27,7 +27,7 @@
 import org.hibernate.search.batch.jsr352.core.logging.impl.Log;
 import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob;
 import org.hibernate.search.batch.jsr352.core.massindexing.step.lucene.impl.StepProgress;
-import org.hibernate.search.batch.jsr352.core.massindexing.test.util.JobTestUtil;
+import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
 import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Company;
 import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.CompanyGroup;
 import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Person;

diff --git a/...ate/search/integrationtest/batch/jsr352/massindexing/EntityManagerFactoryRetrievalIT.java b/...ate/search/integrationtest/batch/jsr352/massindexing/EntityManagerFactoryRetrievalIT.java
@@ -12,7 +12,7 @@
 import javax.batch.runtime.JobExecution;
 
 import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob;
-import org.hibernate.search.batch.jsr352.core.massindexing.test.util.JobTestUtil;
+import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
 import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.Company;
 
 import org.junit.Test;

diff --git a/...te/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithCompositeIdIT.java b/...te/search/integrationtest/batch/jsr352/massindexing/MassIndexingJobWithCompositeIdIT.java
@@ -15,7 +15,7 @@
 import javax.persistence.Persistence;
 
 import org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob;
-import org.hibernate.search.batch.jsr352.core.massindexing.test.util.JobTestUtil;
+import org.hibernate.search.integrationtest.batch.jsr352.util.JobTestUtil;
 import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.EntityWithEmbeddedId;
 import org.hibernate.search.integrationtest.batch.jsr352.massindexing.entity.EntityWithIdClass;
 import org.hibernate.search.integrationtest.batch.jsr352.util.PersistenceUnitTestUtil;