Some more test tweaks

Author: thecoop

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

@@ -7,13 +7,13 @@
 
 package org.elasticsearch.xpack.inference.rank.textsimilarity;
 
-import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.search.rank.feature.RankFeatureDoc;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xpack.core.inference.action.GetInferenceModelAction;
 
+import static org.elasticsearch.action.support.ActionTestUtils.assertNoFailureListener;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
@@ -44,17 +44,7 @@ public void testComputeScores() {
         featureDoc3.featureData("text 3");
         RankFeatureDoc[] featureDocs = new RankFeatureDoc[] { featureDoc1, featureDoc2, featureDoc3 };
 
-        subject.computeScores(featureDocs, new ActionListener<>() {
-            @Override
-            public void onResponse(float[] floats) {
-                assertArrayEquals(new float[] { 1.0f, 3.0f, 2.0f }, floats, 0.0f);
-            }
-
-            @Override
-            public void onFailure(Exception e) {
-                fail();
-            }
-        });
+        subject.computeScores(featureDocs, assertNoFailureListener(f -> assertArrayEquals(new float[] { 1.0f, 3.0f, 2.0f }, f, 0.0f)));
         verify(mockClient).execute(
             eq(GetInferenceModelAction.INSTANCE),
             argThat(actionRequest -> ((GetInferenceModelAction.Request) actionRequest).getTaskType().equals(TaskType.RERANK)),
@@ -63,17 +53,7 @@ public void onFailure(Exception e) {
     }
 
     public void testComputeScoresForEmpty() {
-        subject.computeScores(new RankFeatureDoc[0], new ActionListener<>() {
-            @Override
-            public void onResponse(float[] floats) {
-                assertArrayEquals(new float[0], floats, 0.0f);
-            }
-
-            @Override
-            public void onFailure(Exception e) {
-                fail();
-            }
-        });
+        subject.computeScores(new RankFeatureDoc[0], assertNoFailureListener(f -> assertArrayEquals(new float[0], f, 0.0f)));
         verify(mockClient).execute(
             eq(GetInferenceModelAction.INSTANCE),
             argThat(actionRequest -> ((GetInferenceModelAction.Request) actionRequest).getTaskType().equals(TaskType.RERANK)),

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

@@ -30,6 +30,8 @@
 import java.util.Map;
 
 import static org.elasticsearch.test.LambdaMatchers.transformedMatch;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasRank;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasScore;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.containsString;
@@ -69,10 +71,9 @@ public InferenceResultCountAcceptingTextSimilarityRankBuilder(
             String inferenceText,
             int rankWindowSize,
             Float minScore,
-            boolean lenient,
             int inferenceResultCount
         ) {
-            super(field, inferenceId, inferenceText, rankWindowSize, minScore, lenient);
+            super(field, inferenceId, inferenceText, rankWindowSize, minScore, false);
             this.inferenceResultCount = inferenceResultCount;
         }
 
@@ -186,9 +187,9 @@ public void testRerankInferenceFailure() {
         );
     }
 
-    public void testLenientRerankInference() {
+    public void testRerankInferenceAllowedFailure() {
         ElasticsearchAssertions.assertNoFailuresAndResponse(
-            // Execute search with text similarity reranking
+            // Execute search with text similarity reranking that fails, but it is allowed
             client.prepareSearch()
                 .setRankBuilder(
                     new TextSimilarityTestPlugin.ThrowingMockRequestActionBasedRankBuilder(
@@ -244,7 +245,7 @@ public void testRerankInputSizeAndInferenceResultsMismatch() {
             client.prepareSearch()
                 .setRankBuilder(
                     // Simulate reranker returning different number of results from input
-                    new InferenceResultCountAcceptingTextSimilarityRankBuilder("text", "my-rerank-model", "my query", 100, 1.5f, false, 4)
+                    new InferenceResultCountAcceptingTextSimilarityRankBuilder("text", "my-rerank-model", "my query", 100, 1.5f, 4)
                 )
                 .setQuery(QueryBuilders.matchAllQuery())
         );
@@ -254,8 +255,8 @@ public void testRerankInputSizeAndInferenceResultsMismatch() {
 
     private static Matcher<SearchHit> searchHitWith(int expectedRank, float expectedScore, String expectedText) {
         return allOf(
-            transformedMatch(SearchHit::getRank, equalTo(expectedRank)),
-            transformedMatch(SearchHit::getScore, equalTo(expectedScore)),
+            hasRank(expectedRank),
+            hasScore(expectedScore),
             transformedMatch(hit -> hit.getSourceAsMap().get("text"), equalTo(expectedText))
         );
     }