From d3e3f599ae2fa1689bd77efdaa03216ba861307d Mon Sep 17 00:00:00 2001
From: pTalanov <talanov.pavel@gmail.com>
Date: Fri, 2 Mar 2012 16:36:51 +0400
Subject: [PATCH] Moved most of the test into subpackage.

---
 .../k2js/test/{ => semantics}/AbstractExpressionTest.java     | 3 ++-
 .../jetbrains/k2js/test/{ => semantics}/ArrayListTest.java    | 2 +-
 .../k2js/test/{ => semantics}/ClassInheritanceTest.java       | 4 +++-
 .../org/jetbrains/k2js/test/{ => semantics}/ExamplesTest.java | 3 ++-
 .../k2js/test/{ => semantics}/ExtensionFunctionTest.java      | 4 +++-
 .../k2js/test/{ => semantics}/ExtensionPropertyTest.java      | 4 +++-
 .../org/jetbrains/k2js/test/{ => semantics}/ForeachTest.java  | 2 +-
 .../org/jetbrains/k2js/test/{ => semantics}/FunctionTest.java | 2 +-
 .../jetbrains/k2js/test/{ => semantics}/JavaClassesTest.java  | 3 ++-
 .../jetbrains/k2js/test/{ => semantics}/KotlinLibTest.java    | 3 ++-
 .../org/jetbrains/k2js/test/{ => semantics}/MiscTest.java     | 2 +-
 .../jetbrains/k2js/test/{ => semantics}/MultiFileTest.java    | 3 ++-
 .../k2js/test/{ => semantics}/MultiNamespaceTest.java         | 3 ++-
 .../jetbrains/k2js/test/{ => semantics}/NameClashesTest.java  | 4 +++-
 .../org/jetbrains/k2js/test/{ => semantics}/ObjectTest.java   | 4 +++-
 .../k2js/test/{ => semantics}/OperatorOverloadingTest.java    | 4 +++-
 .../k2js/test/{ => semantics}/PatternMatchingTest.java        | 3 ++-
 .../k2js/test/{ => semantics}/PropertyAccessTest.java         | 4 +++-
 .../org/jetbrains/k2js/test/{ => semantics}/RTTITest.java     | 4 +++-
 .../org/jetbrains/k2js/test/{ => semantics}/RangeTest.java    | 4 +++-
 .../org/jetbrains/k2js/test/{ => semantics}/SafeCallTest.java | 4 +++-
 .../org/jetbrains/k2js/test/{ => semantics}/SimpleTest.java   | 3 ++-
 .../k2js/test/{ => semantics}/StandardClassesTest.java        | 4 +++-
 .../org/jetbrains/k2js/test/{ => semantics}/StringTest.java   | 2 +-
 .../org/jetbrains/k2js/test/{ => semantics}/TraitTest.java    | 4 +++-
 .../k2js/test/{ => semantics}/TranslatorTestCaseBuilder.java  | 2 +-
 .../org/jetbrains/k2js/test/{ => semantics}/TupleTest.java    | 4 +++-
 .../k2js/test/{ => semantics}/WebDemoExamples1Test.java       | 4 +++-
 .../k2js/test/{ => semantics}/WebDemoExamples2Test.java       | 4 +++-
 .../test/org/jetbrains/k2js/test/utils/SuiteBuilder.java      | 2 +-
 30 files changed, 68 insertions(+), 30 deletions(-)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/AbstractExpressionTest.java (90%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/ArrayListTest.java (97%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/ClassInheritanceTest.java (95%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/ExamplesTest.java (93%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/ExtensionFunctionTest.java (95%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/ExtensionPropertyTest.java (92%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/ForeachTest.java (95%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/FunctionTest.java (98%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/JavaClassesTest.java (90%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/KotlinLibTest.java (96%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/MiscTest.java (97%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/MultiFileTest.java (93%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/MultiNamespaceTest.java (93%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/NameClashesTest.java (90%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/ObjectTest.java (92%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/OperatorOverloadingTest.java (96%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/PatternMatchingTest.java (95%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/PropertyAccessTest.java (95%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/RTTITest.java (91%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/RangeTest.java (92%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/SafeCallTest.java (93%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/SimpleTest.java (93%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/StandardClassesTest.java (95%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/StringTest.java (97%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/TraitTest.java (94%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/TranslatorTestCaseBuilder.java (98%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/TupleTest.java (91%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/WebDemoExamples1Test.java (97%)
 rename js/js.tests/test/org/jetbrains/k2js/test/{ => semantics}/WebDemoExamples2Test.java (92%)

diff --git a/js/js.tests/test/org/jetbrains/k2js/test/AbstractExpressionTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractExpressionTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/AbstractExpressionTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractExpressionTest.java
index 64391bc2eea..fd43374b811 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/AbstractExpressionTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractExpressionTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/ArrayListTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ArrayListTest.java
similarity index 97%
rename from js/js.tests/test/org/jetbrains/k2js/test/ArrayListTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/ArrayListTest.java
index 44922ccf05e..abe920bd228 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/ArrayListTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ArrayListTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 import org.mozilla.javascript.JavaScriptException;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/ClassInheritanceTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassInheritanceTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/ClassInheritanceTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassInheritanceTest.java
index 562d48d6b76..6ee7552f759 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/ClassInheritanceTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassInheritanceTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/ExamplesTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/ExamplesTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java
index 50654f162ac..bda820d0b84 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/ExamplesTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 import com.intellij.testFramework.UsefulTestCase;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.test.TranslationTest;
 import org.jetbrains.k2js.test.utils.SuiteBuilder;
 
 @SuppressWarnings("JUnitTestCaseWithNoTests")
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionFunctionTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionFunctionTest.java
index fec04364292..1e5f6c61956 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionFunctionTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/ExtensionPropertyTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionPropertyTest.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/ExtensionPropertyTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionPropertyTest.java
index fcf333c8b9c..542e6d067fc 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/ExtensionPropertyTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionPropertyTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/ForeachTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ForeachTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/ForeachTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/ForeachTest.java
index 206b8f32da6..8a160a48f30 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/ForeachTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ForeachTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/FunctionTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java
similarity index 98%
rename from js/js.tests/test/org/jetbrains/k2js/test/FunctionTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java
index 1bc0eb87e58..64e0645d018 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/FunctionTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/JavaClassesTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/JavaClassesTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/JavaClassesTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/JavaClassesTest.java
index 14cd1352b23..c5dac4309c2 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/JavaClassesTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/JavaClassesTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/KotlinLibTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/KotlinLibTest.java
similarity index 96%
rename from js/js.tests/test/org/jetbrains/k2js/test/KotlinLibTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/KotlinLibTest.java
index e18b387d8c5..a00379d2dec 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/KotlinLibTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/KotlinLibTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.test.TranslationTest;
 import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
 import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
 import org.mozilla.javascript.Context;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/MiscTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
similarity index 97%
rename from js/js.tests/test/org/jetbrains/k2js/test/MiscTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
index 28d9843f459..d7600b22172 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/MiscTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 import org.mozilla.javascript.JavaScriptException;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/MultiFileTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiFileTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/MultiFileTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiFileTest.java
index 3ea0cfe9135..8cd80441987 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/MultiFileTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiFileTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/MultiNamespaceTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiNamespaceTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/MultiNamespaceTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiNamespaceTest.java
index 9db0c03c951..661c6b83eae 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/MultiNamespaceTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiNamespaceTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/NameClashesTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/NameClashesTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/NameClashesTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/NameClashesTest.java
index 4a425dcf3f8..7d63b39af15 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/NameClashesTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/NameClashesTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/ObjectTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ObjectTest.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/ObjectTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/ObjectTest.java
index 5b904d7f197..e23a8d90f14 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/ObjectTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ObjectTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/OperatorOverloadingTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/OperatorOverloadingTest.java
similarity index 96%
rename from js/js.tests/test/org/jetbrains/k2js/test/OperatorOverloadingTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/OperatorOverloadingTest.java
index 04c481846b8..dd8243f9f9a 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/OperatorOverloadingTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/OperatorOverloadingTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/PatternMatchingTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/PatternMatchingTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/PatternMatchingTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/PatternMatchingTest.java
index f7d6e6e3153..844ac6164ce 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/PatternMatchingTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/PatternMatchingTest.java
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
+import org.jetbrains.k2js.test.TranslationTest;
 import org.mozilla.javascript.JavaScriptException;
 
 /**
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/PropertyAccessTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyAccessTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/PropertyAccessTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyAccessTest.java
index d0f201a620a..1997de83254 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/PropertyAccessTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyAccessTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/RTTITest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/RTTITest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/RTTITest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/RTTITest.java
index c151bb36c9f..1b504a804bb 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/RTTITest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/RTTITest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/RangeTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/RangeTest.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/RangeTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/RangeTest.java
index f4a120ba508..fe0115f9e11 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/RangeTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/RangeTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/SafeCallTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/SafeCallTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/SafeCallTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/SafeCallTest.java
index c9e8b2640c5..56e7b167b13 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/SafeCallTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/SafeCallTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/SimpleTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/SimpleTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/SimpleTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/SimpleTest.java
index 25d4ed497f7..899b664864c 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/SimpleTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/SimpleTest.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 import com.intellij.testFramework.UsefulTestCase;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.test.TranslationTest;
 import org.jetbrains.k2js.test.utils.SuiteBuilder;
 
 /**
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/StandardClassesTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StandardClassesTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/StandardClassesTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/StandardClassesTest.java
index 4e7d952c483..57439aff1b7 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/StandardClassesTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StandardClassesTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/StringTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StringTest.java
similarity index 97%
rename from js/js.tests/test/org/jetbrains/k2js/test/StringTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/StringTest.java
index 609088b26e6..bea5334ebf9 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/StringTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StringTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/TraitTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TraitTest.java
similarity index 94%
rename from js/js.tests/test/org/jetbrains/k2js/test/TraitTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/TraitTest.java
index ad1f696c461..ee67742b51f 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/TraitTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TraitTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/TranslatorTestCaseBuilder.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java
similarity index 98%
rename from js/js.tests/test/org/jetbrains/k2js/test/TranslatorTestCaseBuilder.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java
index 06d319c0852..e9ec69038a8 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/TranslatorTestCaseBuilder.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/TupleTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TupleTest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/TupleTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/TupleTest.java
index eda5b553a71..da8c8970b66 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/TupleTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TupleTest.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples1Test.java
similarity index 97%
rename from js/js.tests/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples1Test.java
index 9cc28b35bd9..d848512e0b1 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples1Test.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples2Test.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples2Test.java
index e3db9c0e825..f0086e113d3 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples2Test.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.TranslationTest;
 
 /**
  * @author Pavel Talanov
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/utils/SuiteBuilder.java b/js/js.tests/test/org/jetbrains/k2js/test/utils/SuiteBuilder.java
index 0802bfe9501..d1c2857bda0 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/utils/SuiteBuilder.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/utils/SuiteBuilder.java
@@ -20,7 +20,7 @@ import com.intellij.testFramework.UsefulTestCase;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.test.TranslationTest;
-import org.jetbrains.k2js.test.TranslatorTestCaseBuilder;
+import org.jetbrains.k2js.test.semantics.TranslatorTestCaseBuilder;
 
 /**
  * @author Pavel Talanov