From a97e623d047120856737bc1e6ba67aff73e362ab Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Fri, 18 Dec 2015 16:25:58 +0300 Subject: [PATCH] kotlin-test: binary compatibility for fail function --- .../junit/src/test/kotlin/JUnitContributorTest.kt | 2 +- .../src/main/kotlin.jvm/kotlin/test/TestAssertionsJVM.kt | 2 +- .../shared/src/main/kotlin/kotlin/test/TestAssertions.kt | 2 +- libraries/stdlib/src/kotlin/TestAssertionsJVM.kt | 8 ++++++++ 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 libraries/stdlib/src/kotlin/TestAssertionsJVM.kt diff --git a/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt b/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt index a9c04819ed6..12280f5e283 100644 --- a/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt +++ b/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt @@ -23,5 +23,5 @@ class JUnitContributorTest { @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN") private val asserter: java.lang.Object - get() = Class.forName("kotlin.test.TestAssertionsKt").getMethod("getAsserter").invoke(null) as java.lang.Object + get() = Class.forName("kotlin.test.AssertionsKt").getMethod("getAsserter").invoke(null) as java.lang.Object } diff --git a/libraries/kotlin.test/shared/src/main/kotlin.jvm/kotlin/test/TestAssertionsJVM.kt b/libraries/kotlin.test/shared/src/main/kotlin.jvm/kotlin/test/TestAssertionsJVM.kt index 6af15cab26b..df406968306 100644 --- a/libraries/kotlin.test/shared/src/main/kotlin.jvm/kotlin/test/TestAssertionsJVM.kt +++ b/libraries/kotlin.test/shared/src/main/kotlin.jvm/kotlin/test/TestAssertionsJVM.kt @@ -1,5 +1,5 @@ @file:kotlin.jvm.JvmMultifileClass -@file:kotlin.jvm.JvmName("TestAssertionsKt") +@file:kotlin.jvm.JvmName("AssertionsKt") package kotlin.test import kotlin.reflect.* diff --git a/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/TestAssertions.kt b/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/TestAssertions.kt index ec80b4240f6..635b3a4395f 100644 --- a/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/TestAssertions.kt +++ b/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/TestAssertions.kt @@ -1,5 +1,5 @@ @file:kotlin.jvm.JvmMultifileClass -@file:kotlin.jvm.JvmName("TestAssertionsKt") +@file:kotlin.jvm.JvmName("AssertionsKt") /** * A number of helper methods for writing unit tests. diff --git a/libraries/stdlib/src/kotlin/TestAssertionsJVM.kt b/libraries/stdlib/src/kotlin/TestAssertionsJVM.kt new file mode 100644 index 00000000000..ec8182349e6 --- /dev/null +++ b/libraries/stdlib/src/kotlin/TestAssertionsJVM.kt @@ -0,0 +1,8 @@ +@file:kotlin.jvm.JvmMultifileClass +@file:kotlin.jvm.JvmName("TestAssertionsKt") +package kotlin.test + +@Deprecated("For binary compatibility here.", level = DeprecationLevel.HIDDEN) +fun fail(message: String? = null) { + throw AssertionError(message ?: "") +}