From a5b098c4a70727feaacfe36feb5c27bbeea32b36 Mon Sep 17 00:00:00 2001
From: Sergey Mashkov <sergey.mashkov@jetbrains.com>
Date: Wed, 25 Nov 2015 17:27:30 +0300
Subject: [PATCH] kotlin.test: Rename jvm module to junit

---
 .idea/libraries/kotlin_test.xml               | 13 +++++++
 build.xml                                     | 35 +++++++++++++++++--
 .../browser-example-with-library/pom.xml      |  2 +-
 libraries/examples/browser-example/pom.xml    |  2 +-
 libraries/kotlin.test/{jvm => junit}/pom.xml  |  3 +-
 .../{jvm => junit}/src/assembly/sources.xml   |  0
 .../src/main/kotlin/JUnitSupport.kt           |  0
 .../services/kotlin.test.AsserterContributor  |  0
 .../src/test/kotlin/JUnitContributorTest.kt   |  0
 libraries/kotlin.test/pom.xml                 |  2 +-
 libraries/kotlin.test/shared/pom.xml          |  1 +
 .../kotlin/test/TestAssertionsJVM.kt          | 11 ++++--
 .../main/kotlin/kotlin/test/TestAssertions.kt | 10 ------
 .../src/main/kotlin/kotlin/test/Utils.kt      |  4 +++
 .../test/kotlin.jvm/BasicAssertionsJVMTest.kt |  7 ++++
 libraries/stdlib/pom.xml                      |  2 +-
 libraries/tools/kotlin-js-tests-junit/pom.xml |  2 +-
 17 files changed, 73 insertions(+), 21 deletions(-)
 create mode 100644 .idea/libraries/kotlin_test.xml
 rename libraries/kotlin.test/{jvm => junit}/pom.xml (97%)
 rename libraries/kotlin.test/{jvm => junit}/src/assembly/sources.xml (100%)
 rename libraries/kotlin.test/{jvm => junit}/src/main/kotlin/JUnitSupport.kt (100%)
 rename libraries/kotlin.test/{jvm => junit}/src/main/resources/META-INF/services/kotlin.test.AsserterContributor (100%)
 rename libraries/kotlin.test/{jvm => junit}/src/test/kotlin/JUnitContributorTest.kt (100%)
 create mode 100644 libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/Utils.kt

diff --git a/.idea/libraries/kotlin_test.xml b/.idea/libraries/kotlin_test.xml
new file mode 100644
index 00000000000..2462725960c
--- /dev/null
+++ b/.idea/libraries/kotlin_test.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="kotlin-test">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-test.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$PROJECT_DIR$/libraries/kotlin.test/shared/src/main/kotlin" />
+      <root url="file://$PROJECT_DIR$/libraries/kotlin.test/shared/src/main/kotlin.jvm" />
+      <root url="file://$PROJECT_DIR$/libraries/kotlin.test/junit/src/main/kotlin" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index fdf60fb012b..0398f1ce792 100644
--- a/build.xml
+++ b/build.xml
@@ -12,6 +12,7 @@
     <property name="bootstrap.compiler.home" value="${bootstrap.home}/Kotlin/kotlinc"/>
     <property name="bootstrap.runtime" value="${bootstrap.compiler.home}/lib/kotlin-runtime.jar"/>
     <property name="bootstrap.reflect" value="${bootstrap.compiler.home}/lib/kotlin-reflect.jar"/>
+    <property name="bootstrap.kotlin.test" value="${bootstrap.compiler.home}/lib/kotlin-test.jar" />
 
     <property name="output" value="${basedir}/dist"/>
     <property name="js.stdlib.output.dir" value="${output}/js"/>
@@ -56,6 +57,7 @@
 
     <path id="classpath">
         <file file="${bootstrap.runtime}"/>
+        <file file="${bootstrap.kotlin.test}" />
         <file file="${bootstrap.reflect}"/>
         <fileset dir="${idea.sdk}" includes="core/*.jar"/>
         <pathelement location="${protobuf.jar}"/>
