HSEARCH-3667 Test object loading when Envers is enabled

hibernate · Sep 9, 2019 · 9607d36 · 9607d36
1 parent 2c755c5
commit 9607d36
Showing 1 changed file with 36 additions and 0 deletions.
diff --git a/...envers/src/test/java/org/hibernate/search/integrationtest/mapper/orm/envers/EnversIT.java b/...envers/src/test/java/org/hibernate/search/integrationtest/mapper/orm/envers/EnversIT.java
@@ -6,6 +6,10 @@
  */
 package org.hibernate.search.integrationtest.mapper.orm.envers;
 
+import static org.hibernate.search.util.impl.integrationtest.common.stub.backend.StubBackendUtils.reference;
+
+import java.util.Arrays;
+import java.util.Optional;
 import javax.persistence.Basic;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -16,10 +20,12 @@
 import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.query.AuditEntity;
+import org.hibernate.search.mapper.orm.Search;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock;
+import org.hibernate.search.util.impl.integrationtest.common.rule.StubSearchWorkBehavior;
 import org.hibernate.search.util.impl.integrationtest.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.orm.OrmUtils;
 import org.hibernate.search.util.impl.test.annotation.PortedFromSearch5;
@@ -94,6 +100,7 @@ public void test() {
 				1, 1, 1, 1 );
 		checkEnversAuditedCorrectly( ContainedEntity.class,
 				1, 1, 1, 1 );
+		checkSearchLoadedEntityIsLastVersion( "1", "initial", "initial" );
 
 		// Update the indexed entity
 		OrmUtils.withinTransaction( sessionFactory, session -> {
@@ -114,6 +121,7 @@ public void test() {
 				2, 2, 1, 2 );
 		checkEnversAuditedCorrectly( ContainedEntity.class,
 				2, 1, 0, 1 );
+		checkSearchLoadedEntityIsLastVersion( "1", "updated", "initial" );
 
 		// Update the contained entity
 		OrmUtils.withinTransaction( sessionFactory, session -> {
@@ -134,6 +142,7 @@ public void test() {
 				3, 2, 0, 2 );
 		checkEnversAuditedCorrectly( ContainedEntity.class,
 				3, 3, 1, 2 );
+		checkSearchLoadedEntityIsLastVersion( "1", "updated", "updated" );
 
 		// Delete the indexed entity
 		OrmUtils.withinTransaction( sessionFactory, session -> {
@@ -172,6 +181,33 @@ private void checkEnversAuditedCorrectly(Class<?> type,
 		} );
 	}
 
+	private void checkSearchLoadedEntityIsLastVersion(String id,
+			String expectedIndexedEntityText, String expectedContainedEntityText) {
+		OrmUtils.withinTransaction( sessionFactory, session -> {
+			backendMock.expectSearchObjects(
+					Arrays.asList( IndexedEntity.INDEX ),
+					b -> b.limit( 2 ), // fetchSingleHit() (see below) sets the limit to 2 to check if there really is a single hit
+					StubSearchWorkBehavior.of(
+							1L,
+							reference( IndexedEntity.INDEX, id )
+					)
+			);
+			Optional<IndexedEntity> loadedEntity = Search.session( session ).search( IndexedEntity.class )
+					.predicate( f -> f.matchAll() )
+					.fetchSingleHit();
+			SoftAssertions.assertSoftly( assertions -> {
+				assertions.assertThat( loadedEntity ).get()
+						.as( "getText()" )
+						.extracting( IndexedEntity::getText )
+						.isEqualTo( expectedIndexedEntityText );
+				assertions.assertThat( loadedEntity ).get()
+						.as( "getContained().getText()" )
+						.extracting( e -> e.getContained().getText() )
+						.isEqualTo( expectedContainedEntityText );
+			} );
+		} );
+	}
+
 	/**
 	 * It returns how many entities are modified for a specific class and number revision.
 	 */