fix test failures

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
opensearch-project · Feb 15, 2022 · 2222b38 · 2222b38
1 parent 766652d
commit 2222b38
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 195 deletions.
diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsResponse.java b/client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsResponse.java
@@ -65,9 +65,9 @@ public TermVectorsResponse(String index, String id, long version, boolean found,
         "term_vectors",
         true,
         args -> {
-            // as the response comes from server, we are sure that args[6] will be a list of TermVector
+            // as the response comes from server, we are sure that args[5] will be a list of TermVector
             @SuppressWarnings("unchecked")
-            List<TermVector> termVectorList = (List<TermVector>) args[6];
+            List<TermVector> termVectorList = (List<TermVector>) args[5];
             if (termVectorList != null) {
                 Collections.sort(termVectorList, Comparator.comparing(TermVector::getFieldName));
             }

diff --git a/server/src/test/java/org/opensearch/action/termvectors/TermVectorsUnitTests.java b/server/src/test/java/org/opensearch/action/termvectors/TermVectorsUnitTests.java
@@ -330,7 +330,6 @@ public void testMultiParser() throws Exception {
         request.add(new TermVectorsRequest(), data);
 
         checkParsedParameters(request);
-        assertWarnings(RestTermVectorsAction.TYPES_DEPRECATION_MESSAGE);
     }
 
     void checkParsedParameters(MultiTermVectorsRequest request) {
@@ -361,7 +360,6 @@ public void testMultiParserFilter() throws Exception {
         request.add(new TermVectorsRequest(), data);
 
         checkParsedFilterParameters(request);
-        assertWarnings(RestTermVectorsAction.TYPES_DEPRECATION_MESSAGE);
     }
 
     void checkParsedFilterParameters(MultiTermVectorsRequest multiRequest) {

diff --git a/server/src/test/java/org/opensearch/index/query/MoreLikeThisQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/MoreLikeThisQueryBuilderTests.java
@@ -472,11 +472,6 @@ public void testFromJson() throws IOException {
     protected QueryBuilder parseQuery(XContentParser parser) throws IOException {
         QueryBuilder query = super.parseQuery(parser);
         assertThat(query, instanceOf(MoreLikeThisQueryBuilder.class));
-
-        if (!assertedWarnings.contains(MoreLikeThisQueryBuilder.TYPES_DEPRECATION_MESSAGE)) {
-            assertWarnings(MoreLikeThisQueryBuilder.TYPES_DEPRECATION_MESSAGE);
-            assertedWarnings.add(MoreLikeThisQueryBuilder.TYPES_DEPRECATION_MESSAGE);
-        }
         return query;
     }
 

diff --git a/...er/src/test/java/org/opensearch/rest/action/document/RestMultiTermVectorsActionTests.java b/...er/src/test/java/org/opensearch/rest/action/document/RestMultiTermVectorsActionTests.java
diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestTermVectorsActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestTermVectorsActionTests.java