From 66de78e82ae05c61c5f9d0a34a44a15412863580 Mon Sep 17 00:00:00 2001
From: Sergey Mashkov <sergey.mashkov@jetbrains.com>
Date: Tue, 24 Jan 2017 15:12:42 +0300
Subject: [PATCH] kotlin-test: migrate multiplatform integration test to use
 common test module

---
 .../js/src/test/kotlin/org/jetbrains/TestUtilsImpl.kt      | 5 -----
 .../src/it/test-multiplatform/jvm/pom.xml                  | 6 ++++++
 .../jvm/src/test/kotlin/org/jetbrains/TestUtilsImpl.kt     | 7 -------
 .../src/it/test-multiplatform/shared/pom.xml               | 6 ++++++
 .../shared/src/test/kotlin/org/jetbrains/SharedTest.kt     | 3 ++-
 .../shared/src/test/kotlin/org/jetbrains/TestUtils.kt      | 3 ---
 .../shared/src/test/kotlin/org/junit/Test.kt               | 4 ----
 7 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/test/kotlin/org/jetbrains/TestUtilsImpl.kt
 delete mode 100644 libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/test/kotlin/org/jetbrains/TestUtilsImpl.kt
 delete mode 100644 libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/jetbrains/TestUtils.kt
 delete mode 100644 libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/junit/Test.kt

diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/test/kotlin/org/jetbrains/TestUtilsImpl.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/test/kotlin/org/jetbrains/TestUtilsImpl.kt
deleted file mode 100644
index 22d5c417be4..00000000000
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/test/kotlin/org/jetbrains/TestUtilsImpl.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.jetbrains
-
-impl fun assertEquals(a: String, b: String) {
-    kotlin.test.assertEquals(a, b)
-}
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/pom.xml
index 370d5848957..900081215af 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/pom.xml
@@ -24,6 +24,12 @@
             <artifactId>test-multimodule-shared</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/test/kotlin/org/jetbrains/TestUtilsImpl.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/test/kotlin/org/jetbrains/TestUtilsImpl.kt
deleted file mode 100644
index 242a03df0ef..00000000000
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/test/kotlin/org/jetbrains/TestUtilsImpl.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.jetbrains
-
-import org.junit.*
-
-impl fun assertEquals(a: String, b: String) {
-    Assert.assertEquals(a, b)
-}
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/pom.xml
index cc6dc462c4a..e4143bf0567 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/pom.xml
@@ -19,6 +19,12 @@
             <artifactId>kotlin-stdlib-common</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-common</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/jetbrains/SharedTest.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/jetbrains/SharedTest.kt
index 8b45e3dc4a3..744a59fa907 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/jetbrains/SharedTest.kt
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/jetbrains/SharedTest.kt
@@ -1,10 +1,11 @@
 package org.jetbrains
 
 import org.junit.*
+import kotlin.test.*
 
 open class SharedTest {
     @Test
     fun test0() {
         assertEquals("Hello, World!", getGreeting())
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/jetbrains/TestUtils.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/jetbrains/TestUtils.kt
deleted file mode 100644
index a94f47a44e5..00000000000
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/jetbrains/TestUtils.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.jetbrains
-
-header fun assertEquals(a: String, b: String)
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/junit/Test.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/junit/Test.kt
deleted file mode 100644
index 492582493fa..00000000000
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/junit/Test.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.junit
-
-@Suppress("HEADER_WITHOUT_IMPLEMENTATION")
-header annotation class Test
\ No newline at end of file