stopped mixing concurrent and single-threaded properties in tests — i…

…t requires an Executor
Miha-x64 · Feb 26, 2019 · b5650eb · b5650eb
1 parent 4c962ad
commit b5650eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/properties/src/test/kotlin/net/aquadc/properties/CommonTest.kt b/properties/src/test/kotlin/net/aquadc/properties/CommonTest.kt
@@ -21,8 +21,8 @@ class CommonTest {
     private val controlledCProps = listOf(
             cmp,
             cmp.map { "text: $it" },
-            cmp.mapWith(propertyOf("")) { a, b -> a + b },
-            listOf(cmp, propertyOf(""), propertyOf(""))
+            cmp.mapWith(concurrentPropertyOf("")) { a, b -> a + b },
+            listOf(cmp, concurrentPropertyOf(""), concurrentPropertyOf(""))
                     .mapValueList { vals -> vals.joinToString() }
     )
 

diff --git a/properties/src/test/kotlin/net/aquadc/properties/ContenededSubscription.kt b/properties/src/test/kotlin/net/aquadc/properties/ContenededSubscription.kt
@@ -89,7 +89,7 @@ class ContenededSubscription {
             observedState(propertyOf(0, conc)) { p, m -> p.map(m) }
 
     private fun biObservedState(conc: Boolean) =
-            observedState(propertyOf(0, conc)) { p, m -> p.mapWith(propertyOf(-1)) { v, _ -> m(v) } }
+            observedState(propertyOf(0, conc)) { p, m -> p.mapWith(propertyOf(-1, conc)) { v, _ -> m(v) } }
 
     private fun listObservedState(conc: Boolean) =
             observedState(propertyOf(0, conc)) { p, m -> listOf(p).mapValueList { m(it[0]) } }