HSEARCH-4708 Disable tests that cannot work with ORM 6 due to HHH-15606

See https://hibernate.atlassian.net/browse/HHH-15606
hibernate · Sep 25, 2023 · 99f2218 · 99f2218
1 parent 4be4d06
commit 99f2218
Show file tree

Hide file tree

Showing 3 changed files with 136 additions and 78 deletions.
diff --git a/.../orm/automaticindexing/association/bytype/AbstractAutomaticIndexingAssociationBaseIT.java b/.../orm/automaticindexing/association/bytype/AbstractAutomaticIndexingAssociationBaseIT.java
@@ -210,6 +210,10 @@ public AbstractAutomaticIndexingAssociationBaseIT(IndexedEntityPrimitives<TIndex
 
 	protected abstract boolean isAssociationLazyOnContainingSide();
 
+	protected boolean includeEmbeddedAssociationsInSchema() {
+		return true;
+	}
+
 	protected boolean isEmbeddedAssociationChangeCausingWork() {
 		return !isAssociationOwnedByContainedSide() && !isAssociationMultiValuedOnContainingSide();
 	}
@@ -292,15 +296,17 @@ public void setup(OrmSetupHelper.SetupContext setupContext, ReusableOrmSetupHold
 								.field( "indexedField", String.class )
 						)
 				)
