From 9b9852cdc974ce6d74fc4ba887e38e7b88d9f4dc Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 24 Jan 2017 01:23:46 +0300
Subject: [PATCH] kotlin-test: rename shared module to common. Do not use
 shared kotlin-test while building js stdlib.

---
 build.xml                                                     | 4 ++--
 jslib_files.xml                                               | 4 ----
 libraries/kotlin.test/{shared => common}/pom.xml              | 0
 .../kotlin.test/{shared => common}/src/assembly/sources.xml   | 0
 .../src/main/kotlin/kotlin/internal/internalAnnotations.kt    | 0
 .../src/main/kotlin/kotlin/jvm/internalAnnotations.kt         | 0
 .../src/main/kotlin/kotlin/test/Assertions.kt                 | 0
 .../src/main/kotlin/kotlin/test/DefaultAsserter.kt            | 0
 .../{shared => common}/src/main/kotlin/kotlin/test/Utils.kt   | 0
 .../{shared => common}/src/main/kotlin/org/junit/Test.kt      | 0
 .../src/test/kotlin.jvm/BasicAssertionsJVMTest.kt             | 0
 .../src/test/kotlin.jvm/StackTraceJVMTest.kt                  | 0
 .../{shared => common}/src/test/kotlin.jvm/TestJVMTest.kt     | 0
 .../{shared => common}/src/test/kotlin.jvm/UtilsJVM.kt        | 0
 .../src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt  | 0
 .../test/kotlin/kotlin/test/tests/CollectionAssertionTest.kt  | 0
 .../src/test/kotlin/kotlin/test/tests/util.kt                 | 0
 libraries/kotlin.test/pom.xml                                 | 4 ++--
 18 files changed, 4 insertions(+), 8 deletions(-)
 rename libraries/kotlin.test/{shared => common}/pom.xml (100%)
 rename libraries/kotlin.test/{shared => common}/src/assembly/sources.xml (100%)
 rename libraries/kotlin.test/{shared => common}/src/main/kotlin/kotlin/internal/internalAnnotations.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/main/kotlin/kotlin/jvm/internalAnnotations.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/main/kotlin/kotlin/test/Assertions.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/main/kotlin/kotlin/test/DefaultAsserter.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/main/kotlin/kotlin/test/Utils.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/main/kotlin/org/junit/Test.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/test/kotlin.jvm/BasicAssertionsJVMTest.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/test/kotlin.jvm/StackTraceJVMTest.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/test/kotlin.jvm/TestJVMTest.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/test/kotlin.jvm/UtilsJVM.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/test/kotlin/kotlin/test/tests/CollectionAssertionTest.kt (100%)
 rename libraries/kotlin.test/{shared => common}/src/test/kotlin/kotlin/test/tests/util.kt (100%)

diff --git a/build.xml b/build.xml
index 9dbce5c6d0c..4ef52ae13be 100644
--- a/build.xml
+++ b/build.xml
@@ -1086,7 +1086,7 @@
             <arg value="kotlin-test"/>
             <arg value="-Xallow-kotlin-package"/>
             <arg value="-Xmulti-platform"/>
-            <arg value="libraries/kotlin.test/shared/src/main/kotlin"/>
+            <arg value="libraries/kotlin.test/common/src/main/kotlin"/>
             <arg value="libraries/kotlin.test/jvm/src/main/kotlin"/>
         </java>
 
@@ -1116,7 +1116,7 @@
             <arg line="-main noCall"/>
             <arg line="-module-kind umd"/>
             <arg value="-Xmulti-platform"/>
-            <arg value="libraries/kotlin.test/shared/src/main/kotlin"/>
+            <arg value="libraries/kotlin.test/common/src/main/kotlin"/>
             <arg value="libraries/kotlin.test/js/src/main/kotlin"/>
         </java>
         <pack-runtime-jar jar-name="kotlin-test-js.jar" implementation-title="${manifest.impl.title.kotlin.test}" runtime-component="TestJs">
diff --git a/jslib_files.xml b/jslib_files.xml
index b2c1ee77efb..93416ac2c55 100644
--- a/jslib_files.xml
+++ b/jslib_files.xml
@@ -30,10 +30,6 @@
             <include name="kotlin/Unit.kt"/>
         </fileset>
 
-        <fileset dir="${basedir}/libraries/kotlin.test/shared">
-            <include name="src/main/kotlin/kotlin/test/TestAssertions.kt" />
-        </fileset>
-
         <fileset dir="${basedir}/${intermediate-sources}/stdlib/js">
             <include name="**/*.kt" />
         </fileset>
