cleanup unit and YAML tests

Author: markjhoy

x-pack/plugin/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/70_text_similarity_rank_retriever.yml

@@ -398,7 +398,7 @@ setup:
               rank_window_size: 10
               inference_id: my-rerank-model
               inference_text: "How often does the moon hide the sun?"
-              field: topic
+              field: text
           size: 10
 
   - match: { hits.total.value: 1 }

x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRetrieverBuilderIT.java

@@ -186,7 +186,7 @@ public void testRRFPagination() {
     private void assertRRFPagination(
         SearchSourceBuilder source,
         int from,
-        int expectedSize,
+        int maxExpectedSize,
         int rankWindowSize,
         int rankConstant,
         List<String> expectedDocIds
@@ -231,23 +231,39 @@ private void assertRRFPagination(
             )
         );
         SearchRequestBuilder req = client().prepareSearch(INDEX).setSource(source);
+
         int innerFrom = Math.max(from, 0);
-        int originalFrom = from;
         ElasticsearchAssertions.assertResponse(req, resp -> {
             assertNull(resp.pointInTimeId());
             assertNotNull(resp.getHits().getTotalHits());
             assertThat(resp.getHits().getTotalHits().value(), equalTo(6L));
             assertThat(resp.getHits().getTotalHits().relation(), equalTo(TotalHits.Relation.EQUAL_TO));
-            assertThat(resp.getHits().getHits().length, lessThanOrEqualTo(expectedSize));
-            for (int k = 0; k < Math.min(expectedSize, resp.getHits().getHits().length); k++) {
-                assertThat(resp.getHits().getAt(k).getId(), equalTo(expectedDocIds.get(k + innerFrom)));
-            }
 
-            if (originalFrom < 0) {
-                // assertThat(source.from(), equalTo(SearchService.DEFAULT_FROM));
-                assertThat(resp.getHits().getHits().length, equalTo(expectedSize));
+            int expectedSize = innerFrom + maxExpectedSize > 6 ? 6 - innerFrom : maxExpectedSize;
+            assertThat(resp.getHits().getHits().length, equalTo(expectedSize));
+
+            for (int k = 0; k < expectedSize; k++) {
+                assertThat(resp.getHits().getAt(k).getId(), equalTo(expectedDocIds.get(k + innerFrom)));
             }
         });
+
+//        int innerFrom = Math.max(from, 0);
+//        int originalFrom = from;
+//        ElasticsearchAssertions.assertResponse(req, resp -> {
+//            assertNull(resp.pointInTimeId());
+//            assertNotNull(resp.getHits().getTotalHits());
+//            assertThat(resp.getHits().getTotalHits().value(), equalTo(6L));
+//            assertThat(resp.getHits().getTotalHits().relation(), equalTo(TotalHits.Relation.EQUAL_TO));
+//            assertThat(resp.getHits().getHits().length, lessThanOrEqualTo(maxExpectedSize));
+//            for (int k = 0; k < Math.min(maxExpectedSize, resp.getHits().getHits().length); k++) {
+//                assertThat(resp.getHits().getAt(k).getId(), equalTo(expectedDocIds.get(k + innerFrom)));
+//            }
+//
+//            if (originalFrom < 0) {
+//                // assertThat(source.from(), equalTo(SearchService.DEFAULT_FROM));
+//                assertThat(resp.getHits().getHits().length, equalTo(maxExpectedSize));
+//            }
+//        });
     }
 
     public void testRRFWithAggs() {