-				.objectField( "embeddedAssociations", b2 -> b2
-						.objectField( "containedIndexedEmbedded",
-								associationFieldContributor.andThen( b3 -> b3
-										.field( "indexedField", String.class )
-										.field( "indexedElementCollectionField", String.class, b4 -> b4.multiValued( true ) )
-										.field( "containedDerivedField", String.class )
+				.with( includeEmbeddedAssociationsInSchema() ? bWith -> bWith
+						.objectField( "embeddedAssociations", b2 -> b2
+								.objectField( "containedIndexedEmbedded",
+										associationFieldContributor.andThen( b3 -> b3
+												.field( "indexedField", String.class )
+												.field( "indexedElementCollectionField", String.class, b4 -> b4.multiValued( true ) )
+												.field( "containedDerivedField", String.class )
+										)
 								)
 						)
-				)
+						: bWith -> { } )
 				.with( isElementCollectionAssociationsOnContainingSide()
 						? bWith -> bWith
 								.objectField( "elementCollectionAssociations", b2 -> b2
@@ -354,16 +360,18 @@ public void setup(OrmSetupHelper.SetupContext setupContext, ReusableOrmSetupHold
 										.field( "indexedField", String.class )
 								)
 						)
-						.objectField( "embeddedAssociations", b2 -> b2
-								.objectField( "containedIndexedEmbedded",
-										associationFieldContributor.andThen( b3 -> b3
-												.field( "indexedField", String.class )
-												.field( "indexedElementCollectionField", String.class,
+						.with( includeEmbeddedAssociationsInSchema() ? bWith -> bWith
+								.objectField( "embeddedAssociations", b2 -> b2
+										.objectField( "containedIndexedEmbedded",
+												associationFieldContributor.andThen( b3 -> b3
+														.field( "indexedField", String.class )
+														.field( "indexedElementCollectionField", String.class,
 														b4 -> b4.multiValued( true ) )
-												.field( "containedDerivedField", String.class )
+														.field( "containedDerivedField", String.class )
+												)
 										)
 								)
-						)
+								: bWith -> { } )
 						.with( isElementCollectionAssociationsOnContainingSide()
 								? bWith -> bWith
 										.objectField( "elementCollectionAssociations", b2 -> b2

diff --git a/...one/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedLazyOnContainingSideIT.java b/...one/ownedbycontained/AutomaticIndexingOneToOneOwnedByContainedLazyOnContainingSideIT.java
@@ -7,6 +7,7 @@
 package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.onetoone.ownedbycontained;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -88,6 +89,57 @@ protected boolean isAssociationLazyOnContainingSide() {
 		return true;
 	}
 
+	@Override
+	protected boolean includeEmbeddedAssociationsInSchema() {
+		// See https://hibernate.atlassian.net/browse/HHH-15606
+		return false;
+	}
+
+	@Override
+	public void directAssociationUpdate_embeddedAssociationsIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void directAssociationUpdate_embeddedAssociationsNonIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void directEmbeddedAssociationReplace_embeddedAssociationsIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void directEmbeddedAssociationReplace_embeddedAssociationsNonIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void indirectAssociationUpdate_embeddedAssociationsIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void indirectAssociationUpdate_embeddedAssociationsNonIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void indirectEmbeddedAssociationReplace_embeddedAssociationsIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void indirectEmbeddedAssociationReplace_embeddedAssociationsNonIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	private void notTestedBecauseOfHHH15606() {
+		assumeTrue( "This test is disabled because of https://hibernate.atlassian.net/browse/HHH-15606",
+				false );
+	}
+
 	@Override
 	public void setup(OrmSetupHelper.SetupContext setupContext,
 			ReusableOrmSetupHolder.DataClearConfig dataClearConfig) {
@@ -138,9 +190,6 @@ public static class ContainingEntity {
 				"containedIndexedEmbeddedNoReindexOnUpdate.indexedElementCollectionField",
 				"containedIndexedEmbeddedNoReindexOnUpdate.containedDerivedField",
 				"containedIndexedEmbeddedWithCast.indexedField",
-				"embeddedAssociations.containedIndexedEmbedded.indexedField",
-				"embeddedAssociations.containedIndexedEmbedded.indexedElementCollectionField",
-				"embeddedAssociations.containedIndexedEmbedded.containedDerivedField",
 				"containedElementCollectionAssociationsIndexedEmbedded.indexedField",
 				"containedElementCollectionAssociationsIndexedEmbedded.indexedElementCollectionField",
 				"containedElementCollectionAssociationsIndexedEmbedded.containedDerivedField",
@@ -179,10 +228,6 @@ public static class ContainingEntity {
 		@IndexedEmbedded(includePaths = { "indexedField" }, targetType = ContainedEntity.class)
 		private Object containedIndexedEmbeddedWithCast;
 
-		@IndexedEmbedded
-		@Embedded
-		private ContainingEmbeddable embeddedAssociations;
-
 		/*
 		 * No mappedBy here. The inverse side of associations within an element collection cannot use mappedBy.
 		 * If they do, Hibernate ORM will fail (throw an exception) while attempting to walk down the mappedBy path,
@@ -296,14 +341,6 @@ public void setContainedIndexedEmbeddedWithCast(Object containedIndexedEmbeddedW
 			this.containedIndexedEmbeddedWithCast = containedIndexedEmbeddedWithCast;
 		}
 
-		public ContainingEmbeddable getEmbeddedAssociations() {
-			return embeddedAssociations;
-		}
-
-		public void setEmbeddedAssociations(ContainingEmbeddable embeddedAssociations) {
-			this.embeddedAssociations = embeddedAssociations;
-		}
-
 		public ContainedEntity getContainedElementCollectionAssociationsIndexedEmbedded() {
 			return containedElementCollectionAssociationsIndexedEmbedded;
 		}
@@ -407,9 +444,9 @@ public PropertyAccessor<ContainingEntity, ContainedEntity> containedIndexedEmbed
 
 					@Override
 					public PropertyAccessor<ContainingEntity, ContainingEmbeddable> embeddedAssociations() {
-						return PropertyAccessor.create( ContainingEntity::setEmbeddedAssociations,
-								ContainingEntity::getEmbeddedAssociations );
-					}
+						// See https://hibernate.atlassian.net/browse/HHH-15606
+				throw primitiveNotSupported();
+			}
 
 					@Override
 					public PropertyAccessor<ContainingEntity,
@@ -542,9 +579,6 @@ public static class ContainedEntity {
 		@JoinColumn(name = "CIndexedEmbeddedCast")
 		private Object containingAsIndexedEmbeddedWithCast;
 
-		@Embedded
-		private ContainedEmbeddable embeddedAssociations;
-
 		@ElementCollection
 		@Embedded
 		@OrderColumn(name = "idx")
@@ -649,14 +683,6 @@ public void setContainingAsIndexedEmbeddedWithCast(Object containingAsIndexedEmb
 			this.containingAsIndexedEmbeddedWithCast = containingAsIndexedEmbeddedWithCast;
 		}
 
-		public ContainedEmbeddable getEmbeddedAssociations() {
-			return embeddedAssociations;
-		}
-
-		public void setEmbeddedAssociations(ContainedEmbeddable embeddedAssociations) {
-			this.embeddedAssociations = embeddedAssociations;
-		}
-
 		public List<ContainedEmbeddable> getElementCollectionAssociations() {
 			return elementCollectionAssociations;
 		}
@@ -787,9 +813,9 @@ public PropertyAccessor<ContainedEntity, ContainingEntity> containingAsIndexedEm
 
 					@Override
 					public PropertyAccessor<ContainedEntity, ContainedEmbeddable> embeddedAssociations() {
-						return PropertyAccessor.create( ContainedEntity::setEmbeddedAssociations,
-								ContainedEntity::getEmbeddedAssociations );
-					}
+						// See https://hibernate.atlassian.net/browse/HHH-15606
+				throw primitiveNotSupported();
+			}
 
 					@Override
 					public MultiValuedPropertyAccessor<ContainedEntity,

diff --git a/...ne/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainedSideIT.java b/...ne/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainedSideIT.java
@@ -7,6 +7,7 @@
 package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.association.bytype.onetoone.ownedbycontaining;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -87,6 +88,57 @@ protected boolean isAssociationLazyOnContainingSide() {
 		return false;
 	}
 
+	@Override
+	protected boolean includeEmbeddedAssociationsInSchema() {
+		// See https://hibernate.atlassian.net/browse/HHH-15606
+		return false;
+	}
+
+	@Override
+	public void directAssociationUpdate_embeddedAssociationsIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void directAssociationUpdate_embeddedAssociationsNonIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void directEmbeddedAssociationReplace_embeddedAssociationsIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void directEmbeddedAssociationReplace_embeddedAssociationsNonIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void indirectAssociationUpdate_embeddedAssociationsIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void indirectAssociationUpdate_embeddedAssociationsNonIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void indirectEmbeddedAssociationReplace_embeddedAssociationsIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	@Override
+	public void indirectEmbeddedAssociationReplace_embeddedAssociationsNonIndexedEmbedded() {
+		notTestedBecauseOfHHH15606();
+	}
+
+	private void notTestedBecauseOfHHH15606() {
+		assumeTrue( "This test is disabled because of https://hibernate.atlassian.net/browse/HHH-15606",
+				false );
+	}
+
 	@Override
 	public void setup(OrmSetupHelper.SetupContext setupContext,
 			ReusableOrmSetupHolder.DataClearConfig dataClearConfig) {
@@ -137,9 +189,6 @@ public static class ContainingEntity {
 				"containedIndexedEmbeddedNoReindexOnUpdate.indexedElementCollectionField",
 				"containedIndexedEmbeddedNoReindexOnUpdate.containedDerivedField",
 				"containedIndexedEmbeddedWithCast.indexedField",
-				"embeddedAssociations.containedIndexedEmbedded.indexedField",
-				"embeddedAssociations.containedIndexedEmbedded.indexedElementCollectionField",
-				"embeddedAssociations.containedIndexedEmbedded.containedDerivedField",
 				"elementCollectionAssociations.containedIndexedEmbedded.indexedField",
 				"elementCollectionAssociations.containedIndexedEmbedded.indexedElementCollectionField",
 				"elementCollectionAssociations.containedIndexedEmbedded.containedDerivedField",
@@ -175,10 +224,6 @@ public static class ContainingEntity {
 		@IndexedEmbedded(includePaths = { "indexedField" }, targetType = ContainedEntity.class)
 		private Object containedIndexedEmbeddedWithCast;
 
-		@IndexedEmbedded
-		@Embedded
-		private ContainingEmbeddable embeddedAssociations;
-
 		@IndexedEmbedded
 		@ElementCollection
 		@Embedded
@@ -269,14 +314,6 @@ public void setContainedIndexedEmbeddedWithCast(Object containedIndexedEmbeddedW
 			this.containedIndexedEmbeddedWithCast = containedIndexedEmbeddedWithCast;
 		}
 
-		public ContainingEmbeddable getEmbeddedAssociations() {
-			return embeddedAssociations;
-		}
-
-		public void setEmbeddedAssociations(ContainingEmbeddable embeddedAssociations) {
-			this.embeddedAssociations = embeddedAssociations;
-		}
-
 		public List<ContainingEmbeddable> getElementCollectionAssociations() {
 			return elementCollectionAssociations;
 		}
@@ -365,9 +402,8 @@ public PropertyAccessor<ContainingEntity, ContainedEntity> containedIndexedEmbed
 
 					@Override
 					public PropertyAccessor<ContainingEntity, ContainingEmbeddable> embeddedAssociations() {
-						return PropertyAccessor.create( ContainingEntity::setEmbeddedAssociations,
-								ContainingEntity::getEmbeddedAssociations );
-					}
+						throw primitiveNotSupported();
+			}
 
 					@Override
 					public MultiValuedPropertyAccessor<ContainingEntity,
@@ -492,9 +528,6 @@ public static class ContainedEntity {
 		@LazyGroup("containingAsIndexedEmbeddedWithCast")
 		private Object containingAsIndexedEmbeddedWithCast;
 
-		@Embedded
-		private ContainedEmbeddable embeddedAssociations;
-
 		/*
 		 * No mappedBy here. The inverse side of associations within an element collection cannot use mappedBy.
 		 * If they do, Hibernate ORM will fail (throw an exception) while attempting to walk down the mappedBy path,
@@ -622,14 +655,6 @@ public void setContainingAsIndexedEmbeddedWithCast(Object containingAsIndexedEmb
 			this.containingAsIndexedEmbeddedWithCast = containingAsIndexedEmbeddedWithCast;
 		}
 
-		public ContainedEmbeddable getEmbeddedAssociations() {
-			return embeddedAssociations;
-		}
-
-		public void setEmbeddedAssociations(ContainedEmbeddable embeddedAssociations) {
-			this.embeddedAssociations = embeddedAssociations;
-		}
-
 		public ContainingEntity getContainingAsElementCollectionAssociationsIndexedEmbedded() {
 			return containingAsElementCollectionAssociationsIndexedEmbedded;
 		}
@@ -776,9 +801,8 @@ public PropertyAccessor<ContainedEntity, ContainingEntity> containingAsIndexedEm
 
 					@Override
 					public PropertyAccessor<ContainedEntity, ContainedEmbeddable> embeddedAssociations() {
-						return PropertyAccessor.create( ContainedEntity::setEmbeddedAssociations,
-								ContainedEntity::getEmbeddedAssociations );
-					}
+						throw primitiveNotSupported();
+			}
 
 					@Override
 					public PropertyAccessor<ContainedEntity,