diff --git a/libraries/kotlin.test/shared/pom.xml b/libraries/kotlin.test/common/pom.xml
similarity index 100%
rename from libraries/kotlin.test/shared/pom.xml
rename to libraries/kotlin.test/common/pom.xml
diff --git a/libraries/kotlin.test/shared/src/assembly/sources.xml b/libraries/kotlin.test/common/src/assembly/sources.xml
similarity index 100%
rename from libraries/kotlin.test/shared/src/assembly/sources.xml
rename to libraries/kotlin.test/common/src/assembly/sources.xml
diff --git a/libraries/kotlin.test/shared/src/main/kotlin/kotlin/internal/internalAnnotations.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/internal/internalAnnotations.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/main/kotlin/kotlin/internal/internalAnnotations.kt
rename to libraries/kotlin.test/common/src/main/kotlin/kotlin/internal/internalAnnotations.kt
diff --git a/libraries/kotlin.test/shared/src/main/kotlin/kotlin/jvm/internalAnnotations.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/jvm/internalAnnotations.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/main/kotlin/kotlin/jvm/internalAnnotations.kt
rename to libraries/kotlin.test/common/src/main/kotlin/kotlin/jvm/internalAnnotations.kt
diff --git a/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/Assertions.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Assertions.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/Assertions.kt
rename to libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Assertions.kt
diff --git a/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/DefaultAsserter.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/DefaultAsserter.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/DefaultAsserter.kt
rename to libraries/kotlin.test/common/src/main/kotlin/kotlin/test/DefaultAsserter.kt
diff --git a/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/Utils.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Utils.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/Utils.kt
rename to libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Utils.kt
diff --git a/libraries/kotlin.test/shared/src/main/kotlin/org/junit/Test.kt b/libraries/kotlin.test/common/src/main/kotlin/org/junit/Test.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/main/kotlin/org/junit/Test.kt
rename to libraries/kotlin.test/common/src/main/kotlin/org/junit/Test.kt
diff --git a/libraries/kotlin.test/shared/src/test/kotlin.jvm/BasicAssertionsJVMTest.kt b/libraries/kotlin.test/common/src/test/kotlin.jvm/BasicAssertionsJVMTest.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/test/kotlin.jvm/BasicAssertionsJVMTest.kt
rename to libraries/kotlin.test/common/src/test/kotlin.jvm/BasicAssertionsJVMTest.kt
diff --git a/libraries/kotlin.test/shared/src/test/kotlin.jvm/StackTraceJVMTest.kt b/libraries/kotlin.test/common/src/test/kotlin.jvm/StackTraceJVMTest.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/test/kotlin.jvm/StackTraceJVMTest.kt
rename to libraries/kotlin.test/common/src/test/kotlin.jvm/StackTraceJVMTest.kt
diff --git a/libraries/kotlin.test/shared/src/test/kotlin.jvm/TestJVMTest.kt b/libraries/kotlin.test/common/src/test/kotlin.jvm/TestJVMTest.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/test/kotlin.jvm/TestJVMTest.kt
rename to libraries/kotlin.test/common/src/test/kotlin.jvm/TestJVMTest.kt
diff --git a/libraries/kotlin.test/shared/src/test/kotlin.jvm/UtilsJVM.kt b/libraries/kotlin.test/common/src/test/kotlin.jvm/UtilsJVM.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/test/kotlin.jvm/UtilsJVM.kt
rename to libraries/kotlin.test/common/src/test/kotlin.jvm/UtilsJVM.kt
diff --git a/libraries/kotlin.test/shared/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt b/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt
rename to libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt
diff --git a/libraries/kotlin.test/shared/src/test/kotlin/kotlin/test/tests/CollectionAssertionTest.kt b/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/CollectionAssertionTest.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/test/kotlin/kotlin/test/tests/CollectionAssertionTest.kt
rename to libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/CollectionAssertionTest.kt
diff --git a/libraries/kotlin.test/shared/src/test/kotlin/kotlin/test/tests/util.kt b/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/util.kt
similarity index 100%
rename from libraries/kotlin.test/shared/src/test/kotlin/kotlin/test/tests/util.kt
rename to libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/util.kt
diff --git a/libraries/kotlin.test/pom.xml b/libraries/kotlin.test/pom.xml
index 572252688ab..c6bdd3381db 100644
--- a/libraries/kotlin.test/pom.xml
+++ b/libraries/kotlin.test/pom.xml
@@ -12,10 +12,10 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>shared</module>
-        <module>junit</module>
+        <module>common</module>
         <module>jvm</module>
         <module>js</module>
+        <module>junit</module>
     </modules>
 
     <properties>