From 420a0400d61f1778cddaee4b88811db0ad15cf40 Mon Sep 17 00:00:00 2001
From: kkewwei <kkewwei@163.com>
Date: Fri, 2 Aug 2024 00:23:27 +0800
Subject: [PATCH] add rest api spec tests

Signed-off-by: kkewwei <kkewwei@163.com>
---
 .../test/index/110_constant_keyword.yml       | 266 +++++++++++++++++-
 .../index/mapper/ConstantFieldType.java       |   2 +-
 2 files changed, 259 insertions(+), 9 deletions(-)

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/110_constant_keyword.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/110_constant_keyword.yml
index f4f8b3752bec8..b0d3f60447edd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/110_constant_keyword.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/110_constant_keyword.yml
@@ -1,17 +1,18 @@
 ---
 # The test setup includes:
-# - Create index with constant_keyword field type
+# - Create two indices with constant_keyword field type
+# - Index documents
 # - Check mapping
-# - Index two example documents
-# - Search
-# - Delete Index when connection is teardown
+# - Verify document count
+# - Search rangeQuery and regexpQuery
+# - Delete indices when connection is teardown
 
 "Mappings and Supported queries":
   - skip:
       version: " - 2.15.99"
       reason: "fixed in 2.16.0"
 
-  # Create index with constant_keyword field type
+  # Create indices with constant_keyword field type
   - do:
       indices.create:
         index: test
@@ -22,7 +23,17 @@
                 type: "constant_keyword"
                 value: "1"
 
-  # Index document
+  - do:
+      indices.create:
+        index: test1
+        body:
+          mappings:
+            properties:
+              genre:
+                type: "constant_keyword"
+                value: "d3efault"
+
+  # Index documents to test integer and string are both ok.
   - do:
       index:
         index: test
@@ -39,9 +50,18 @@
           "genre": 1
         }
 
+  # Index documents to test query.
+  - do:
+      index:
+        index: test1
+        id: 1
+        body: {
+          "genre": "d3efault"
+        }
+
   - do:
       indices.refresh:
-        index: test
+        index: [test, test1]
 
   # Check mapping
   - do:
@@ -54,6 +74,7 @@
   # Verify Document Count
   - do:
       search:
+        index: test
         body: {
           query: {
             match_all: {}
@@ -64,7 +85,236 @@
   - match: { hits.hits.0._source.genre: "1" }
   - match: { hits.hits.1._source.genre: 1 }
 
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            match_all: {}
+          }
+        }
+
+  - length: { hits.hits: 1 }
+  - match: { hits.hits.0._source.genre: "d3efault" }
+
+  # Test rangeQuery
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            range: {
+              genre: {
+                gte: "d3efault"
+              }
+            }
+          }
+        }
+
+  - length: { hits.hits: 1 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            range: {
+              genre: {
+                from: "d3efault",
+                "include_lower": "false"
+              }
+            }
+          }
+        }
+
+  - length: { hits.hits: 0 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            range: {
+              genre: {
+                lte: "d3efault"
+              }
+            }
+          }
+        }
+
+  - length: { hits.hits: 1 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            range: {
+              genre: {
+                to: "d3efault",
+                include_lower: "false"
+              }
+            }
+          }
+        }
+
+  - length: { hits.hits: 0 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            range: {
+              genre: {
+                from: "d3efault",
+                to: "d3efault",
+                include_lower: "false",
+                include_upper: "true"
+              }
+            }
+          }
+        }
+
+  - length: { hits.hits: 0 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            range: {
+              genre: {
+                from: "d3efault",
+                to: "d3efault",
+                include_lower: "true",
+                include_upper: "false"
+              }
+            }
+          }
+        }
+
+  - length: { hits.hits: 0 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            range: {
+              genre: {
+                from: null,
+                to: null
+              }
+            }
+          }
+        }
+
+  - length: { hits.hits: 1 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            range: {
+              genre: {
+                from: "d3efault",
+                to: "d3efault",
+                include_lower: "true",
+                include_upper: "true"
+              }
+            }
+          }
+        }
+
+  - length: { hits.hits: 1 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            range: {
+              genre: {
+                from: "defaul",
+                to: "default1",
+                include_lower: "true",
+                include_upper: "true"
+              }
+            }
+          }
+        }
+
+  - length: { hits.hits: 1 }
+
+  # Test regexpQuery
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            regexp: {
+              "field":"d.*"
+            }
+          }
+        }
+
+  - length: { hits.hits: 1 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            regexp: {
+              "field":"d\defau[a-z]?t"
+            }
+          }
+        }
+
+  - length: { hits.hits: 1 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            regexp: {
+              "field":"d\defa[a-z]?t"
+            }
+          }
+        }
+
+  - length: { hits.hits: 0 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            regexp: {
+              "field":"d3efa[a-z]{3,3}"
+            }
+          }
+        }
+
+  - length: { hits.hits: 1 }
+
+  - do:
+      search:
+        index: test1
+        body: {
+          query: {
+            regexp: {
+              "field":"d3efa[a-z]{4,4}"
+            }
+          }
+        }
+
+  - length: { hits.hits: 0 }
+
   # Delete Index when connection is teardown
   - do:
       indices.delete:
-        index: test
+        index: test,test1
diff --git a/server/src/main/java/org/opensearch/index/mapper/ConstantFieldType.java b/server/src/main/java/org/opensearch/index/mapper/ConstantFieldType.java
index 8d4920c554a9c..cc581651e5295 100644
--- a/server/src/main/java/org/opensearch/index/mapper/ConstantFieldType.java
+++ b/server/src/main/java/org/opensearch/index/mapper/ConstantFieldType.java
@@ -76,7 +76,7 @@ public final boolean isAggregatable() {
      */
     protected abstract boolean matches(String pattern, boolean caseInsensitive, QueryShardContext context);
 
-    protected static String valueToString(Object value) {
+    static String valueToString(Object value) {
         return value instanceof BytesRef ? ((BytesRef) value).utf8ToString() : value.toString();
     }