quick test failure fixes

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
opensearch-project · Feb 25, 2022 · 17af390 · 17af390
1 parent 224fd67
commit 17af390
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...t/java/org/opensearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java b/...t/java/org/opensearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java
@@ -40,6 +40,7 @@
 import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.index.mapper.MapperService;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.plugins.Plugin;
@@ -544,7 +545,9 @@ private void indexRandomFrequencies01(String type) throws ExecutionException, In
         if (type.equals("text")) {
             textMappings += ",fielddata=true";
         }
-        assertAcked(prepareCreate(INDEX_NAME).addMapping(TEXT_FIELD, textMappings, CLASS_FIELD, "type=keyword"));
+        assertAcked(
+            prepareCreate(INDEX_NAME).addMapping(MapperService.SINGLE_MAPPING_NAME, TEXT_FIELD, textMappings, CLASS_FIELD, "type=keyword")
+        );
         String[] gb = { "0", "1" };
         List<IndexRequestBuilder> indexRequestBuilderList = new ArrayList<>();
         for (int i = 0; i < randomInt(20); i++) {

diff --git a/...alClusterTest/java/org/opensearch/search/aggregations/bucket/TermsShardMinDocCountIT.java b/...alClusterTest/java/org/opensearch/search/aggregations/bucket/TermsShardMinDocCountIT.java
@@ -35,6 +35,7 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.index.mapper.MapperService;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.aggregations.BucketOrder;
 import org.opensearch.search.aggregations.bucket.filter.InternalFilter;
@@ -72,7 +73,7 @@ public void testShardMinDocCountSignificantTermsTest() throws Exception {
         }
         assertAcked(
             prepareCreate(index).setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0))
-                .addMapping("text", textMappings)
+                .addMapping(MapperService.SINGLE_MAPPING_NAME, "text", textMappings)
         );
         List<IndexRequestBuilder> indexBuilders = new ArrayList<>();
 
@@ -141,7 +142,7 @@ public void testShardMinDocCountTermsTest() throws Exception {
         }
         assertAcked(
             prepareCreate(index).setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0))
-                .addMapping("text", termMappings)
+                .addMapping(MapperService.SINGLE_MAPPING_NAME, "text", termMappings)
         );
         List<IndexRequestBuilder> indexBuilders = new ArrayList<>();