Skip to content

Commit 3c86416

Browse files
committed
Modified the unit test to accomodate the change in createPinnedQuery
1 parent 4456504 commit 3c86416

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

x-pack/plugin/search-business-rules/src/test/java/org/elasticsearch/xpack/searchbusinessrules/retriever/PinnedRetrieverBuilderTests.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
import org.elasticsearch.common.Strings;
1111
import org.elasticsearch.common.settings.Settings;
12+
import org.elasticsearch.index.query.MatchAllQueryBuilder;
13+
import org.elasticsearch.index.query.QueryBuilder;
1214
import org.elasticsearch.search.SearchModule;
1315
import org.elasticsearch.search.builder.SearchSourceBuilder;
1416
import org.elasticsearch.search.retriever.RetrieverBuilder;
@@ -169,42 +171,47 @@ public void testValidation() {
169171
}
170172

171173
public void testValidateSort() {
174+
172175
PinnedRetrieverBuilder builder = new PinnedRetrieverBuilder(
173176
List.of("id1"),
174177
List.of(),
175178
new TestRetrieverBuilder("test"),
176179
DEFAULT_RANK_WINDOW_SIZE
177180
);
178181

182+
QueryBuilder dummyQuery = new MatchAllQueryBuilder();
183+
179184
SearchSourceBuilder emptySource = new SearchSourceBuilder();
185+
emptySource.query(dummyQuery);
180186
builder.finalizeSourceBuilder(emptySource);
181187
assertThat(emptySource.sorts(), equalTo(null));
182188

183189
SearchSourceBuilder scoreSource = new SearchSourceBuilder();
190+
scoreSource.query(dummyQuery);
184191
scoreSource.sort("_score");
185192
builder.finalizeSourceBuilder(scoreSource);
186193
assertThat(scoreSource.sorts().size(), equalTo(1));
187194

188195
SearchSourceBuilder customSortSource = new SearchSourceBuilder();
196+
customSortSource.query(dummyQuery);
189197
customSortSource.sort("field1");
190198
IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> builder.finalizeSourceBuilder(customSortSource));
191199
assertThat(
192200
e.getMessage(),
193201
equalTo(
194-
"[pinned] retriever only supports sorting by score, "
195-
+ "invalid sort criterion: {\n \"field1\" : {\n \"order\" : \"asc\"\n }\n}"
202+
"[" + PinnedRetrieverBuilder.NAME + "] retriever only supports sorting by score, invalid sort criterion: {\n \"field1\" : {\n \"order\" : \"asc\"\n }\n}"
196203
)
197204
);
198205

199206
SearchSourceBuilder multipleSortsSource = new SearchSourceBuilder();
207+
multipleSortsSource.query(dummyQuery);
200208
multipleSortsSource.sort("_score");
201209
multipleSortsSource.sort("field1");
202210
e = expectThrows(IllegalArgumentException.class, () -> builder.finalizeSourceBuilder(multipleSortsSource));
203211
assertThat(
204212
e.getMessage(),
205213
equalTo(
206-
"[pinned] retriever only supports sorting by score, "
207-
+ "invalid sort criterion: {\n \"field1\" : {\n \"order\" : \"asc\"\n }\n}"
214+
"[" + PinnedRetrieverBuilder.NAME + "] retriever only supports sorting by score, invalid sort criterion: {\n \"field1\" : {\n \"order\" : \"asc\"\n }\n}"
208215
)
209216
);
210217
}

0 commit comments

Comments
 (0)