Fix test failure

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
opensearch-project · Jul 16, 2024 · 5f9e304 · 5f9e304
1 parent f64114d
commit 5f9e304
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/server/src/test/java/org/opensearch/action/update/UpdateRequestTests.java b/server/src/test/java/org/opensearch/action/update/UpdateRequestTests.java
@@ -664,7 +664,7 @@ public void testToString() throws IOException {
             request.toString(),
             equalTo(
                 "update {[test][1], doc_as_upsert[false], "
-                    + "doc[index {[null][null], source[{\"body\":\"bar\"}]}], scripted_upsert[false], detect_noop[true]}"
+                    + "doc[index {[test][null], source[{\"body\":\"bar\"}]}], scripted_upsert[false], detect_noop[true]}"
             )
         );
     }

diff --git a/server/src/test/java/org/opensearch/ingest/IngestServiceTests.java b/server/src/test/java/org/opensearch/ingest/IngestServiceTests.java
@@ -1607,12 +1607,11 @@ public void testResolveRequiredOrDefaultPipelineDefaultPipeline() {
         assertThat(indexRequest.getPipeline(), equalTo("default-pipeline"));
 
         // index name matches with ITMD for bulk upsert
-        IndexRequest upsertRequest = new IndexRequest().source(emptyMap());
-        UpdateRequest updateRequest = new UpdateRequest("idx", "id1").upsert(upsertRequest).script(mockScript("1"));
+        UpdateRequest updateRequest = new UpdateRequest("idx", "id1").upsert(emptyMap()).script(mockScript("1"));
         result = IngestService.resolvePipelines(updateRequest, TransportBulkAction.getIndexWriteRequest(updateRequest), metadata);
         assertThat(result, is(true));
-        assertThat(upsertRequest.isPipelineResolved(), is(true));
-        assertThat(upsertRequest.getPipeline(), equalTo("default-pipeline"));
+        assertThat(updateRequest.upsertRequest().isPipelineResolved(), is(true));
+        assertThat(updateRequest.upsertRequest().getPipeline(), equalTo("default-pipeline"));
     }
 
     public void testResolveFinalPipeline() {
@@ -1652,12 +1651,11 @@ public void testResolveFinalPipeline() {
         assertThat(indexRequest.getFinalPipeline(), equalTo("final-pipeline"));
 
         // index name matches with ITMD for bulk upsert:
-        IndexRequest upsertRequest = new IndexRequest().source(emptyMap());
-        UpdateRequest updateRequest = new UpdateRequest("idx", "id1").upsert(upsertRequest).script(mockScript("1"));
+        UpdateRequest updateRequest = new UpdateRequest("idx", "id1").upsert(emptyMap()).script(mockScript("1"));
         result = IngestService.resolvePipelines(updateRequest, TransportBulkAction.getIndexWriteRequest(updateRequest), metadata);
         assertThat(result, is(true));
-        assertThat(upsertRequest.isPipelineResolved(), is(true));
-        assertThat(upsertRequest.getFinalPipeline(), equalTo("final-pipeline"));
+        assertThat(updateRequest.upsertRequest().isPipelineResolved(), is(true));
+        assertThat(updateRequest.upsertRequest().getFinalPipeline(), equalTo("final-pipeline"));
     }
 
     public void testResolveRequestOrDefaultPipelineAndFinalPipeline() {