Rename package k2js -> kotlin.js in js.tests

org.jetbrains.k2js.test -> org.jetbrains.kotlin.js.test

.idea/runConfigurations/Js_backend_tests.xml

@@ -4,7 +4,7 @@
     <module name="js.tests" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.js.test" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />

compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java

@@ -21,8 +21,8 @@ import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker;
-import org.jetbrains.k2js.test.rhino.RhinoUtils;
+import org.jetbrains.kotlin.js.test.rhino.RhinoUtils;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;

generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -120,9 +120,9 @@ import org.jetbrains.jet.psi.patternMatching.AbstractJetPsiUnifierTest
 import org.jetbrains.jet.completion.weighers.AbstractBasicCompletionWeigherTest
 import org.jetbrains.jet.completion.weighers.AbstractSmartCompletionWeigherTest
 import org.jetbrains.kotlin.generators.tests.reservedWords.generateTestDataForReservedWords
-import org.jetbrains.k2js.test.semantics.AbstractReservedWordTest
+import org.jetbrains.kotlin.js.test.semantics.AbstractReservedWordTest
 import org.jetbrains.jet.resolve.AbstractReferenceResolveInJavaTest
-import org.jetbrains.k2js.test.semantics.AbstractBridgeTest
+import org.jetbrains.kotlin.js.test.semantics.AbstractBridgeTest
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterMultiFileTest
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterForWebDemoTest
 import org.jetbrains.jet.plugin.decompiler.textBuilder.AbstractDecompiledTextTest
@@ -134,8 +134,8 @@ import org.jetbrains.jet.renderer.AbstractDescriptorRendererTest
 import org.jetbrains.jet.types.AbstractJetTypeBindingTest
 import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletionHandlerTest
 import org.jetbrains.jet.plugin.coverage.AbstractKotlinCoverageOutputFilesTest
-import org.jetbrains.k2js.test.semantics.AbstractDynamicTest
+import org.jetbrains.kotlin.js.test.semantics.AbstractDynamicTest
-import org.jetbrains.k2js.test.semantics.AbstractMultiModuleTest
+import org.jetbrains.kotlin.js.test.semantics.AbstractMultiModuleTest
 import org.jetbrains.jet.completion.handlers.AbstractBasicCompletionHandlerTest
 import org.jetbrains.jet.plugin.decompiler.stubBuilder.AbstractClsStubBuilderTest
 import org.jetbrains.jet.codegen.AbstractLineNumberTest

js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractMultiModuleTest.kt

@@ -1,5 +0,0 @@
-package org.jetbrains.k2js.test.semantics
-
-import org.jetbrains.k2js.test.MultipleModulesTranslationTest
-
-public abstract class AbstractMultiModuleTest : MultipleModulesTranslationTest("multiModule/")

js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import com.google.common.collect.Lists;
 import com.google.dart.compiler.backend.js.ast.JsNode;
@@ -44,10 +44,10 @@ import org.jetbrains.k2js.config.Config;
 import org.jetbrains.k2js.config.EcmaVersion;
 import org.jetbrains.k2js.config.LibrarySourcesConfig;
 import org.jetbrains.k2js.config.LibrarySourcesConfigWithCaching;
-import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
-import org.jetbrains.k2js.test.utils.JsTestUtils;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.jetbrains.kotlin.js.facade.Status;
+import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
+import org.jetbrains.kotlin.js.test.utils.JsTestUtils;
 import org.jetbrains.kotlin.js.translate.context.Namer;
 
 import java.io.File;
@@ -57,9 +57,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import static org.jetbrains.k2js.test.rhino.RhinoUtils.runRhinoTest;
-import static org.jetbrains.k2js.test.utils.JsTestUtils.convertFileNameToDotJsFile;
 import static org.jetbrains.kotlin.js.facade.K2JSTranslator.translateWithMainCallParameters;
