Merge remote-tracking branch 'origin/master'

Conflicts:
	js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java
	js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java

js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java

@@ -54,10 +54,18 @@ public abstract class SingleFileTranslationTest extends BasicTest {
         runFunctionOutputTest(ecmaVersions, filename, "foo", "box", true);
     }
 
+    public void checkFooBoxIsValue(@NotNull String filename, @NotNull EnumSet<EcmaVersion> ecmaVersions, Object expected) throws Exception {
+        runFunctionOutputTest(ecmaVersions, filename, "foo", "box", expected);
+    }
+
     protected void fooBoxTest() throws Exception {
         checkFooBoxIsTrue(getTestName(true) + ".kt", EcmaVersion.all());
     }
 
+    protected void fooBoxIsValue(Object expected) throws Exception {
+        checkFooBoxIsValue(getTestName(true) + ".kt", EcmaVersion.all(), expected);
+    }
+
     protected void fooBoxTest(@NotNull Iterable<EcmaVersion> ecmaVersions) throws Exception {
         checkFooBoxIsTrue(getTestName(true) + ".kt", ecmaVersions);
     }

js/js.tests/test/org/jetbrains/k2js/test/TestWithEnvironment.java

@@ -51,9 +51,9 @@ public abstract class TestWithEnvironment extends UsefulTestCase {
     }
 
     protected void createEnvironmentWithMockJdkAndIdeaAnnotations() {
-        myEnvironment = JetCoreEnvironment.getCoreEnvironmentForJVM(getTestRootDisposable(),
-                                                                    CompileCompilerDependenciesTest.compilerDependenciesForTests(
-                                                                            CompilerSpecialMode.JS,
-                                                                            true));
+        myEnvironment = JetCoreEnvironment.createCoreEnvironmentForJVM(getTestRootDisposable(),
+                                                                       CompileCompilerDependenciesTest.compilerDependenciesForTests(
+                                                                               CompilerSpecialMode.JS,
+                                                                               true));
     }
 }

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010-2012 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;
+
+public final class EqualsTest extends AbstractExpressionTest {
+
+    public EqualsTest() {
+        super("equals/");
+    }
+
+    public void TODO_testCustomEqualsMethod() throws Exception {
+        fooBoxTest();
+    }
+
+    public void testStringsEqual() throws Exception {
+        fooBoxTest();
+    }
+}

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2012 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;
+
+public final class IdentifierClashTest extends AbstractExpressionTest {
+
+    public IdentifierClashTest() {
+        super("identifierClash/");
+    }
+
+    public void TODO_testUseVariableOfNameOfFunction() throws Exception {
+        fooBoxTest();
+    }
+
+    public void testDummyFunctionToMakeTestWork() {
+    }
+}

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2012 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;
+
+public final class StringTemplatesTest extends AbstractExpressionTest {
+
+    public StringTemplatesTest() {
+        super("stringTemplates/");
+    }
+
+    public void TODO_testObjectWithExtensionToString() throws Exception {
+        fooBoxIsValue("a = abcX, b = defX");
+    }
+
+    public void testObjectWithToString() throws Exception {
+        fooBoxIsValue("a = abcS, b = defS");
+    }
+
+    public void testStringValues() throws Exception {
+        fooBoxTest();
+    }
+}