more validation unit tests

opensearch-project · Nov 17, 2023 · f9fc10f · f9fc10f
1 parent fe33157
commit f9fc10f
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 8 deletions.
diff --git a/server/src/test/java/org/opensearch/index/mapper/MatchOnlyTextFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/MatchOnlyTextFieldMapperTests.java
@@ -167,13 +167,35 @@ public void testPositionIncrementGap() throws IOException {}
     public void testDefaultPositionIncrementGap() throws IOException {}
 
     @Override
-    public void testIndexPrefixMapping() throws IOException {}
+    public void testIndexPrefixMapping() throws IOException {
+        MapperParsingException e = expectThrows(
+            MapperParsingException.class,
+            () -> createDocumentMapper(
+                fieldMapping(
+                    b -> b.field("type", textFieldName)
+                        .field("analyzer", "standard")
+                        .startObject("index_prefixes")
+                        .field("min_chars", 2)
+                        .field("max_chars", 10)
+                        .endObject()
+                )
+            )
+        );
+        assertEquals(
+            "Failed to parse mapping [_doc]: Index prefixes cannot be enabled on for match_only_text field. Use text field instead",
+            e.getMessage()
+        );
+    }
 
     @Override
-    public void testIndexPrefixIndexTypes() throws IOException {}
+    public void testIndexPrefixIndexTypes() throws IOException {
+        // not supported and asserted the expected behavior in testIndexPrefixMapping
+    }
 
     @Override
-    public void testFastPhrasePrefixes() throws IOException {}
+    public void testFastPhrasePrefixes() throws IOException {
+        // not supported and asserted the expected behavior in testIndexPrefixMapping
+    }
 
     public void testPhrasePrefixes() throws IOException {
         MapperService mapperService = createMapperService(mapping(b -> {
@@ -351,7 +373,21 @@ public void testPhrasePrefixes() throws IOException {
     }
 
     @Override
-    public void testFastPhraseMapping() throws IOException {}
+    public void testFastPhraseMapping() throws IOException {
+        MapperParsingException e = expectThrows(MapperParsingException.class, () -> createMapperService(mapping(b -> {
+            b.startObject("field")
+                .field("type", textFieldName)
+                .field("analyzer", "my_stop_analyzer")
+                .field("index_phrases", true)
+                .endObject();
+            // "standard" will be replaced with MockSynonymAnalyzer
+            b.startObject("synfield").field("type", textFieldName).field("analyzer", "standard").field("index_phrases", true).endObject();
+        })));
+        assertEquals(
+            "Failed to parse mapping [_doc]: Index phrases cannot be enabled on for match_only_text field. Use text field instead",
+            e.getMessage()
+        );
+    }
 
     @Override
     public void testSimpleMerge() throws IOException {}

diff --git a/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java
@@ -254,9 +254,7 @@ protected QueryShardContext createQueryShardContext(MapperService mapperService)
         when(queryShardContext.lookup()).thenReturn(new SearchLookup(mapperService, (ft, s) -> {
             throw new UnsupportedOperationException("search lookup not available");
         }));
-        when(queryShardContext.getFieldType(any())).thenAnswer(
-            inv -> mapperService.fieldType(inv.getArguments()[0].toString())
-        );
+        when(queryShardContext.getFieldType(any())).thenAnswer(inv -> mapperService.fieldType(inv.getArguments()[0].toString()));
         return queryShardContext;
     }
 }
diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
@@ -761,7 +761,8 @@ public void testSupportedFieldTypes() throws IOException {
             source.put("type", mappedType.getKey());
 
             // Text is the only field that doesn't support DVs, instead FD
-            if (mappedType.getKey().equals(TextFieldMapper.CONTENT_TYPE) == false && mappedType.getKey().equals(MatchOnlyTextFieldMapper.CONTENT_TYPE) == false) {
+            if (mappedType.getKey().equals(TextFieldMapper.CONTENT_TYPE) == false
+                && mappedType.getKey().equals(MatchOnlyTextFieldMapper.CONTENT_TYPE) == false) {
                 source.put("doc_values", "true");
             }