+import static org.jetbrains.kotlin.js.test.rhino.RhinoUtils.runRhinoTest;
+import static org.jetbrains.kotlin.js.test.utils.JsTestUtils.convertFileNameToDotJsFile;
 
 public abstract class BasicTest extends KotlinTestWithEnvironment {
     // predictable order of ecma version in tests

js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleFilesTranslationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker;
 
 import java.util.List;
 
-import static org.jetbrains.k2js.test.utils.JsTestUtils.getAllFilesInDir;
+import static org.jetbrains.kotlin.js.test.utils.JsTestUtils.getAllFilesInDir;
 
 public abstract class MultipleFilesTranslationTest extends BasicTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test
+package org.jetbrains.kotlin.js.test
 
 import org.jetbrains.k2js.config.EcmaVersion
 import org.jetbrains.kotlin.js.facade.MainCallParameters
-import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker
-
+import org.jetbrains.kotlin.js.test.utils.JsTestUtils.getAllFilesInDir
 import java.io.File
 import java.util.ArrayList
-
-import org.jetbrains.k2js.test.utils.JsTestUtils.getAllFilesInDir
 import java.util.LinkedHashMap
 
 public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(main) {

js/js.tests/test/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.semantics.TranslatorTestCaseBuilder;
+import org.jetbrains.kotlin.js.test.semantics.TranslatorTestCaseBuilder;
 
 import java.io.File;
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
-import org.jetbrains.k2js.test.rhino.RhinoSystemOutputChecker;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoSystemOutputChecker;
 
-import static org.jetbrains.k2js.test.utils.JsTestUtils.readFile;
+import static org.jetbrains.kotlin.js.test.utils.JsTestUtils.readFile;
 
 @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors")
 public abstract class SingleFileTranslationTest extends BasicTest {

js/js.tests/test/org/jetbrains/kotlin/js/test/SingleFileTranslationWithDirectivesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import com.google.dart.compiler.backend.js.ast.JsNode;
 import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.utils.DirectiveTestUtils;
+import org.jetbrains.kotlin.js.test.utils.DirectiveTestUtils;
-import org.jetbrains.k2js.test.utils.JsTestUtils;
+import org.jetbrains.kotlin.js.test.utils.JsTestUtils;
-import org.jetbrains.k2js.test.utils.MemoizeConsumer;
+import org.jetbrains.kotlin.js.test.utils.MemoizeConsumer;
 
 public abstract class SingleFileTranslationWithDirectivesTest extends SingleFileTranslationTest {
     private final MemoizeConsumer<JsNode> nodeConsumer = new MemoizeConsumer<JsNode>();

js/js.tests/test/org/jetbrains/kotlin/js/test/SourceMapTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.semantics.TranslatorTestCaseBuilder;
+import org.jetbrains.kotlin.js.test.semantics.TranslatorTestCaseBuilder;
 
 @SuppressWarnings("JUnitTestCaseWithNoTests")
 public final class SourceMapTest extends SingleFileTranslationTest {

js/js.tests/test/org/jetbrains/kotlin/js/test/ast/JsScopeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.ast;
+package org.jetbrains.kotlin.js.test.ast;
 
 import com.google.dart.compiler.backend.js.ast.JsName;
 import com.google.dart.compiler.backend.js.ast.JsScope;

js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/CompositeRhinoResultsChecker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;

js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoFunctionNativeObjectResultChecker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoFunctionResultChecker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.js.translate.context.Namer;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
 
-import static org.jetbrains.k2js.test.rhino.RhinoUtils.flushSystemOut;
+import static org.jetbrains.kotlin.js.test.rhino.RhinoUtils.flushSystemOut;
 import static org.junit.Assert.assertEquals;
 
 public class RhinoFunctionResultChecker implements RhinoResultChecker {

js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoQUnitResultChecker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.NativeArray;
 import org.mozilla.javascript.Scriptable;
 
-import static org.jetbrains.k2js.test.rhino.RhinoUtils.flushSystemOut;
+import static org.jetbrains.kotlin.js.test.rhino.RhinoUtils.flushSystemOut;
 import static org.junit.Assert.fail;
 
 /**
@@ -37,9 +37,8 @@ public class RhinoQUnitResultChecker implements RhinoResultChecker {
     protected void assertResultValid(Object result) {
         if (result instanceof NativeArray) {
             NativeArray array = (NativeArray) result;
-            StringBuffer buffer = new StringBuffer();
+            StringBuilder buffer = new StringBuilder();
-            for (int i = 0, size = array.size(); i < size; i++) {
+            for (Object value : array) {
-                Object value = array.get(i);
                 String text = value.toString();
                 System.out.println(text);
 
@@ -54,7 +53,7 @@ public class RhinoQUnitResultChecker implements RhinoResultChecker {
                 fail(buffer.toString());
             }
         } else {
-            fail("Uknown QUnit result: " + result);
+            fail("Unknown QUnit result: " + result);
         }
     }
 
@@ -65,5 +64,4 @@ public class RhinoQUnitResultChecker implements RhinoResultChecker {
     protected String functionCallString() {
         return "runQUnitSuite()";
     }
-
 }

js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoResultChecker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;

js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoSystemOutputChecker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.js.facade.K2JSTranslator;

js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import com.google.common.collect.Sets;
 import com.intellij.openapi.util.io.FileUtil;
@@ -34,8 +34,8 @@ import java.util.Set;
 
 import static org.jetbrains.jet.utils.UtilsPackage.rethrow;
 import static org.jetbrains.k2js.config.LibrarySourcesConfig.*;
-import static org.jetbrains.k2js.test.BasicTest.DIST_DIR_PATH;
+import static org.jetbrains.kotlin.js.test.BasicTest.DIST_DIR_PATH;
-import static org.jetbrains.k2js.test.BasicTest.TEST_DATA_DIR_PATH;
+import static org.jetbrains.kotlin.js.test.BasicTest.TEST_DATA_DIR_PATH;
 
 public final class RhinoUtils {
     private static final String KOTLIN_JS_LIB_ECMA_5 = TEST_DATA_DIR_PATH + "kotlin_lib_ecma5.js";

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractBridgeTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics
+package org.jetbrains.kotlin.js.test.semantics
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
 
 public abstract class AbstractBridgeTest : SingleFileTranslationTest("bridges/") {
-
     override fun doTest(filename: String) = checkBlackBoxIsOkByPath(filename)
 }

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractCallableReferenceTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public abstract class AbstractCallableReferenceTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDynamicTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics
+package org.jetbrains.kotlin.js.test.semantics
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
 
 public abstract class AbstractDynamicTest : SingleFileTranslationTest("dynamic/")

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractExpressionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public abstract class AbstractExpressionTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractListTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class AbstractListTest extends JavaClassesTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractMultiModuleTest.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010-2015 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.kotlin.js.test.semantics
+
+import org.jetbrains.kotlin.js.test.MultipleModulesTranslationTest
+
+public abstract class AbstractMultiModuleTest : MultipleModulesTranslationTest("multiModule/")

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractReservedWordTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics
+package org.jetbrains.kotlin.js.test.semantics
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
 
 public abstract class AbstractReservedWordTest : SingleFileTranslationTest("reservedWords/")

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AnnotationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class AnnotationTest extends SingleFileTranslationTest {
     public AnnotationTest() {

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ArrayListTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.mozilla.javascript.JavaScriptException;
 
@@ -61,7 +61,7 @@ public final class ArrayListTest extends JavaClassesTest {
             fooBoxTest();
             fail();
         } catch (JavaScriptException e) {
-
+            // Ignored
         }
     }
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CastTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 /**
  * A messy class where all new tests go before they are sorted which never happens.

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CharTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class CharTest extends SingleFileTranslationTest {
     public CharTest() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ClassInheritanceTest extends SingleFileTranslationTest {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ClassObjectTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClosureTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ClosureTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompareToTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class CompareToTest extends AbstractExpressionTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import com.intellij.util.ArrayUtil;
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.ExitCode;
 import org.jetbrains.jet.cli.js.K2JSCompiler;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 import java.io.File;
 import java.util.ArrayList;

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DataClassTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class DataClassTest extends SingleFileTranslationTest {
     public DataClassTest() {

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DefaultArgumentsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class DefaultArgumentsTest extends SingleFileTranslationTest {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class DelegatePropertyTest extends SingleFileTranslationTest {
     public DelegatePropertyTest() {

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DelegationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class DelegationTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DollarParameterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class DollarParameterTest extends AbstractExpressionTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/EnumTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
-public class EnumTest  extends SingleFileTranslationTest {
+public class EnumTest extends SingleFileTranslationTest {
     public EnumTest() {
         super("enum/");
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class EqualsTest extends AbstractExpressionTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/EvaluationOrderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public class EvaluationOrderTest extends AbstractExpressionTest {
     public EvaluationOrderTest() {

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExamplesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 import org.jetbrains.kotlin.js.translate.context.Namer;
 
 @SuppressWarnings("JUnitTestCaseWithNoTests")

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExtensionFunctionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ExtensionFunctionTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExtensionPropertyTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ExtensionPropertyTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ForeachTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class ForeachTest extends AbstractExpressionTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionCallableReferenceTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class FunctionCallableReferenceTest extends AbstractCallableReferenceTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public class FunctionTest extends AbstractExpressionTest {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class IdentifierClashTest extends AbstractExpressionTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IdentityEqualsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public class IdentityEqualsTest extends AbstractExpressionTest {
     public IdentityEqualsTest() {

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IfExpressionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.mozilla.javascript.JavaScriptException;
 
@@ -30,6 +30,7 @@ public class IfExpressionTest extends AbstractExpressionTest {
             fail();
         }
         catch (JavaScriptException e) {
+            // Ignored
         }
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class InitializerTest extends SingleFileTranslationTest {
     public InitializerTest() {

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineMultiFileTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.dart.compiler.backend.js.ast.JsNode;
 import com.intellij.util.Consumer;
-import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
+import org.jetbrains.kotlin.js.test.MultipleFilesTranslationTest;
-import org.jetbrains.k2js.test.utils.DirectiveTestUtils;
+import org.jetbrains.kotlin.js.test.utils.DirectiveTestUtils;
-import org.jetbrains.k2js.test.utils.JsTestUtils;
+import org.jetbrains.kotlin.js.test.utils.JsTestUtils;
-import org.jetbrains.k2js.test.utils.MemoizeConsumer;
+import org.jetbrains.kotlin.js.test.utils.MemoizeConsumer;
 
 import java.util.List;
 
-import static org.jetbrains.k2js.test.utils.JsTestUtils.getAllFilesInDir;
+import static org.jetbrains.kotlin.js.test.utils.JsTestUtils.getAllFilesInDir;
 
 public final class InlineMultiFileTest extends MultipleFilesTranslationTest {
     private final MemoizeConsumer<JsNode> nodeConsumer = new MemoizeConsumer<JsNode>();

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationWithDirectivesTest;
 import org.jetbrains.kotlin.js.inline.exception.InlineRecursionException;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationWithDirectivesTest;
 
 public final class InlineTest extends SingleFileTranslationWithDirectivesTest {
     public InlineTest() {

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InvokeConventionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class InvokeConventionTest extends AbstractExpressionTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JavaClassesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public abstract class JavaClassesTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationWithDirectivesTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationWithDirectivesTest;
 
 public final class JsCodeTest extends SingleFileTranslationWithDirectivesTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
-import org.jetbrains.k2js.test.rhino.RhinoSystemOutputChecker;
-import org.jetbrains.k2js.test.rhino.RhinoUtils;
-import org.jetbrains.k2js.test.utils.JsUnitTestReporter;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.test.MultipleFilesTranslationTest;
+import org.jetbrains.kotlin.js.test.rhino.RhinoSystemOutputChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoUtils;
+import org.jetbrains.kotlin.js.test.utils.JsUnitTestReporter;
 
 import java.util.Collections;
 import java.util.HashMap;

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsonTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationWithDirectivesTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationWithDirectivesTest;
 
 public class LabelTest extends SingleFileTranslationWithDirectivesTest {
     public LabelTest() {

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MiscTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.kotlin.js.translate.context.Namer;
 import org.mozilla.javascript.JavaScriptException;

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiDeclarationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class MultiDeclarationTest extends SingleFileTranslationTest {
     public MultiDeclarationTest() {

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiFileTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
+import org.jetbrains.kotlin.js.test.MultipleFilesTranslationTest;
 
 public final class MultiFileTest extends MultipleFilesTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiPackageTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
+import org.jetbrains.kotlin.js.test.MultipleFilesTranslationTest;
 
 public class MultiPackageTest extends MultipleFilesTranslationTest {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class NameClashesTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NativeInteropTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.JavaScript;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 import java.io.File;
 import java.util.List;

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NumberTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
 import org.jetbrains.kotlin.js.facade.exceptions.TranslationInternalException;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 import org.junit.Assert;
 
 public final class NumberTest extends SingleFileTranslationTest {

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ObjectTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ObjectTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OperatorOverloadingTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class OperatorOverloadingTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PackageTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class PackageTest extends SingleFileTranslationTest {
     public PackageTest() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 import java.util.List;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyCallableReferenceTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public class PropertyCallableReferenceTest extends AbstractCallableReferenceTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyOverrideTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class PropertyOverrideTest extends SingleFileTranslationTest {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class RTTITest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/RangeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class RangeTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/RegressionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class RegressionTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SafeCallTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class SafeCallTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SimpleTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 @SuppressWarnings("JUnitTestCaseWithNoTests")
 public final class SimpleTest extends SingleFileTranslationTest {

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StandardClassesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class StandardClassesTest extends SingleFileTranslationTest {
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibArraysTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibBitwiseOperationsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibGetOtElseTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibIterableTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibIteratorsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJavaUtilCollectionsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJsArrayScriptTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,20 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.rhino.CompositeRhinoResultsChecker;
+import org.jetbrains.kotlin.js.test.rhino.CompositeRhinoResultsChecker;
-import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker;
-import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
 
-/**
- */
 public class StdLibJsArrayScriptTest extends StdLibTestBase {
     public void testArrayScriptTest() throws Exception {
-        performStdLibTest(DEFAULT_ECMA_VERSIONS,
+        performStdLibTest(DEFAULT_ECMA_VERSIONS, "libraries/stdlib/test", "js/JsArrayScript.kt");
-                          "libraries/stdlib/test",
-                          "js/JsArrayScript.kt");
     }
 
     @NotNull

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibListTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibMapJsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibMapTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibQUnitTestSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.rhino.RhinoQUnitResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoQUnitResultChecker;
-import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -40,7 +39,7 @@ public abstract class StdLibQUnitTestSupport extends StdLibTestBase {
     @NotNull
     @Override
     protected List<String> additionalJsFiles(@NotNull EcmaVersion ecmaVersion) {
-        ArrayList<String> files = Lists.newArrayList(super.additionalJsFiles(ecmaVersion));
+        List<String> files = Lists.newArrayList(super.additionalJsFiles(ecmaVersion));
         files.add("js/js.translator/qunit/qunit.js");
         files.add("js/js.translator/qunit/headless.js");
         return files;

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibSetJsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibStringBuilderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibStringTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
-import org.jetbrains.k2js.test.rhino.RhinoFunctionNativeObjectResultChecker;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionNativeObjectResultChecker;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 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.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
-import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
 
 import java.io.File;
 import java.util.List;