Merge dev

6 files changed, 155 insertions, 77 deletions

diff --git a/core/src/test/kotlin/ca/allanwang/kau/kotlin/CoroutineTest.kt b/core/src/test/kotlin/ca/allanwang/kau/kotlin/CoroutineTest.kt
new file mode 100644
index 0000000..1e86305
--- /dev/null
+++ b/core/src/test/kotlin/ca/allanwang/kau/kotlin/CoroutineTest.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2019 Allan Wang
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ca.allanwang.kau.kotlin
+
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.fail
+
+/**
+ * Tests geared towards coroutines
+ */
+class CoroutineTest {
+
+    /**
+     * If a job is cancelled, then a switch to a new context will not run
+     */
+    @Test
+    fun implicitCancellationBefore() {
+        val job = Job()
+        var id = 0
+        try {
+            runBlocking(job) {
+                id++
+                job.cancel()
+                withContext(Dispatchers.IO) {
+                    fail("Context switch should not be reached")
+                }
+            }
+        } catch (ignore: CancellationException) {
+        } finally {
+            assertEquals(1, id, "Launcher never executed")
+        }
+    }
+
+    /**
+     * If a job is cancelled, then a switch from a new context will not run
+     */
+    @Test
+    fun implicitCancellationAfter() {
+        val job = Job()
+        var id = 0
+        try {
+            runBlocking(job) {
+                withContext(Dispatchers.IO) {
+                    id++
+                    job.cancel()
+                }
+                fail("Post context switch should not be reached")
+            }
+        } catch (ignore: CancellationException) {
+        } finally {
+            assertEquals(1, id, "Context switch never executed")
+        }
+    }
+}
diff --git a/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt b/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt
index 8ccdab3..c406901 100644
--- a/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt
+++ b/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ca.allanwang.kau.kotlin
 
 import org.junit.Test
@@ -48,5 +63,4 @@ class DebounceTest {
         Thread.sleep(30)
         assertEquals(10, i)
     }
-
-}
\ No newline at end of file
+}
diff --git a/core/src/test/kotlin/ca/allanwang/kau/kotlin/LazyResettableTest.kt b/core/src/test/kotlin/ca/allanwang/kau/kotlin/LazyResettableTest.kt
index 2025422..eaaaacb 100644
--- a/core/src/test/kotlin/ca/allanwang/kau/kotlin/LazyResettableTest.kt
+++ b/core/src/test/kotlin/ca/allanwang/kau/kotlin/LazyResettableTest.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ca.allanwang.kau.kotlin
 
 import org.junit.Before
@@ -33,5 +48,4 @@ class LazyResettableTest {
         assertEquals(t1, t2, "Lazy resettable not returning same value after second call")
         assertNotEquals(t1, t3, "Lazy resettable not invalidated by registry")
     }
-
-}
\ No newline at end of file
+}
diff --git a/core/src/test/kotlin/ca/allanwang/kau/kotlin/StreamsTest.kt b/core/src/test/kotlin/ca/allanwang/kau/kotlin/StreamsTest.kt
index 1c40f57..4dc4a34 100644
--- a/core/src/test/kotlin/ca/allanwang/kau/kotlin/StreamsTest.kt
+++ b/core/src/test/kotlin/ca/allanwang/kau/kotlin/StreamsTest.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ca.allanwang.kau.kotlin
 
 import org.junit.Test
@@ -38,5 +53,4 @@ class StreamsTest {
         items.kauRemoveIf { it == thePotato } //removal by equality
         assertEquals(result.size - 1, items.size, "Invalid list removal based on equality")
     }