@@ -178,16 +180,23 @@
         <sequential if:true="${bootstrap.or.local.build}">
             <copy file="${bootstrap.runtime}" tofile="${kotlin-home}/lib/kotlin-runtime-internal-bootstrap.jar"/>
             <copy file="${bootstrap.reflect}" tofile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar"/>
+            <copy file="${bootstrap.kotlin.test}" tofile="${kotlin-home}/lib/kotlin-test-internal-bootstrap.jar" failonerror="false"/>
             <jar destfile="${kotlin-home}/lib/kotlin-reflect-internal-bootstrap.jar" update="true">
                 <manifest>
                     <attribute name="Class-Path" value="kotlin-runtime-internal-bootstrap.jar"/>
                 </manifest>
             </jar>
+            <jar destfile="${kotlin-home}/lib/kotlin-test-internal-bootstrap.jar" update="true">
+                <manifest>
+                    <attribute name="Class-Path" value="kotlin-runtime-internal-bootstrap.jar"/>
+                </manifest>
+            </jar>
         </sequential>
 
         <sequential unless:true="${bootstrap.or.local.build}">
             <copy file="${bootstrap.runtime}" todir="${kotlin-home}/lib"/>
             <copy file="${bootstrap.reflect}" todir="${kotlin-home}/lib"/>
+            <copy file="${bootstrap.kotlin.test}" todir="${kotlin-home}/lib"/>
         </sequential>
     </target>
 
@@ -792,6 +801,20 @@
         </new-kotlinc>
     </target>
 
+    <target name="kotlin.test">
+        <new-kotlinc output="${output}/classes/kotlin.test" moduleName="kotlin-test">
+            <src>
+                <include name="libraries/kotlin.test/shared/src/main/kotlin" />
+                <include name="libraries/kotlin.test/shared/src/main/kotlin.jvm" />
+                <include name="libraries/kotlin.test/junit/src/main/kotlin" />
+            </src>
+            <class-path>
+                <pathelement path="${output}/classes/builtins"/>
+                <pathelement path="libraries/lib/junit-4.11.jar"/>
+            </class-path>
+        </new-kotlinc>
+    </target>
+
     <target name="core">
         <new-kotlinc output="${output}/classes/core" moduleName="kotlin-core">
             <src>
@@ -936,15 +959,23 @@
         </pack-runtime-jar>
     </target>
 
+    <target name="pack-kotlin-test">
+        <pack-runtime-jar jar-name="kotlin-test.jar" implementation-title="${manifest.impl.title.kotlin.test}">
+            <jar-content>
+                <fileset dir="${output}/classes/kotlin.test" includes="**/*"/>
+            </jar-content>
+        </pack-runtime-jar>
+    </target>
+
     <target name="runtime"
             depends="builtins,stdlib,core,reflection,pack-runtime,pack-runtime-sources"/>
 
     <target name="dist"
-            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin,daemon-client"
+            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin.test,pack-kotlin-test,kotlin-js-stdlib,android-compiler-plugin,daemon-client"
             description="Builds redistributables from sources"/>
 
     <target name="dist-quick"
-            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin"
+            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin.test,pack-kotlin-test,kotlin-js-stdlib,android-compiler-plugin"
             description="Builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc"/>
 
     <target name="dist-quick-compiler-only"
diff --git a/libraries/examples/browser-example-with-library/pom.xml b/libraries/examples/browser-example-with-library/pom.xml
index 9711598e1f6..ff51059bd77 100644
--- a/libraries/examples/browser-example-with-library/pom.xml
+++ b/libraries/examples/browser-example-with-library/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
         	<groupId>org.jetbrains.kotlin</groupId>
-        	<artifactId>kotlin.test.jvm</artifactId>
+        	<artifactId>kotlin.test.junit</artifactId>
         	<version>${project.version}</version>
         	<scope>test</scope>
         </dependency>
diff --git a/libraries/examples/browser-example/pom.xml b/libraries/examples/browser-example/pom.xml
index 0e307f4a03c..853e6982bbb 100644
--- a/libraries/examples/browser-example/pom.xml
+++ b/libraries/examples/browser-example/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
         	<groupId>org.jetbrains.kotlin</groupId>
