Skip to content

Commit

Permalink
HSEARCH-4245 Rename AbstractPredicateNestingIT to AbstractPredicateIn…
Browse files Browse the repository at this point in the history 
…ObjectFieldIT

So that we can add more tests related to using a predicate inside an
object field, even if it's not necessarily related to nesting.
  • Loading branch information
@yrodiere
yrodiere committed Jun 17, 2021
1 parent 56e0c1c commit 740b7d4
Show file tree
Hide file tree
Showing 16 changed files with 118 additions and 114 deletions.
6 changes: 3 additions & 3 deletions ...cate/AbstractPredicateFieldNestingIT.java → ...bstractPredicateFieldInObjectFieldIT.java
View file
Expand Up @@ -11,12 +11,12 @@
import org.hibernate.search.util.impl.integrationtest.mapper.stub.BulkIndexer;
import org.hibernate.search.util.impl.integrationtest.mapper.stub.SimpleMappedIndex;

public abstract class AbstractPredicateFieldNestingIT<V extends AbstractPredicateTestValues<?>>
extends AbstractPredicateNestingIT {
public abstract class AbstractPredicateFieldInObjectFieldIT<V extends AbstractPredicateTestValues<?>>
extends AbstractPredicateInObjectFieldIT {

protected final DataSet<?, V> dataSet;

public AbstractPredicateFieldNestingIT(SimpleMappedIndex<IndexBinding> mainIndex,
public AbstractPredicateFieldInObjectFieldIT(SimpleMappedIndex<IndexBinding> mainIndex,
SimpleMappedIndex<MissingFieldIndexBinding> missingFieldIndex, DataSet<?, V> dataSet) {
super( mainIndex, missingFieldIndex, dataSet );
this.dataSet = dataSet;
Expand Down
4 changes: 2 additions & 2 deletions ...predicate/AbstractPredicateNestingIT.java → ...ate/AbstractPredicateInObjectFieldIT.java
View file
Expand Up @@ -25,7 +25,7 @@

import org.junit.Test;

public abstract class AbstractPredicateNestingIT {
public abstract class AbstractPredicateInObjectFieldIT {

static final int MISSING_FIELD_INDEX_DOC_ORDINAL = 42;

Expand All @@ -34,7 +34,7 @@ public abstract class AbstractPredicateNestingIT {
private final IndexBinding binding;
private final AbstractPredicateDataSet dataSet;

public AbstractPredicateNestingIT(SimpleMappedIndex<IndexBinding> mainIndex,
public AbstractPredicateInObjectFieldIT(SimpleMappedIndex<IndexBinding> mainIndex,
SimpleMappedIndex<MissingFieldIndexBinding> missingFieldIndex,
AbstractPredicateDataSet dataSet) {
this.mainIndex = mainIndex;
Expand Down
16 changes: 8 additions & 8 deletions .../hibernate/search/integrationtest/backend/tck/search/predicate/ExistsPredicateBaseIT.java
View file
Expand Up @@ -40,7 +40,7 @@ public static void setup() {
setupHelper.start()
.withIndexes(
SingleFieldIT.index,
NestingIT.mainIndex, NestingIT.missingFieldIndex,
InObjectFieldIT.mainIndex, InObjectFieldIT.missingFieldIndex,
ScoreIT.index,
InvalidFieldIT.index,
SearchableIT.searchableYesIndex, SearchableIT.searchableNoIndex,
Expand All @@ -54,10 +54,10 @@ public static void setup() {
final BulkIndexer singleFieldIndexer = SingleFieldIT.index.bulkIndexer();
SingleFieldIT.dataSets.forEach( d -> d.contribute( SingleFieldIT.index, singleFieldIndexer ) );

final BulkIndexer nestingMainIndexer = NestingIT.mainIndex.bulkIndexer();
final BulkIndexer nestingMissingFieldIndexer = NestingIT.missingFieldIndex.bulkIndexer();
NestingIT.dataSets.forEach( d -> d.contribute( NestingIT.mainIndex, nestingMainIndexer,
NestingIT.missingFieldIndex, nestingMissingFieldIndexer ) );
final BulkIndexer inObjectFieldMainIndexer = InObjectFieldIT.mainIndex.bulkIndexer();
final BulkIndexer inObjectFieldMissingFieldIndexer = InObjectFieldIT.missingFieldIndex.bulkIndexer();
InObjectFieldIT.dataSets.forEach( d -> d.contribute( InObjectFieldIT.mainIndex, inObjectFieldMainIndexer,
InObjectFieldIT.missingFieldIndex, inObjectFieldMissingFieldIndexer ) );

final BulkIndexer scoreIndexer = ScoreIT.index.bulkIndexer();
ScoreIT.dataSets.forEach( d -> d.contribute( scoreIndexer ) );
Expand All @@ -77,7 +77,7 @@ public static void setup() {
ScaleCheckingIT.compatibleIndex, scaleCheckingCompatibleIndexer );

singleFieldIndexer.join(
nestingMainIndexer, nestingMissingFieldIndexer, scoreIndexer,
inObjectFieldMainIndexer, inObjectFieldMissingFieldIndexer, scoreIndexer,
typeCheckingMainIndexer, typeCheckingCompatibleIndexer,
typeCheckingRawFieldCompatibleIndexer, typeCheckingMissingFieldIndexer,
scaleCheckingMainIndexer, scaleCheckingCompatibleIndexer
Expand Down Expand Up @@ -218,7 +218,7 @@ public void contribute(BulkIndexer scoreIndexer) {
}

@RunWith(Parameterized.class)
public static class NestingIT<F> extends AbstractPredicateFieldNestingIT<ExistsPredicateTestValues<F>> {
public static class InObjectFieldIT<F> extends AbstractPredicateFieldInObjectFieldIT<ExistsPredicateTestValues<F>> {
private static final List<DataSet<?, ?>> dataSets = new ArrayList<>();
private static final List<Object[]> parameters = new ArrayList<>();
static {
Expand All @@ -242,7 +242,7 @@ public static List<Object[]> parameters() {
return parameters;
}

public NestingIT(DataSet<F, ExistsPredicateTestValues<F>> dataSet) {
public InObjectFieldIT(DataSet<F, ExistsPredicateTestValues<F>> dataSet) {
super( mainIndex, missingFieldIndex, dataSet );
}

Expand Down
14 changes: 7 additions & 7 deletions ...ate/search/integrationtest/backend/tck/search/predicate/ExistsPredicateObjectsBaseIT.java
View file
Expand Up @@ -47,19 +47,19 @@ public class ExistsPredicateObjectsBaseIT {
public static void setup() {
setupHelper.start()
.withIndexes(
NestingIT.mainIndex, NestingIT.missingFieldIndex,
InObjectFieldIT.mainIndex, InObjectFieldIT.missingFieldIndex,
ScoreIT.index
)
.setup();

final BulkIndexer nestingMainIndexer = NestingIT.mainIndex.bulkIndexer();
final BulkIndexer nestingMissingFieldIndexer = NestingIT.missingFieldIndex.bulkIndexer();
NestingIT.dataSets.forEach( d -> d.contribute( nestingMainIndexer, nestingMissingFieldIndexer ) );
final BulkIndexer inObjectFieldMainIndexer = InObjectFieldIT.mainIndex.bulkIndexer();
final BulkIndexer inObjectFieldMissingFieldIndexer = InObjectFieldIT.missingFieldIndex.bulkIndexer();
InObjectFieldIT.dataSets.forEach( d -> d.contribute( inObjectFieldMainIndexer, inObjectFieldMissingFieldIndexer ) );

final BulkIndexer scoreIndexer = ScoreIT.index.bulkIndexer();
ScoreIT.dataSets.forEach( d -> d.contribute( scoreIndexer ) );

nestingMainIndexer.join( nestingMissingFieldIndexer, scoreIndexer );
inObjectFieldMainIndexer.join( inObjectFieldMissingFieldIndexer, scoreIndexer );
}

@Test
Expand All @@ -68,7 +68,7 @@ public void takariCpSuiteWorkaround() {
}

@RunWith(Parameterized.class)
public static class NestingIT extends AbstractPredicateNestingIT {
public static class InObjectFieldIT extends AbstractPredicateInObjectFieldIT {
private static final List<DataSet> dataSets = new ArrayList<>();
private static final List<Object[]> parameters = new ArrayList<>();
static {
Expand All @@ -94,7 +94,7 @@ public static List<Object[]> parameters() {

private final DataSet dataSet;

public NestingIT(DataSet dataSet) {
public InObjectFieldIT(DataSet dataSet) {
super( mainIndex, missingFieldIndex, dataSet );
this.dataSet = dataSet;
}
Expand Down
14 changes: 7 additions & 7 deletions ...ibernate/search/integrationtest/backend/tck/search/predicate/MatchAllPredicateBaseIT.java
View file
Expand Up @@ -35,27 +35,27 @@ public class MatchAllPredicateBaseIT {
public static void setup() {
setupHelper.start()
.withIndexes(
NestingIT.mainIndex, NestingIT.missingFieldIndex,
InObjectFieldIT.mainIndex, InObjectFieldIT.missingFieldIndex,
ScoreIT.index
)
.setup();

final BulkIndexer nestingMainIndexer = NestingIT.mainIndex.bulkIndexer();
final BulkIndexer nestingMissingFieldIndexer = NestingIT.missingFieldIndex.bulkIndexer();
NestingIT.dataSet.contribute( nestingMainIndexer, nestingMissingFieldIndexer );
final BulkIndexer inObjectFieldMainIndexer = InObjectFieldIT.mainIndex.bulkIndexer();
final BulkIndexer inObjectFieldMissingFieldIndexer = InObjectFieldIT.missingFieldIndex.bulkIndexer();
InObjectFieldIT.dataSet.contribute( inObjectFieldMainIndexer, inObjectFieldMissingFieldIndexer );

final BulkIndexer scoreIndexer = ScoreIT.index.bulkIndexer();
ScoreIT.dataSet.contribute( scoreIndexer );

nestingMainIndexer.join( nestingMissingFieldIndexer, scoreIndexer );
inObjectFieldMainIndexer.join( inObjectFieldMissingFieldIndexer, scoreIndexer );
}

@Test
public void takariCpSuiteWorkaround() {
// Workaround to get Takari-CPSuite to run this test.
}

public static class NestingIT extends AbstractPredicateNestingIT {
public static class InObjectFieldIT extends AbstractPredicateInObjectFieldIT {
private static final DataSet dataSet = new DataSet();

private static final SimpleMappedIndex<IndexBinding> mainIndex =
Expand All @@ -66,7 +66,7 @@ public static class NestingIT extends AbstractPredicateNestingIT {
SimpleMappedIndex.of( root -> new MissingFieldIndexBinding( root, FieldTypeDescriptor.getAll() ) )
.name( "nesting_missingField" );

public NestingIT() {
public InObjectFieldIT() {
super( mainIndex, missingFieldIndex, dataSet );
}

Expand Down
14 changes: 7 additions & 7 deletions ...hibernate/search/integrationtest/backend/tck/search/predicate/MatchIdPredicateBaseIT.java
View file
Expand Up @@ -31,27 +31,27 @@ public class MatchIdPredicateBaseIT {
public static void setup() {
setupHelper.start()
.withIndexes(
NestingIT.mainIndex, NestingIT.missingFieldIndex,
InObjectFieldIT.mainIndex, InObjectFieldIT.missingFieldIndex,
ScoreIT.index
)
.setup();

final BulkIndexer nestingMainIndexer = NestingIT.mainIndex.bulkIndexer();
final BulkIndexer nestingMissingFieldIndexer = NestingIT.missingFieldIndex.bulkIndexer();
NestingIT.dataSet.contribute( nestingMainIndexer, nestingMissingFieldIndexer );
final BulkIndexer inObjectFieldMainIndexer = InObjectFieldIT.mainIndex.bulkIndexer();
final BulkIndexer inObjectFieldMissingFieldIndexer = InObjectFieldIT.missingFieldIndex.bulkIndexer();
InObjectFieldIT.dataSet.contribute( inObjectFieldMainIndexer, inObjectFieldMissingFieldIndexer );

final BulkIndexer scoreIndexer = ScoreIT.index.bulkIndexer();
ScoreIT.dataSet.contribute( scoreIndexer );

nestingMainIndexer.join( nestingMissingFieldIndexer, scoreIndexer );
inObjectFieldMainIndexer.join( inObjectFieldMissingFieldIndexer, scoreIndexer );
}

@Test
public void takariCpSuiteWorkaround() {
// Workaround to get Takari-CPSuite to run this test.
}

public static class NestingIT extends AbstractPredicateNestingIT {
public static class InObjectFieldIT extends AbstractPredicateInObjectFieldIT {
private static final DataSet dataSet = new DataSet();

private static final SimpleMappedIndex<IndexBinding> mainIndex =
Expand All @@ -62,7 +62,7 @@ public static class NestingIT extends AbstractPredicateNestingIT {
SimpleMappedIndex.of( root -> new MissingFieldIndexBinding( root, FieldTypeDescriptor.getAll() ) )
.name( "nesting_missingField" );

public NestingIT() {
public InObjectFieldIT() {
super( mainIndex, missingFieldIndex, dataSet );
}

Expand Down
16 changes: 8 additions & 8 deletions ...g/hibernate/search/integrationtest/backend/tck/search/predicate/MatchPredicateBaseIT.java
View file
Expand Up @@ -51,7 +51,7 @@ public static void setup() {
setupHelper.start()
.withIndexes(
SingleFieldIT.index, MultiFieldIT.index,
NestingIT.mainIndex, NestingIT.missingFieldIndex,
InObjectFieldIT.mainIndex, InObjectFieldIT.missingFieldIndex,
AnalysisIT.index, AnalysisIT.compatibleIndex, AnalysisIT.incompatibleIndex,
ScoreIT.index,
InvalidFieldIT.index, UnsupportedTypeIT.index,
Expand All @@ -70,10 +70,10 @@ public static void setup() {
final BulkIndexer multiFieldIndexer = MultiFieldIT.index.bulkIndexer();
MultiFieldIT.dataSets.forEach( d -> d.contribute( MultiFieldIT.index, multiFieldIndexer ) );

final BulkIndexer nestingMainIndexer = NestingIT.mainIndex.bulkIndexer();
final BulkIndexer nestingMissingFieldIndexer = NestingIT.missingFieldIndex.bulkIndexer();
NestingIT.dataSets.forEach( d -> d.contribute( NestingIT.mainIndex, nestingMainIndexer,
NestingIT.missingFieldIndex, nestingMissingFieldIndexer ) );
final BulkIndexer inObjectFieldMainIndexer = InObjectFieldIT.mainIndex.bulkIndexer();
final BulkIndexer inObjectFieldMissingFieldIndexer = InObjectFieldIT.missingFieldIndex.bulkIndexer();
InObjectFieldIT.dataSets.forEach( d -> d.contribute( InObjectFieldIT.mainIndex, inObjectFieldMainIndexer,
InObjectFieldIT.missingFieldIndex, inObjectFieldMissingFieldIndexer ) );

final BulkIndexer analysisMainIndexIndexer = AnalysisIT.index.bulkIndexer();
final BulkIndexer analysisCompatibleIndexIndexer = AnalysisIT.compatibleIndex.bulkIndexer();
Expand All @@ -100,7 +100,7 @@ public static void setup() {
ScaleCheckingIT.compatibleIndex, scaleCheckingCompatibleIndexer );

singleFieldIndexer.join(
multiFieldIndexer, nestingMainIndexer, nestingMissingFieldIndexer,
multiFieldIndexer, inObjectFieldMainIndexer, inObjectFieldMissingFieldIndexer,
analysisMainIndexIndexer, analysisCompatibleIndexIndexer, analysisIncompatibleIndexIndexer,
scoreIndexer,
typeCheckingMainIndexer, typeCheckingCompatibleIndexer,
Expand Down Expand Up @@ -195,7 +195,7 @@ protected PredicateFinalStep predicateOnFieldAndFields(SearchPredicateFactory f,
}

@RunWith(Parameterized.class)
public static class NestingIT<F> extends AbstractPredicateFieldNestingIT<MatchPredicateTestValues<F>> {
public static class InObjectFieldIT<F> extends AbstractPredicateFieldInObjectFieldIT<MatchPredicateTestValues<F>> {
private static final List<DataSet<?, ?>> dataSets = new ArrayList<>();
private static final List<Object[]> parameters = new ArrayList<>();
static {
Expand All @@ -219,7 +219,7 @@ public static List<Object[]> parameters() {
return parameters;
}

public NestingIT(DataSet<F, MatchPredicateTestValues<F>> dataSet) {
public InObjectFieldIT(DataSet<F, MatchPredicateTestValues<F>> dataSet) {
super( mainIndex, missingFieldIndex, dataSet );
}

Expand Down
16 changes: 8 additions & 8 deletions .../hibernate/search/integrationtest/backend/tck/search/predicate/PhrasePredicateBaseIT.java
View file
Expand Up @@ -53,7 +53,7 @@ public static void setup() {
setupHelper.start()
.withIndexes(
SingleFieldIT.index, MultiFieldIT.index,
NestingIT.mainIndex, NestingIT.missingFieldIndex,
InObjectFieldIT.mainIndex, InObjectFieldIT.missingFieldIndex,
AnalysisIT.index, AnalysisIT.compatibleIndex, AnalysisIT.incompatibleIndex,
ScoreIT.index,
InvalidFieldIT.index, UnsupportedTypeIT.index,
Expand All @@ -71,10 +71,10 @@ public static void setup() {
final BulkIndexer multiFieldIndexer = MultiFieldIT.index.bulkIndexer();
MultiFieldIT.dataSets.forEach( d -> d.contribute( MultiFieldIT.index, multiFieldIndexer ) );

final BulkIndexer nestingMainIndexer = NestingIT.mainIndex.bulkIndexer();
final BulkIndexer nestingMissingFieldIndexer = NestingIT.missingFieldIndex.bulkIndexer();
NestingIT.dataSets.forEach( d -> d.contribute( NestingIT.mainIndex, nestingMainIndexer,
NestingIT.missingFieldIndex, nestingMissingFieldIndexer ) );
final BulkIndexer inObjectFieldMainIndexer = InObjectFieldIT.mainIndex.bulkIndexer();
final BulkIndexer inObjectFieldMissingFieldIndexer = InObjectFieldIT.missingFieldIndex.bulkIndexer();
InObjectFieldIT.dataSets.forEach( d -> d.contribute( InObjectFieldIT.mainIndex, inObjectFieldMainIndexer,
InObjectFieldIT.missingFieldIndex, inObjectFieldMissingFieldIndexer ) );

final BulkIndexer analysisMainIndexIndexer = AnalysisIT.index.bulkIndexer();
final BulkIndexer analysisCompatibleIndexIndexer = AnalysisIT.compatibleIndex.bulkIndexer();
Expand All @@ -96,7 +96,7 @@ public static void setup() {
TypeCheckingNoConversionIT.missingFieldIndex, typeCheckingMissingFieldIndexer ) );

singleFieldIndexer.join(
multiFieldIndexer, nestingMainIndexer, nestingMissingFieldIndexer,
multiFieldIndexer, inObjectFieldMainIndexer, inObjectFieldMissingFieldIndexer,
analysisMainIndexIndexer, analysisCompatibleIndexIndexer, analysisIncompatibleIndexIndexer,
scoreIndexer,
typeCheckingMainIndexer, typeCheckingCompatibleIndexer,
Expand Down Expand Up @@ -190,7 +190,7 @@ protected PredicateFinalStep predicateOnFieldAndFields(SearchPredicateFactory f,
}

@RunWith(Parameterized.class)
public static class NestingIT extends AbstractPredicateFieldNestingIT<PhrasePredicateTestValues> {
public static class InObjectFieldIT extends AbstractPredicateFieldInObjectFieldIT<PhrasePredicateTestValues> {
private static final List<DataSet<?, ?>> dataSets = new ArrayList<>();
private static final List<Object[]> parameters = new ArrayList<>();
static {
Expand All @@ -214,7 +214,7 @@ public static List<Object[]> parameters() {
return parameters;
}

public NestingIT(DataSet<String, PhrasePredicateTestValues> dataSet) {
public InObjectFieldIT(DataSet<String, PhrasePredicateTestValues> dataSet) {
super( mainIndex, missingFieldIndex, dataSet );
}

Expand Down
16 changes: 8 additions & 8 deletions ...g/hibernate/search/integrationtest/backend/tck/search/predicate/RangePredicateBaseIT.java
View file
Expand Up @@ -55,7 +55,7 @@ public static void setup() {
setupHelper.start()
.withIndexes(
SingleFieldIT.index, MultiFieldIT.index,
NestingIT.mainIndex, NestingIT.missingFieldIndex,
InObjectFieldIT.mainIndex, InObjectFieldIT.missingFieldIndex,
AnalysisIT.index, AnalysisIT.compatibleIndex, AnalysisIT.incompatibleIndex,
ScoreIT.index,
InvalidFieldIT.index, UnsupportedTypeIT.index,
Expand All @@ -74,10 +74,10 @@ public static void setup() {
final BulkIndexer multiFieldIndexer = MultiFieldIT.index.bulkIndexer();
MultiFieldIT.dataSets.forEach( d -> d.contribute( MultiFieldIT.index, multiFieldIndexer ) );

final BulkIndexer nestingMainIndexer = NestingIT.mainIndex.bulkIndexer();
final BulkIndexer nestingMissingFieldIndexer = NestingIT.missingFieldIndex.bulkIndexer();
NestingIT.dataSets.forEach( d -> d.contribute( NestingIT.mainIndex, nestingMainIndexer,
NestingIT.missingFieldIndex, nestingMissingFieldIndexer ) );
final BulkIndexer inObjectFieldMainIndexer = InObjectFieldIT.mainIndex.bulkIndexer();
final BulkIndexer inObjectFieldMissingFieldIndexer = InObjectFieldIT.missingFieldIndex.bulkIndexer();
InObjectFieldIT.dataSets.forEach( d -> d.contribute( InObjectFieldIT.mainIndex, inObjectFieldMainIndexer,
InObjectFieldIT.missingFieldIndex, inObjectFieldMissingFieldIndexer ) );

final BulkIndexer analysisMainIndexIndexer = AnalysisIT.index.bulkIndexer();
final BulkIndexer analysisCompatibleIndexIndexer = AnalysisIT.compatibleIndex.bulkIndexer();
Expand All @@ -104,7 +104,7 @@ public static void setup() {
ScaleCheckingIT.compatibleIndex, scaleCheckingCompatibleIndexer );

singleFieldIndexer.join(
multiFieldIndexer, nestingMainIndexer, nestingMissingFieldIndexer,
multiFieldIndexer, inObjectFieldMainIndexer, inObjectFieldMissingFieldIndexer,
analysisMainIndexIndexer, analysisCompatibleIndexIndexer, analysisIncompatibleIndexIndexer,
scoreIndexer,
typeCheckingMainIndexer, typeCheckingCompatibleIndexer,
Expand Down Expand Up @@ -199,7 +199,7 @@ protected PredicateFinalStep predicateOnFieldAndFields(SearchPredicateFactory f,
}

@RunWith(Parameterized.class)
public static class NestingIT<F> extends AbstractPredicateFieldNestingIT<RangePredicateTestValues<F>> {
public static class InObjectFieldIT<F> extends AbstractPredicateFieldInObjectFieldIT<RangePredicateTestValues<F>> {
private static final List<DataSet<?, ?>> dataSets = new ArrayList<>();
private static final List<Object[]> parameters = new ArrayList<>();
static {
Expand All @@ -223,7 +223,7 @@ public static List<Object[]> parameters() {
return parameters;
}

public NestingIT(DataSet<F, RangePredicateTestValues<F>> dataSet) {
public InObjectFieldIT(DataSet<F, RangePredicateTestValues<F>> dataSet) {
super( mainIndex, missingFieldIndex, dataSet );
}

Expand Down

0 comments on commit 740b7d4

Please sign in to comment.