fix(modelql): assertNotEmpty should throw an IllegalArgumentException

Author: slisson

modelql-core/src/commonTest/kotlin/org/modelix/modelql/core/ModelQLTest.kt

@@ -29,6 +29,7 @@ import kotlinx.serialization.modules.subclass
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
 import kotlin.time.Duration.Companion.seconds
 
@@ -367,6 +368,15 @@ class ModelQLTest {
         assertEquals(listOf("iPhone 9", "iPhone X", "Samsung Universe 9", "OPPOF19", "Huawei P30"), result)
     }
 
+    @Test
+    fun assertNotEmpty_throws_IllegalArgumentException() = runTestWithTimeout {
+        assertFailsWith(IllegalArgumentException::class) {
+            remoteProductDatabaseQuery<List<String>> { db ->
+                db.products.filter { false.asMono() }.assertNotEmpty().map { it.title }.toList()
+            }
+        }
+    }
+
     data class MyNonSerializableClass(val id: Int, val title: String, val images: List<MyImage>)
     data class MyImage(val url: String)
 }

streams/src/commonMain/kotlin/org/modelix/streams/StreamExtensions.kt

@@ -67,17 +67,17 @@ fun <T> Observable<T>.withIndex(): Observable<IndexedValue<T>> {
     return map { IndexedValue(index++, it) }
 }
 fun <T> Observable<T>.assertNotEmpty(message: () -> String): Observable<T> {
-    return this.switchIfEmpty { throw RuntimeException("Empty stream: " + message()) }
+    return this.switchIfEmpty { throw IllegalArgumentException("At least one element was expected. " + message()) }
 }
 fun <T> Maybe<T>.assertEmpty(message: (T) -> String): Completable {
-    return map { throw RuntimeException(message(it)) }.asCompletable()
+    return map { throw IllegalArgumentException(message(it)) }.asCompletable()
 }
 fun <T> Observable<T>.assertEmpty(message: (T) -> String): Completable {
-    return map { throw RuntimeException(message(it)) }.asCompletable()
+    return map { throw IllegalArgumentException(message(it)) }.asCompletable()
 }
 fun <T> Single<T>.cached(): Single<T> {
     return this.asObservable().replay(1).autoConnect()
-        .firstOrError { RuntimeException("Single was empty. Should not happen.") }
+        .firstOrError { IllegalStateException("Single was empty. Should not happen.") }
 }
 
 fun <T> Maybe<T>.orNull(): Single<T?> = defaultIfEmpty(null)