Fix tests

Signed-off-by: Chase Engelbrecht <[email protected]>
engechas · Mar 13, 2024 · adb6e61 · adb6e61
1 parent 38fe638
commit adb6e61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 34 deletions.
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt
@@ -10,6 +10,7 @@ import org.opensearch.commons.alerting.model.action.Throttle
 import org.opensearch.commons.alerting.randomAction
 import org.opensearch.commons.alerting.randomActionExecutionPolicy
 import org.opensearch.commons.alerting.randomBucketLevelTrigger
+import org.opensearch.commons.alerting.randomDocLevelQuery
 import org.opensearch.commons.alerting.randomDocumentLevelTrigger
 import org.opensearch.commons.alerting.randomQueryLevelMonitor
 import org.opensearch.commons.alerting.randomQueryLevelTrigger
@@ -112,17 +113,6 @@ class WriteableTests {
         Assertions.assertEquals(trigger, newTrigger, "Round tripping DocumentLevelTrigger doesn't work")
     }
 
-    @Test
-    fun `test doc-level query as stream`() {
-        val dlq = randomDocLevelQuery()
-        val out = BytesStreamOutput()
-        dlq.writeTo(out)
-        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"))
@@ -135,16 +125,6 @@ class WriteableTests {
         Assertions.assertEquals(dlq, newDlq, "Round tripping DocLevelQuery doesn't work")
     }
 
-    @Test
-    fun `test chained alert trigger as stream`() {
-        val trigger = randomChainedAlertTrigger()
-        val out = BytesStreamOutput()
-        trigger.writeTo(out)
-        val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
-        val newTrigger = ChainedAlertTrigger.readFrom(sin)
-        Assertions.assertEquals(trigger, newTrigger, "Round tripping DocumentLevelTrigger doesn't work")
-    }
-
     @Test
     fun `test searchinput as stream`() {
         val input = SearchInput(emptyList(), SearchSourceBuilder())

diff --git a/src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt
@@ -347,21 +347,9 @@ class XContentTests {
         )
     }
 
-    @Test
-    fun `test doc level query toXcontent`() {
-        val dlq = DocLevelQuery("id", "name", listOf("f1", "f2"), "query", listOf("t1", "t2"))
-        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 doc level query toXcontent with query field names`() {
-        val dlq = DocLevelQuery("id", "name", listOf("f1", "f2"), "query", listOf("t1", "t2"), listOf("f1", "f2"))
+        val dlq = DocLevelQuery("id", "name", "query", listOf("t1", "t2"), listOf("f1", "f2"))
         val dlqString = dlq.toXContent(builder(), ToXContent.EMPTY_PARAMS).string()
         val parsedDlq = DocLevelQuery.parse(parser(dlqString))
         Assertions.assertEquals(