commit 12e92e97f65f31e1f6ac7baeb7d60cf3b5cbc5d5
author Roman Elizarov <elizarov@gmail.com> Thu Apr 05 11:12:01 2018 +0300
committer Roman Elizarov <elizarov@gmail.com> Thu Apr 05 11:12:01 2018 +0300
tree 5db6c9091c18af97ab986c0fad8c3851f445cecc
parent fa0adc03d2a19aaa3df441d824a996f1fde7af36

MPP: All tests are passing for both JS & Native

atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeIntBitsTest.kt

diff --git a/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeIntBitsTest.kt b/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeIntBitsTest.kt
index d71a1f4..d21c3b9 100644
--- a/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeIntBitsTest.kt
+++ b/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeIntBitsTest.kt
@@ -21,7 +21,6 @@
 
 class LockFreeIntBitsTest {
     @Test
-    @Ignore // todo: https://youtrack.jetbrains.com/issue/KT-23582
     fun testBasic() {
         val bs = LockFreeIntBits()
         check(!bs[0])

atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeQueueTest.kt

diff --git a/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeQueueTest.kt b/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeQueueTest.kt
index 86a4639..2b356c9 100644
--- a/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeQueueTest.kt
+++ b/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeQueueTest.kt
@@ -21,7 +21,6 @@
 
 class LockFreeQueueTest {
     @Test
-    @Ignore // todo: https://youtrack.jetbrains.com/issue/KT-23582
     fun testBasic() {
         val q = LockFreeQueue()
         check(q.dequeue() == -1)

atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeStackTest.kt

diff --git a/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeStackTest.kt b/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeStackTest.kt
index f6e0225..aeeee00 100644
--- a/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeStackTest.kt
+++ b/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/LockFreeStackTest.kt
@@ -21,7 +21,6 @@
 
 class LockFreeStackTest {
     @Test
-    @Ignore // todo: https://youtrack.jetbrains.com/issue/KT-23582
     fun testClear() {
         val s = LockFreeStack<String>()
         check(s.isEmpty())
@@ -32,7 +31,6 @@
     }
 
     @Test
-    @Ignore // todo: https://youtrack.jetbrains.com/issue/KT-23582
     fun testPushPopLoop() {
         val s = LockFreeStack<String>()
         check(s.isEmpty())

atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/SimpleLockTest.kt

diff --git a/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/SimpleLockTest.kt b/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/SimpleLockTest.kt
index 21fd7d4..dd45816 100644
--- a/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/SimpleLockTest.kt
+++ b/atomicfu-common/src/test/kotlin/kotlinx/atomicfu/test/SimpleLockTest.kt
@@ -21,7 +21,6 @@
 
 class SimpleLockTest {
     @Test
-    @Ignore // todo: https://youtrack.jetbrains.com/issue/KT-23582
     fun withLock() {
         val lock = SimpleLock()
         val result = lock.withLock {

atomicfu-js/build.gradle

diff --git a/atomicfu-js/build.gradle b/atomicfu-js/build.gradle
index 2cf40ba..d4490ba 100644
--- a/atomicfu-js/build.gradle
+++ b/atomicfu-js/build.gradle
@@ -13,7 +13,13 @@
         moduleKind = "umd"
         sourceMap = true
         metaInfo = true
-        // drop -js suffix from outputFile
+    }
+}
+
+compileKotlin2Js {
+    kotlinOptions {
+        // drop -js suffix from main outputFile, but don't do it for tests
+        // see https://youtrack.jetbrains.com/issue/KT-23582
         def baseName = project.name - "-js"
         outputFile = new File(outputFile.parent, baseName + ".js")
     }

atomicfu-native/build.gradle

diff --git a/atomicfu-native/build.gradle b/atomicfu-native/build.gradle
index caba0d4..2e7c51a 100644
--- a/atomicfu-native/build.gradle
+++ b/atomicfu-native/build.gradle
@@ -10,7 +10,7 @@
             srcDir 'src/test/kotlin'
             commonSourceSet 'test'
             libraries {
-                artifact 'atomicfu'
+                artifact 'atomicfu_native'
             }
             extraOpts '-tr'
         }