From 445951d0e84412d0f892ad55e5cef6c0d13878d3 Mon Sep 17 00:00:00 2001 From: guojialiang Date: Tue, 15 Apr 2025 13:27:03 +0800 Subject: [PATCH] fix BoolQueryBuilderTests.testToQuery Signed-off-by: guojialiang --- .../org/opensearch/index/query/BoolQueryBuilderTests.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/test/java/org/opensearch/index/query/BoolQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/BoolQueryBuilderTests.java index 9223d82339252..94f7bb3898903 100644 --- a/server/src/test/java/org/opensearch/index/query/BoolQueryBuilderTests.java +++ b/server/src/test/java/org/opensearch/index/query/BoolQueryBuilderTests.java @@ -95,7 +95,8 @@ protected BoolQueryBuilder doCreateTestQueryBuilder() { @Override protected void doAssertLuceneQuery(BoolQueryBuilder queryBuilder, Query query, QueryShardContext context) throws IOException { if (!queryBuilder.hasClauses()) { - assertThat(query, instanceOf(MatchAllDocsQuery.class)); + assertThat(query, instanceOf(ApproximateScoreQuery.class)); + assertThat(((ApproximateScoreQuery) query).getOriginalQuery(), instanceOf(MatchAllDocsQuery.class)); } else { List clauses = new ArrayList<>(); clauses.addAll(getBooleanClauses(queryBuilder.must(), BooleanClause.Occur.MUST, context)); @@ -104,7 +105,8 @@ protected void doAssertLuceneQuery(BoolQueryBuilder queryBuilder, Query query, Q clauses.addAll(getBooleanClauses(queryBuilder.filter(), BooleanClause.Occur.FILTER, context)); if (clauses.isEmpty()) { - assertThat(query, instanceOf(MatchAllDocsQuery.class)); + assertThat(query, instanceOf(ApproximateScoreQuery.class)); + assertThat(((ApproximateScoreQuery) query).getOriginalQuery(), instanceOf(MatchAllDocsQuery.class)); } else if (query instanceof MatchNoDocsQuery == false) { assertThat(query, instanceOf(BooleanQuery.class)); BooleanQuery booleanQuery = (BooleanQuery) query;