-
-}
\ No newline at end of file
+}
diff --git a/core/src/test/kotlin/ca/allanwang/kau/kotlin/ZipTest.kt b/core/src/test/kotlin/ca/allanwang/kau/kotlin/ZipTest.kt
deleted file mode 100644
index 7eeffaf..0000000
--- a/core/src/test/kotlin/ca/allanwang/kau/kotlin/ZipTest.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package ca.allanwang.kau.kotlin
-
-import org.jetbrains.anko.doAsync
-import org.junit.Test
-import java.util.*
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-import kotlin.test.assertTrue
-
-/**
- * Created by Allan Wang on 2017-08-06.
- */
-class ZipTest {
-
-    val debug = false
-
-    fun p(text: String) {
-        if (debug) println(text)
-    }
-
-    @Test
-    fun basic() {
-        val start = System.currentTimeMillis()
-        val latch = CountDownLatch(1)
-        val rnd = Random()
-        (0..10).map {
-            { callback: ZipCallback<Int> ->
-                doAsync {
-                    val sleepTime = rnd.nextInt(100) + 200L
-                    p("Task $it will sleep for ${sleepTime}ms")
-                    Thread.sleep(sleepTime)
-                    val finish = System.currentTimeMillis()
-                    p("Task $it finished in ${finish - start}ms at $finish")
-                    callback(it)
-                }; Unit
-            }
-        }.zip(-1) { results ->
-            val finish = System.currentTimeMillis()
-            println("Results ${results.contentToString()} received in ${finish - start}ms at $finish")
-            assertTrue((0..10).toList().toTypedArray().contentEquals(results), "Basic zip results do not match")
-            assertTrue(finish - start < 1000L, "Basic zip does not seem to be running asynchronously")
-            latch.countDown()
-
-        }
-        latch.await(1100, TimeUnit.MILLISECONDS)
-    }
-
-    @Test
-    fun basicAsync() {
-        val start = System.currentTimeMillis()
-        val latch = CountDownLatch(1)
-        val rnd = Random()
-        (0..10).map {
-            {
-                val sleepTime = rnd.nextInt(100) + 200L
-                p("Task $it will sleep for ${sleepTime}ms")
-                Thread.sleep(sleepTime)
-                val finish = System.currentTimeMillis()
-                p("Task $it finished in ${finish - start}ms at $finish")
-            }
-        }.zipAsync {
-            val finish = System.currentTimeMillis()
-            println("Results received in ${finish - start}ms at $finish")
-            assertTrue(finish - start < 1000L, "BasicAsync does not seem to be wrapping the tasks asynchronously")
-            latch.countDown()
-        }
-        latch.await(1100, TimeUnit.MILLISECONDS)
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/test/kotlin/ca/allanwang/kau/utils/UtilsTest.kt b/core/src/test/kotlin/ca/allanwang/kau/utils/UtilsTest.kt
index ce2b757..b9c200a 100644
--- a/core/src/test/kotlin/ca/allanwang/kau/utils/UtilsTest.kt
+++ b/core/src/test/kotlin/ca/allanwang/kau/utils/UtilsTest.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ca.allanwang.kau.utils
 
 import android.graphics.Color
@@ -17,9 +32,27 @@ class UtilsTest {
     }
 
     @Test
+    fun colorWithAlpha() {
+        val origColor = 0xFF123456.toInt()
+        assertEquals(0x00123456, origColor.withAlpha(0), "Failed to convert with alpha 0")
+        assertEquals(0x50123456, origColor.withAlpha(80), "Failed to convert with alpha 80")
+        assertEquals(0xFF123456.toInt(), origColor.withAlpha(255), "Failed to convert with alpha 255")
+        assertEquals(0xFF123456.toInt(), origColor.withAlpha(0xFF), "Failed to convert with alpha 0xFF")
+        assertEquals(Color.TRANSPARENT, Color.BLACK.withAlpha(0), "Failed to convert black to transparent")
+    }
+
+    @Test
+    fun colorWithMinAlpha() {
+        val origColor = 0x80123456.toInt()
+        assertEquals(origColor, origColor.withMinAlpha(0), "Failed to convert with min alpha 0")
+        assertEquals(0xFA123456.toInt(), origColor.withMinAlpha(0xFA), "Failed to convert with min alpha 0xFA")
+        assertEquals(Color.BLUE, Color.BLUE.withMinAlpha(89), "Failed to convert blue with min alpha 89")
+    }
+
+    @Test
     fun rounding() {
         assertEquals("1.23", 1.23456f.round(2))
         assertEquals("22.466", 22.465920439.round(3))
         assertEquals("22", 22f.round(3))
     }
-}
\ No newline at end of file
+}