Merge branch 'development'

Trendyol · Jul 3, 2024 · 4054456 · 4054456
2 parents 77d2172 + ae7c4ca
commit 4054456
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/transmission-test/build.gradle.kts b/transmission-test/build.gradle.kts
@@ -28,7 +28,7 @@ publishing {
         create<MavenPublication>("release") {
             groupId = "com.trendyol"
             artifactId = "transmission-test"
-            version = "1.0.0"
+            version = "1.0.4"
             afterEvaluate {
                 from(components["java"])
             }

diff --git a/transmission-test/src/main/java/com/yigitozgumus/transmissiontesting/StreamExt.kt b/transmission-test/src/main/java/com/yigitozgumus/transmissiontesting/StreamExt.kt
@@ -0,0 +1,11 @@
+package com.yigitozgumus.transmissiontesting
+
+import com.trendyol.transmission.Transmission
+
+inline fun<reified T: Transmission.Data?> List<Transmission.Data>.lastInstanceOf(): T? {
+    return this.filterIsInstance<T>().last()
+}
+
+inline fun<reified T: Transmission.Effect?> List<Transmission.Effect>.lastInstanceOf(): T? {
+    return this.filterIsInstance<T>().last()
+}
diff --git a/transmission-test/src/main/java/com/yigitozgumus/transmissiontesting/TestWithExt.kt b/transmission-test/src/main/java/com/yigitozgumus/transmissiontesting/TestWithExt.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.test.runTest
 
 @OptIn(ExperimentalCoroutinesApi::class)
 fun Transformer.testWithEffect(
+    orderedInitialProcessing: List<Transmission> = emptyList<Transmission>(),
     effect: Transmission.Effect,
     registry: RegistryScope.() -> Unit = {},
     scope: suspend TransformerTestScope.(scope: TestScope) -> Unit
@@ -33,6 +34,14 @@ fun Transformer.testWithEffect(
                 override val dataStream: List<Transmission.Data> = dataStream
                 override val effectStream: List<EffectWrapper> = effectStream
             }
+            orderedInitialProcessing.forEach {
+                when (it) {
+                    is Transmission.Data -> throw IllegalArgumentException("Transmission.Data should not be sent for processing")
+                    is Transmission.Effect -> testRouter.sendEffect(it)
+                    is Transmission.Signal -> testRouter.sendSignal(it)
+                }
+                this@testWithEffect.waitProcessingToFinish()
+            }
             testRouter.sendEffect(effect)
             this@testWithEffect.waitProcessingToFinish()
             testScope.scope(this)
@@ -45,6 +54,7 @@ fun Transformer.testWithEffect(
 
 @OptIn(ExperimentalCoroutinesApi::class)
 fun Transformer.testWithSignal(
+    orderedInitialProcessing: List<Transmission> = emptyList<Transmission>(),
     signal: Transmission.Signal,
     registry: RegistryScope.() -> Unit = {},
     scope: suspend TransformerTestScope.(scope: TestScope) -> Unit
@@ -65,6 +75,14 @@ fun Transformer.testWithSignal(
                 override val dataStream: List<Transmission.Data> = dataStream
                 override val effectStream: List<EffectWrapper> = effectStream
             }
+            orderedInitialProcessing.forEach {
+                when (it) {
+                    is Transmission.Data -> throw IllegalArgumentException("Transmission.Data should not be sent for processing")
+                    is Transmission.Effect -> testRouter.sendEffect(it)
+                    is Transmission.Signal -> testRouter.sendSignal(it)
+                }
+                this@testWithSignal.waitProcessingToFinish()
+            }
             testRouter.sendSignal(signal)
             this@testWithSignal.waitProcessingToFinish()
             testScope.scope(this)

diff --git a/transmission/build.gradle.kts b/transmission/build.gradle.kts
@@ -27,7 +27,7 @@ publishing {
         create<MavenPublication>("release") {
             groupId = "com.trendyol"
             artifactId = "transmission"
-            version = "1.0.0"
+            version = "1.0.4"
             afterEvaluate {
                 from(components["java"])
             }