-        	<artifactId>kotlin.test.jvm</artifactId>
+        	<artifactId>kotlin.test.junit</artifactId>
         	<version>${project.version}</version>
         	<scope>test</scope>
         </dependency>
diff --git a/libraries/kotlin.test/jvm/pom.xml b/libraries/kotlin.test/junit/pom.xml
similarity index 97%
rename from libraries/kotlin.test/jvm/pom.xml
rename to libraries/kotlin.test/junit/pom.xml
index 193b8736020..1c28cdff83f 100644
--- a/libraries/kotlin.test/jvm/pom.xml
+++ b/libraries/kotlin.test/junit/pom.xml
@@ -7,13 +7,14 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>kotlin.test.jvm</artifactId>
+    <artifactId>kotlin.test.junit</artifactId>
 
     <dependencies>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>(4,5)</version>
+            <optional>true</optional>
 		</dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
diff --git a/libraries/kotlin.test/jvm/src/assembly/sources.xml b/libraries/kotlin.test/junit/src/assembly/sources.xml
similarity index 100%
rename from libraries/kotlin.test/jvm/src/assembly/sources.xml
rename to libraries/kotlin.test/junit/src/assembly/sources.xml
diff --git a/libraries/kotlin.test/jvm/src/main/kotlin/JUnitSupport.kt b/libraries/kotlin.test/junit/src/main/kotlin/JUnitSupport.kt
similarity index 100%
rename from libraries/kotlin.test/jvm/src/main/kotlin/JUnitSupport.kt
rename to libraries/kotlin.test/junit/src/main/kotlin/JUnitSupport.kt
diff --git a/libraries/kotlin.test/jvm/src/main/resources/META-INF/services/kotlin.test.AsserterContributor b/libraries/kotlin.test/junit/src/main/resources/META-INF/services/kotlin.test.AsserterContributor
similarity index 100%
rename from libraries/kotlin.test/jvm/src/main/resources/META-INF/services/kotlin.test.AsserterContributor
rename to libraries/kotlin.test/junit/src/main/resources/META-INF/services/kotlin.test.AsserterContributor
diff --git a/libraries/kotlin.test/jvm/src/test/kotlin/JUnitContributorTest.kt b/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt
similarity index 100%
rename from libraries/kotlin.test/jvm/src/test/kotlin/JUnitContributorTest.kt
rename to libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt
diff --git a/libraries/kotlin.test/pom.xml b/libraries/kotlin.test/pom.xml
index ca4e10db239..233713ba748 100644
--- a/libraries/kotlin.test/pom.xml
+++ b/libraries/kotlin.test/pom.xml
@@ -13,7 +13,7 @@
 
     <modules>
         <module>shared</module>
-        <module>jvm</module>
+        <module>junit</module>
         <!--<module>js</module>--> <!-- TODO enable back when js build fixed -->
     </modules>
 
diff --git a/libraries/kotlin.test/shared/pom.xml b/libraries/kotlin.test/shared/pom.xml
index 72f58fc2d1b..0b896b1aa89 100644
--- a/libraries/kotlin.test/shared/pom.xml
+++ b/libraries/kotlin.test/shared/pom.xml
@@ -102,6 +102,7 @@
                 <dependency>
                     <groupId>junit</groupId>
                     <artifactId>junit</artifactId>
+                    <scope>test</scope>
                 </dependency>
             </dependencies>
 
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 babc601baa7..d4dedfdec96 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
@@ -6,10 +6,12 @@ import kotlin.jvm.internal.*
 import kotlin.reflect.*
 
 @Deprecated("Use assertFailsWith instead.", ReplaceWith("assertFailsWith(exceptionClass, block)"), kotlin.DeprecationLevel.ERROR)
