Merge pull request #227 from modelix/bugfix/MODELIX-528_fix_isEmpty

languitar · web-flow · commit cc40e83d3fca · 2023-09-04T13:38:41.000+02:00
fix(modelql): let isEmpty return true on empty inputs
diff --git a/modelql-client/src/jvmTest/kotlin/org/modelix/modelql/client/HtmlBuilderTest.kt b/modelql-client/src/jvmTest/kotlin/org/modelix/modelql/client/HtmlBuilderTest.kt
@@ -175,7 +175,7 @@ class HtmlBuilderTest {
                 }
             }
         }
-        val expected = """<html><body><ul><li>null<ul><li>abc<ul><li>model1a<ul></ul></li><li>model1b<ul></ul></li></ul></li></ul></li></ul></body></html>"""
+        val expected = """<html><body><ul><li>null<ul><li>abc<ul><li>model1a</li><li>model1b</li></ul></li></ul></li></ul></body></html>"""
         assertEquals(expected, actual)
     }
 }
diff --git a/modelql-core/src/commonMain/kotlin/org/modelix/modelql/core/IsEmptyStep.kt b/modelql-core/src/commonMain/kotlin/org/modelix/modelql/core/IsEmptyStep.kt
@@ -25,7 +25,7 @@ import kotlinx.serialization.serializer
 
 class IsEmptyStep() : AggregationStep<Any?, Boolean>() {
     override suspend fun aggregate(input: StepFlow<Any?>): IStepOutput<Boolean> {
-        return input.take(1).map { false }.onEmpty { emit(false) }.single().asStepOutput(this)
+        return input.take(1).map { false }.onEmpty { emit(true) }.single().asStepOutput(this)
     }
 
     override fun aggregate(input: Sequence<IStepOutput<Any?>>): IStepOutput<Boolean> = input.none().asStepOutput(this)
diff --git a/modelql-core/src/commonTest/kotlin/org/modelix/modelql/core/ModelQLTest.kt b/modelql-core/src/commonTest/kotlin/org/modelix/modelql/core/ModelQLTest.kt
@@ -151,6 +151,14 @@ class ModelQLTest {
         assertEquals("alternative", result)
     }
 
+    @Test
+    fun testIsEmpty() = runTestWithTimeout {
+        val result: Boolean = remoteProductDatabaseQuery { db ->
+            db.products.filter { it.id.equalTo(-1) }.isEmpty()
+        }
+        assertTrue(result)
+    }
+
     @Test
     fun test2() = runTestWithTimeout {
         val result: List<String> = remoteProductDatabaseQuery { db ->

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ class HtmlBuilderTest {`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`}`
`178`		`- val expected = """<html><body><ul><li>null<ul><li>abc<ul><li>model1a<ul></ul></li><li>model1b<ul></ul></li></ul></li></ul></li></ul></body></html>"""`
	`178`	`+ val expected = """<html><body><ul><li>null<ul><li>abc<ul><li>model1a</li><li>model1b</li></ul></li></ul></li></ul></body></html>"""`
`179`	`179`	`assertEquals(expected, actual)`
`180`	`180`	`}`
`181`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import kotlinx.serialization.serializer`
`25`	`25`
`26`	`26`	`class IsEmptyStep() : AggregationStep<Any?, Boolean>() {`
`27`	`27`	`override suspend fun aggregate(input: StepFlow<Any?>): IStepOutput<Boolean> {`
`28`		`- return input.take(1).map { false }.onEmpty { emit(false) }.single().asStepOutput(this)`
	`28`	`+ return input.take(1).map { false }.onEmpty { emit(true) }.single().asStepOutput(this)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`override fun aggregate(input: Sequence<IStepOutput<Any?>>): IStepOutput<Boolean> = input.none().asStepOutput(this)`