Skip to content

Commit cb5a079

Browse files
committed
HSEARCH-3905 Enable tests of the "exists" predicate on object fields with dynamic child fields with Lucene
Signed-off-by: Yoann Rodière <yoann@hibernate.org>
1 parent 0137977 commit cb5a079

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/testsupport/util/LuceneTckBackendFeatures.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ public boolean nonDefaultOrderInTermsAggregations() {
1616
return false;
1717
}
1818

19-
@Override
20-
public boolean supportsDynamicChildFieldsInExistsPredicate() {
21-
// See https://hibernate.atlassian.net/browse/HSEARCH-3905
22-
return false;
23-
}
24-
2519
@Override
2620
public boolean projectionPreservesNulls() {
2721
return false;

integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/dynamic/ObjectFieldTemplateIT.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1010
import static org.hibernate.search.util.impl.integrationtest.common.assertion.SearchResultAssert.assertThatQuery;
11-
import static org.junit.Assume.assumeTrue;
1211

1312
import java.util.function.Consumer;
1413
import java.util.function.Function;
@@ -23,7 +22,6 @@
2322
import org.hibernate.search.engine.search.predicate.dsl.PredicateFinalStep;
2423
import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
2524
import org.hibernate.search.engine.search.query.SearchQuery;
26-
import org.hibernate.search.integrationtest.backend.tck.testsupport.util.TckConfiguration;
2725
import org.hibernate.search.integrationtest.backend.tck.testsupport.util.rule.SearchSetupHelper;
2826
import org.hibernate.search.util.impl.integrationtest.mapper.stub.SimpleMappedIndex;
2927
import org.hibernate.search.util.impl.integrationtest.mapper.stub.StubMappingSchemaManagementStrategy;
@@ -363,10 +361,8 @@ public void matchingPathGlob_precedence_deepestDeclared() {
363361
* The {@code exists} predicate should detect static object fields even if all their sub-fields are dynamic.
364362
*/
365363
@Test
366-
@TestForIssue(jiraKey = "HSEARCH-3273")
364+
@TestForIssue(jiraKey = { "HSEARCH-3273", "HSEARCH-3905" })
367365
public void exists_staticObjectField() {
368-
assumeBackendSupportsDynamicChildFieldsInExistsPredicate();
369-
370366
Consumer<IndexSchemaElement> rootTemplatesBinder = root -> { };
371367
Consumer<IndexSchemaElement> staticObjectTemplatesBinder = staticObject -> {
372368
staticObject.fieldTemplate( "fieldTemplate", f -> f.asString() )
@@ -428,10 +424,8 @@ public void exists_staticObjectField() {
428424
* The {@code exists} predicate should detect dynamic object fields even if all their sub-fields are dynamic.
429425
*/
430426
@Test
431-
@TestForIssue(jiraKey = "HSEARCH-3273")
427+
@TestForIssue(jiraKey = { "HSEARCH-3273", "HSEARCH-3905" })
432428
public void exists_dynamicObjectField() {
433-
assumeBackendSupportsDynamicChildFieldsInExistsPredicate();
434-
435429
Consumer<IndexSchemaElement> templatesBinder = root -> {
436430
root.fieldTemplate( "fieldTemplate", f -> f.asString() )
437431
.matchingPathGlob( VALUE_FIELD_PATH_GLOB );
@@ -487,13 +481,6 @@ public void exists_dynamicObjectField() {
487481
.hasDocRefHitsAnyOrder( index.typeName(), documentWhereObjectFieldExistsId );
488482
}
489483

490-
private void assumeBackendSupportsDynamicChildFieldsInExistsPredicate() {
491-
assumeTrue(
492-
"This backend doesn't take dynamic child fields into account when creating exists predicates on object fields.",
493-
TckConfiguration.get().getBackendFeatures().supportsDynamicChildFieldsInExistsPredicate()
494-
);
495-
}
496-
497484
private SearchQuery<DocumentReference> query(
498485
Function<? super SearchPredicateFactory, ? extends PredicateFinalStep> predicateContributor) {
499486
return index.createScope().query()

integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/util/TckBackendFeatures.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ public boolean sortByFieldValue(TestedFieldStructure fieldStructure, Class<?> fi
5151
return true;
5252
}
5353

54-
public boolean supportsDynamicChildFieldsInExistsPredicate() {
55-
return true;
56-
}
57-
5854
public boolean supportsValuesForDynamicField(Class<?> javaType) {
5955
return true;
6056
}

0 commit comments

Comments
 (0)