-fun <T : Throwable> failsWith(exceptionClass: Class<T>, block: () -> Any): T = assertFailsWith(exceptionClass, { block() })
+fun <T : Throwable> failsWith(exceptionClass: Class<T>, block: () -> Any): T = assertFailsWith(exceptionClass) { block() }
 
 /** Asserts that a [block] fails with a specific exception being thrown. */
-fun <T : Throwable> assertFailsWith(exceptionClass: Class<T>, block: () -> Unit): T = assertFailsWith(exceptionClass, null, block)
+fun <T : Throwable> assertFailsWith(exceptionClass: Class<T>, block: () -> Unit): T {
+    return assertFailsWith(exceptionClass, null, block)
+}
 
 /** Asserts that a [block] fails with a specific exception being thrown. */
 fun <T : Throwable> assertFailsWith(exceptionClass: Class<T>, message: String?, block: () -> Unit): T {
@@ -28,9 +30,12 @@ fun <T : Throwable> assertFailsWith(exceptionClass: Class<T>, message: String?,
     throw IllegalStateException(msg + "Should have failed.")
 }
 
+/** Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown. */
+fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, block: () -> Unit): T = assertFailsWith(exceptionClass, null, block)
+
 /** Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown. */
 @Suppress("DEPRECATION")
-fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String? = null, block: () -> Unit): T = assertFailsWith(exceptionClass.javaClass, message, block)
+fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T = assertFailsWith(exceptionClass.javaClass, message, block)
 
 /** Asserts that a [block] fails with a specific exception of type [T] being thrown.
  *  Since inline method doesn't allow to trace where it was invoked, it is required to pass a [message] to distinguish this method call from others.
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 7983d130e9b..ec80b4240f6 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
@@ -175,13 +175,3 @@ interface AsserterContributor {
     fun contribute(): Asserter?
 }
 
-internal fun <T, R> T.let(block: (T) -> R): R = block(this)
-
-internal fun <T> Iterable<T>.firstOrNull(predicate: (T) -> Boolean): T? {
-    for (e in this) {
-        if (predicate(e)) {
-            return e
-        }
-    }
-    return null
-}
diff --git a/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/Utils.kt b/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/Utils.kt
new file mode 100644
index 00000000000..fa69c62357d
--- /dev/null
+++ b/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/Utils.kt
@@ -0,0 +1,4 @@
+package kotlin.test
+
+internal fun <T, R> T.let(block: (T) -> R): R = block(this)
+
diff --git a/libraries/kotlin.test/shared/src/test/kotlin.jvm/BasicAssertionsJVMTest.kt b/libraries/kotlin.test/shared/src/test/kotlin.jvm/BasicAssertionsJVMTest.kt
index e5206fbb19c..6b5f633cf35 100644
--- a/libraries/kotlin.test/shared/src/test/kotlin.jvm/BasicAssertionsJVMTest.kt
+++ b/libraries/kotlin.test/shared/src/test/kotlin.jvm/BasicAssertionsJVMTest.kt
@@ -24,6 +24,13 @@ class BasicAssertionsJVMTest {
             throw IllegalArgumentException()
         }
     }
+    @Test
+    fun testFailsWithClassMessage() {
+        @Suppress("UNCHECKED_CAST")
+        assertFailsWith(Class.forName("java.lang.IllegalArgumentException") as Class<Throwable>) {
+            throw IllegalArgumentException()
+        }
+    }
 
     @Test
     fun testToDo() {
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index 9335016ad6f..65420ec13b0 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin.test.jvm</artifactId>
+            <artifactId>kotlin.test.junit</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/libraries/tools/kotlin-js-tests-junit/pom.xml b/libraries/tools/kotlin-js-tests-junit/pom.xml
index b15be51fb73..2eed85ecc8a 100644
--- a/libraries/tools/kotlin-js-tests-junit/pom.xml
+++ b/libraries/tools/kotlin-js-tests-junit/pom.xml
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
         	<groupId>org.jetbrains.kotlin</groupId>
-        	<artifactId>kotlin.test.jvm</artifactId>
+        	<artifactId>kotlin.test.junit</artifactId>
         	<version>${project.version}</version>
         </dependency>
         <dependency>