@@ -195,13 +195,14 @@ public void testSearchRequestHandlerHighlightingTurnedOff() {
195
195
// Filters
196
196
Collection <AggregationBuilder > aggBuilders =
197
197
sourceBuilder .aggregations ().getAggregatorFactories ();
198
- // Expect 3 aggregations: textFieldOverride, missing␝textFieldOverride, and _index
199
- assertEquals (aggBuilders .size (), 3 );
198
+ // Expect 3 aggregations: textFieldOverride, missing␝textFieldOverride, and _entityType,
199
+ // _entityType␝typeNames
200
+ assertEquals (aggBuilders .size (), 4 );
200
201
for (AggregationBuilder aggBuilder : aggBuilders ) {
201
- if (aggBuilder .getName ().equals ("textFieldOverride" )) {
202
+ if (aggBuilder .getName ().startsWith ("textFieldOverride" )) {
202
203
TermsAggregationBuilder filterPanelBuilder = (TermsAggregationBuilder ) aggBuilder ;
203
204
assertEquals (filterPanelBuilder .field (), "textFieldOverride.keyword" );
204
- } else if (!aggBuilder .getName ().equals ("_entityType" )
205
+ } else if (!aggBuilder .getName ().startsWith ("_entityType" )
205
206
&& !aggBuilder
206
207
.getName ()
207
208
.equals (
@@ -241,13 +242,14 @@ public void testSearchRequestHandler() {
241
242
// Filters
242
243
Collection <AggregationBuilder > aggBuilders =
243
244
sourceBuilder .aggregations ().getAggregatorFactories ();
244
- // Expect 2 aggregations: textFieldOverride and _index
245
- assertEquals (aggBuilders .size (), 3 );
245
+ // Expect 4 aggregations: textFieldOverride, missing:textFieldOverride, _entityType and
246
+ // _entityType:typeNames
247
+ assertEquals (aggBuilders .size (), 4 );
246
248
for (AggregationBuilder aggBuilder : aggBuilders ) {
247
- if (aggBuilder .getName ().equals ("textFieldOverride" )) {
249
+ if (aggBuilder .getName ().startsWith ("textFieldOverride" )) {
248
250
TermsAggregationBuilder filterPanelBuilder = (TermsAggregationBuilder ) aggBuilder ;
249
251
assertEquals (filterPanelBuilder .field (), "textFieldOverride.keyword" );
250
- } else if (!aggBuilder .getName ().equals ("_entityType" )
252
+ } else if (!aggBuilder .getName ().startsWith ("_entityType" )
251
253
&& !aggBuilder
252
254
.getName ()
253
255
.equals (
0 commit comments