add tests to verify queryFieldNames field in DocLevelQuery

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
eirsep · Feb 19, 2024 · 13c2cb8 · 13c2cb8
1 parent 43edc91
commit 13c2cb8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelQuery.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelQuery.kt
@@ -17,7 +17,7 @@ data class DocLevelQuery(
     val fields: List<String>,
     val query: String,
     val tags: List<String> = mutableListOf(),
-    val queryFieldNames: List<String> = mutableListOf(),
+    val queryFieldNames: List<String> = mutableListOf()
 ) : BaseModel {
 
     init {
@@ -177,7 +177,7 @@ data class DocLevelQuery(
         name: String,
         fields: MutableList<String>,
         query: String,
-        tags: MutableList<String>,
+        tags: MutableList<String>
     ) : this(
         id = id,
         name = name,

diff --git a/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt
@@ -21,6 +21,7 @@ import org.opensearch.commons.alerting.randomWorkflow
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.search.builder.SearchSourceBuilder
+import kotlin.test.assertTrue
 
 class WriteableTests {
 
@@ -132,6 +133,19 @@ class WriteableTests {
         val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
         val newDlq = DocLevelQuery.readFrom(sin)
         Assertions.assertEquals(dlq, newDlq, "Round tripping DocLevelQuery doesn't work")
+        assertTrue(newDlq.queryFieldNames.isEmpty())
+    }
+
+    @Test
+    fun `test doc-level query with query Field Names as stream`() {
+        val dlq = randomDocLevelQuery().copy(queryFieldNames = listOf("f1", "f2"))
+        val out = BytesStreamOutput()
+        dlq.writeTo(out)
+        val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
+        val newDlq = DocLevelQuery.readFrom(sin)
+        assertTrue(newDlq.queryFieldNames.contains(dlq.queryFieldNames[0]))
+        assertTrue(newDlq.queryFieldNames.contains(dlq.queryFieldNames[1]))
+        Assertions.assertEquals(dlq, newDlq, "Round tripping DocLevelQuery doesn't work")
     }
 
     @Test

diff --git a/src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt
@@ -431,6 +431,18 @@ class XContentTests {
         )
     }
 
+    @Test
+    fun `test doc level query toXcontent with query field names`() {
+        val dlq = DocLevelQuery("id", "name", listOf("f1", "f2"), "query", listOf("t1", "t2"), listOf("f1", "f2"))
+        val dlqString = dlq.toXContent(builder(), ToXContent.EMPTY_PARAMS).string()
+        val parsedDlq = DocLevelQuery.parse(parser(dlqString))
+        Assertions.assertEquals(
+            dlq,
+            parsedDlq,
+            "Round tripping Doc level query doesn't work"
+        )
+    }
+
     @Test
     fun `test alert parsing`() {
         val alert = randomAlert()