From f009e0c665f18b0e053bc78cd0bd8dd566ee9326 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 19 Apr 2017 05:38:45 +0300
Subject: [PATCH] kotlin-test: Make 'todo { }' function common

---
 .../common/src/main/kotlin/kotlin/test/AssertionsH.kt      | 7 +++++++
 libraries/kotlin.test/js/src/main/kotlin/JsImpl.kt         | 2 +-
 .../kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 libraries/kotlin.test/common/src/main/kotlin/kotlin/test/AssertionsH.kt

diff --git a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/AssertionsH.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/AssertionsH.kt
new file mode 100644
index 00000000000..4ac7e787d4c
--- /dev/null
+++ b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/AssertionsH.kt
@@ -0,0 +1,7 @@
+package kotlin.test
+
+/**
+ * Comments out a block of test code until it is implemented while keeping a link to the code
+ * to implement in your unit test output
+ */
+header fun todo(block: () -> Unit)
\ No newline at end of file
diff --git a/libraries/kotlin.test/js/src/main/kotlin/JsImpl.kt b/libraries/kotlin.test/js/src/main/kotlin/JsImpl.kt
index 192115d9c46..f0258e508be 100644
--- a/libraries/kotlin.test/js/src/main/kotlin/JsImpl.kt
+++ b/libraries/kotlin.test/js/src/main/kotlin/JsImpl.kt
@@ -20,7 +20,7 @@ package kotlin.test
  * Comments out a block of test code until it is implemented while keeping a link to the code
  * to implement in your unit test output
  */
-fun todo(block: () -> Any) {
+impl fun todo(block: () -> Unit) {
     // println("TODO at " + (Exception() as java.lang.Throwable).getStackTrace()?.get(1) + " for " + block)
     println("TODO at " + block)
 }
diff --git a/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt b/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt
index 8834da445a6..32f07aacfba 100644
--- a/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt
+++ b/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt
@@ -60,7 +60,7 @@ inline fun <reified T : Throwable> assertFailsWith(message: String? = null, noin
  * to implement in your unit test output
  */
 @InlineOnly
-inline fun todo(@Suppress("UNUSED_PARAMETER") block: () -> Unit) {
+impl inline fun todo(@Suppress("UNUSED_PARAMETER") block: () -> Unit) {
     System.out.println("TODO at " + currentStackTrace()[0])
 }