From c60f3b9fe0c7db574f31dffa5a08fa3c11b68a74 Mon Sep 17 00:00:00 2001 From: Nicholas Walter Knize Date: Thu, 24 Feb 2022 12:17:51 -0600 Subject: [PATCH] fix additional missed tests Signed-off-by: Nicholas Walter Knize --- .../org/opensearch/ingest/common/ForEachProcessorTests.java | 1 - .../test/java/org/opensearch/index/reindex/CancelTests.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java index 0f61f40f3ce95..8db3cefc3a6fd 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java @@ -137,7 +137,6 @@ public void testMetadataAvailable() throws Exception { assertThat(ingestDocument.getFieldValue("values.0.index", String.class), equalTo("_index")); assertThat(ingestDocument.getFieldValue("values.0.id", String.class), equalTo("_id")); assertThat(ingestDocument.getFieldValue("values.1.index", String.class), equalTo("_index")); - assertThat(ingestDocument.getFieldValue("values.1.type", String.class), equalTo("_type")); assertThat(ingestDocument.getFieldValue("values.1.id", String.class), equalTo("_id")); } diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java index 3bf8e09501167..bd43f05225f65 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java @@ -45,7 +45,6 @@ import org.opensearch.index.IndexModule; import org.opensearch.index.engine.Engine; import org.opensearch.index.engine.Engine.Operation.Origin; -import org.opensearch.index.mapper.MapperService; import org.opensearch.index.query.QueryBuilders; import org.opensearch.index.shard.IndexingOperationListener; import org.opensearch.index.shard.ShardId; @@ -295,7 +294,7 @@ public void testReindexCancelWithWorkers() throws Exception { refresh("dest"); assertHitCount(client().prepareSearch("dest").setSize(0).get(), modified); }, - equalTo("reindex from [" + INDEX + "] to [dest][" + MapperService.SINGLE_MAPPING_NAME + "]") + equalTo("reindex from [" + INDEX + "] to [dest]") ); }