Actually check scores are passed through

Author: thecoop

test/framework/src/main/java/org/elasticsearch/search/rank/rerank/AbstractRerankerIT.java

@@ -30,6 +30,7 @@
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasRank;
+import static org.hamcrest.Matchers.arrayWithSize;
 import static org.hamcrest.Matchers.equalTo;
 
 /**
@@ -403,7 +404,7 @@ public void testRankFeaturePhaseShardThrowingPartialFailures() throws Exception
                         .allMatch(failure -> failure.getCause().getMessage().contains("rfs - simulated failure"))
                 );
                 assertHitCount(response, 5);
-                assertTrue(response.getHits().getHits().length == 0);
+                assertThat(response.getHits().getHits(), arrayWithSize(5));
             }
         );
         assertNoOpenContext(indexName);

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankMultiNodeTests.java

@@ -8,6 +8,7 @@
 package org.elasticsearch.xpack.inference.rank.textsimilarity;
 
 import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.rank.RankBuilder;
 import org.elasticsearch.search.rank.rerank.AbstractRerankerIT;
 import org.elasticsearch.xpack.inference.LocalStateInferencePlugin;
@@ -16,9 +17,12 @@
 import java.util.List;
 
 import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
+import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
 import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailuresAndResponse;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasRank;
 
 public class TextSimilarityRankMultiNodeTests extends AbstractRerankerIT {
 
@@ -84,11 +88,11 @@ public void testRerankerAllowedFailureNoExceptions() throws Exception {
 
         assertNoFailuresAndResponse(
             prepareSearch().setQuery(
-                boolQuery().should(matchQuery(searchField, "A"))
-                    .should(matchQuery(searchField, "B"))
-                    .should(matchQuery(searchField, "C"))
-                    .should(matchQuery(searchField, "D"))
-                    .should(matchQuery(searchField, "E"))
+                boolQuery().should(constantScoreQuery(matchQuery(searchField, "A")).boost(10))
+                    .should(constantScoreQuery(matchQuery(searchField, "B")).boost(20))
+                    .should(constantScoreQuery(matchQuery(searchField, "C")).boost(30))
+                    .should(constantScoreQuery(matchQuery(searchField, "D")).boost(40))
+                    .should(constantScoreQuery(matchQuery(searchField, "E")).boost(50))
             )
                 .setRankBuilder(
                     getThrowingRankBuilder(
@@ -103,8 +107,16 @@ public void testRerankerAllowedFailureNoExceptions() throws Exception {
                 .setAllowPartialSearchResults(true)
                 .setSize(10),
             response -> {
-                // just check it returns 5 documents, the order will be random due to not getting reranked
                 assertHitCount(response, 5L);
+                int rank = 1;
+                for (SearchHit searchHit : response.getHits().getHits()) {
+                    int id = 5 - (rank - 1);
+                    assertThat(searchHit, hasId(String.valueOf(id)));
+                    assertThat(searchHit, hasRank(rank));
+                    assertNotNull(searchHit.getFields().get(searchField));
+                    assertEquals(id * 10, searchHit.getScore(), 0f);
+                    rank++;
+                }
             }
         );
         assertNoOpenContext(indexName);

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankTests.java

@@ -29,6 +29,9 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
+import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
+import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
 import static org.elasticsearch.test.LambdaMatchers.transformedMatch;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasRank;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasScore;
@@ -202,17 +205,23 @@ public void testRerankInferenceAllowedFailure() {
                         AbstractRerankerIT.ThrowingRankBuilderType.THROWING_RANK_FEATURE_PHASE_COORDINATOR_CONTEXT.name()
                     )
                 )
-                .setQuery(QueryBuilders.matchAllQuery()),
+                .setQuery(
+                    boolQuery().should(constantScoreQuery(matchQuery("text", "0")).boost(50))
+                        .should(constantScoreQuery(matchQuery("text", "1")).boost(40))
+                        .should(constantScoreQuery(matchQuery("text", "2")).boost(30))
+                        .should(constantScoreQuery(matchQuery("text", "3")).boost(20))
+                        .should(constantScoreQuery(matchQuery("text", "4")).boost(10))
+                ),
             response -> {
-                // these will all have a score of 1, the score from matchAllQuery
+                // these will all have the scores from the constant score clauses
                 assertThat(
                     response.getHits().getHits(),
                     arrayContaining(
-                        searchHitWith(1, 1.0f, "0"),
-                        searchHitWith(2, 1.0f, "1"),
-                        searchHitWith(3, 1.0f, "2"),
-                        searchHitWith(4, 1.0f, "3"),
-                        searchHitWith(5, 1.0f, "4")
+                        searchHitWith(1, 50, "0"),
+                        searchHitWith(2, 40, "1"),
+                        searchHitWith(3, 30, "2"),
+                        searchHitWith(4, 20, "3"),
+                        searchHitWith(5, 10, "4")
                     )
                 );
             }