JS backend: remove RegressionMergeEcmaTest

js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassInheritanceTest.java

@@ -29,7 +29,15 @@ public final class ClassInheritanceTest extends SingleFileTranslationTest {
     }
 
     public void testMethodOverride() throws Exception {
-        fooBoxTest();
+        checkFooBoxIsOk();
+    }
+
+    public void testBaseCall() throws Exception {
+        checkFooBoxIsOk();
+    }
+
+    public void testCrazyInheritance() throws Exception {
+        checkFooBoxIsOk();
     }
 
     public void testValOverride() throws Exception {

js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassObjectTest.java

@@ -5,7 +5,7 @@ import org.jetbrains.k2js.test.SingleFileTranslationTest;
 public final class ClassObjectTest extends SingleFileTranslationTest {
 
     public ClassObjectTest() {
-        super("class_object/");
+        super("classObject/");
     }
 
     public void testSimple() throws Exception {

js/js.tests/test/org/jetbrains/k2js/test/semantics/DelegatePropertyTest.java

@@ -35,6 +35,9 @@ public class DelegatePropertyTest extends SingleFileTranslationTest {
         checkFooBoxIsOk();
     }
 
+    public void testDelegateWithPropertyAccess() throws Exception {
+        checkFooBoxIsOk();
+    }
 
     public void testDelegateByTopLevelFun() throws Exception {
         checkFooBoxIsOk();

js/js.tests/test/org/jetbrains/k2js/test/semantics/InitializerTest.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.k2js.test.semantics;
+
+import org.jetbrains.k2js.test.SingleFileTranslationTest;
+
+public class InitializerTest extends SingleFileTranslationTest {
+    public InitializerTest() {
+        super("initialize/");
+    }
+
+    public void testRootValInit() throws Exception {
+        checkFooBoxIsOk();
+    }
+
+    public void testRootPackageValInit() throws Exception {
+        runFunctionOutputTest(DEFAULT_ECMA_VERSIONS, getTestName(true) + ".kt", "_", "box", "OK");
+    }
+
+    public void testClassInitializer() throws Exception {
+        checkFooBoxIsOk();
+    }
+}

js/js.tests/test/org/jetbrains/k2js/test/semantics/NameClashesTest.java

@@ -29,9 +29,11 @@ public final class NameClashesTest extends SingleFileTranslationTest {
         fooBoxTest();
     }
 
-    //TODO:
-    @SuppressWarnings("UnusedDeclaration")
-    public void TODO_testDifferenceInCapitalization() throws Exception {
-        fooBoxTest();
+    public void testOverloadExtension() throws Exception {
+        checkFooBoxIsOk();
+    }
+
+    public void testDifferenceInCapitalization() throws Exception {
+        checkFooBoxIsOk();
     }
 }

js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyAccessTest.java

@@ -39,6 +39,9 @@ public final class PropertyAccessTest extends SingleFileTranslationTest {
         fooBoxTest();
     }
 
+    public void testBackendField() throws Exception {
+        checkFooBoxIsOk();
+    }
 
     public void testSetter() throws Exception {
         runFunctionOutputTest("setter.kt", "foo", "f", 99.0);

js/js.tests/test/org/jetbrains/k2js/test/semantics/RTTITest.java

@@ -24,6 +24,10 @@ public class RTTITest extends SingleFileTranslationTest {
         super("rtti/");
     }
 
+    public void testRttiForClass() throws Exception {
+        checkFooBoxIsOk();
+    }
+
     public void testIsSameClass() throws Exception {
         fooBoxTest();
     }

js/js.tests/test/org/jetbrains/k2js/test/semantics/RegressionMergeEcmaTest.java

@@ -1,93 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.k2js.test.semantics;
-
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
-
-public class RegressionMergeEcmaTest extends SingleFileTranslationTest {
-    public RegressionMergeEcmaTest() {
-        super("mergeEcma/");
-    }
-
-    public void testObjectWithMethods() throws Exception {
-        fooBoxTest();
-    }
-
-    public void testEcmaDelegate() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testEcmaObject() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testEcmaSimple() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testMethodOverride() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testMethodInClass() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testGetSetProperty() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testRootValInit() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testRootPackageValInit() throws Exception {
-        runFunctionOutputTest(DEFAULT_ECMA_VERSIONS, getTestName(true) + ".kt", "_", "box", "OK");
-    }
-
-    public void testIsClassSupport() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testCrazyExtension() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testOverloadFun() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testLiteralFun() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testOverloadExtension() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testClassInitializer() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testBackendField() throws Exception {
-        checkFooBoxIsOk();
-    }
-
-    public void testExtensionClass() throws Exception {
-        checkFooBoxIsOk();
-    }
-}