Some fixes

Author: thecoop

test/framework/src/main/java/org/elasticsearch/search/SearchResponseUtils.java

@@ -83,7 +83,7 @@ public static SearchResponseBuilder builder(SearchHits hits) {
     }
 
     public static SearchResponse success(SearchHits hits) {
-        return builder(hits).searchHits(hits).numReducePhases(1).shards(1, 1, 0).tookInMillis(100).build();
+        return builder(hits).numReducePhases(1).shards(1, 1, 0).tookInMillis(100).build();
     }
 
     public static SearchResponse emptyWithTotalHits(

x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/PivotTests.java

@@ -385,7 +385,7 @@ protected <Request extends ActionRequest, Response extends ActionResponse> void
                     listener,
                     (Response) SearchResponseUtils.builder(SearchHits.EMPTY_WITH_TOTAL_HITS)
                         .numReducePhases(1)
-                        .shards(10, searchFailures.isEmpty() ? 0 : 5, 0)
+                        .shards(10, searchFailures.isEmpty() ? 5 : 0, 0)
                         .shardFailures(searchFailures.toArray(ShardSearchFailure[]::new))
                         .build()
                 );

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreTests.java

@@ -240,9 +240,9 @@ public void testFindTriggeredWatchesGoodCase() {
                 hit.sourceRef(source);
                 ActionListener.respondAndRelease(
                     listener,
-                    SearchResponseUtils.success(
+                    SearchResponseUtils.builder(
                         SearchHits.unpooled(new SearchHit[] { hit }, new TotalHits(1, TotalHits.Relation.EQUAL_TO), 1.0f)
-                    )
+                    ).numReducePhases(1).scrollId("_scrollId1").shards(1, 1, 0).tookInMillis(1).build()
                 );
             } else if (request.scrollId().equals("_scrollId1")) {
                 ActionListener.respondAndRelease(listener, SearchResponseUtils.emptyWithTotalHits("_scrollId2", 1, 1, 0, 1, null, null));