KJS: remove obsolete code related to Unit testing

idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageJsTest.java

@@ -65,7 +65,6 @@ public abstract class AbstractDiagnosticMessageJsTest extends AbstractDiagnostic
         configuration.put(CommonConfigurationKeys.MODULE_NAME, KotlinTestUtils.TEST_MODULE_NAME);
         configuration.put(JSConfigurationKeys.LIBRARIES, JsConfig.JS_STDLIB);
         configuration.put(CommonConfigurationKeys.DISABLE_INLINE, true);
-        configuration.put(JSConfigurationKeys.UNIT_TEST_CONFIG, true);
         if (explicitLanguageVersion != null) {
             CommonConfigurationKeysKt.setLanguageVersionSettings(
                     configuration,

js/js.frontend/src/org/jetbrains/kotlin/js/config/JSConfigurationKeys.java

@@ -34,9 +34,6 @@ public class JSConfigurationKeys {
     public static final CompilerConfigurationKey<EcmaVersion> TARGET =
             CompilerConfigurationKey.create("ECMA version target");
 
-    public static final CompilerConfigurationKey<Boolean> UNIT_TEST_CONFIG =
-            CompilerConfigurationKey.create("unit test config");
-
     public static final CompilerConfigurationKey<ModuleKind> MODULE_KIND =
             CompilerConfigurationKey.create("module kind");
 

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

@@ -115,9 +115,8 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
             return;
         }
         File outDir = new File(getOutputPath());
-        assert outDir.exists();
+        assertTrue(outDir.exists());
-        boolean success = FileUtil.delete(outDir);
+        assertTrue(FileUtil.delete(outDir));
-        assert success;
     }
 
     public void doTest(@NotNull String filePath) {
@@ -217,10 +216,6 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
         return null;
     }
 
-    protected boolean shouldBeTranslateAsUnitTestClass() {
-        return false;
-    }
-
     protected boolean shouldGenerateSourceMap() {
         return false;
     }
@@ -251,7 +246,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
     }
 
     @NotNull
-    protected List<String> additionalKotlinFiles() {
+    private List<String> additionalKotlinFiles() {
         List<String> additionalFiles = Lists.newArrayList();
 
         // add all kotlin files from testData/_commonFiles
@@ -263,7 +258,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
     }
 
     @NotNull
-    protected List<String> additionalJsFiles(@NotNull EcmaVersion ecmaVersion) {
+    private List<String> additionalJsFiles(@NotNull EcmaVersion ecmaVersion) {
         List<String> additionalFiles = Lists.newArrayList();
 
         // add all js files from testData/_commonFiles
@@ -329,8 +324,6 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
         configuration.put(JSConfigurationKeys.SOURCE_MAP, shouldGenerateSourceMap());
         configuration.put(JSConfigurationKeys.META_INFO, false);
 
-        configuration.put(JSConfigurationKeys.UNIT_TEST_CONFIG, shouldBeTranslateAsUnitTestClass());
-
         return new JsConfig(project, configuration);
     }
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java

@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor;
 import org.jetbrains.kotlin.idea.MainFunctionDetector;
 import org.jetbrains.kotlin.js.backend.ast.*;
-import org.jetbrains.kotlin.js.config.JSConfigurationKeys;
 import org.jetbrains.kotlin.js.config.JsConfig;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.jetbrains.kotlin.js.facade.exceptions.TranslationException;
@@ -37,7 +36,6 @@ import org.jetbrains.kotlin.js.translate.context.TranslationContext;
 import org.jetbrains.kotlin.js.translate.declaration.PackageDeclarationTranslator;
 import org.jetbrains.kotlin.js.translate.expression.ExpressionVisitor;
 import org.jetbrains.kotlin.js.translate.expression.PatternTranslator;
-import org.jetbrains.kotlin.js.translate.test.JSRhinoUnitTester;
 import org.jetbrains.kotlin.js.translate.test.JSTestGenerator;
 import org.jetbrains.kotlin.js.translate.test.JSTester;
 import org.jetbrains.kotlin.js.translate.test.QUnitTester;
@@ -280,7 +278,7 @@ public final class Translation {
             defineModule(context, statements, config.getModuleId());
         }
 
-        mayBeGenerateTests(files, config, rootBlock, context);
+        mayBeGenerateTests(files, rootBlock, context);
         rootFunction.getParameters().add(new JsParameter((rootPackageName)));
 
         // Invoke function passing modules as arguments
@@ -317,10 +315,9 @@ public final class Translation {
     }
 
     private static void mayBeGenerateTests(
-            @NotNull Collection<KtFile> files, @NotNull JsConfig config, @NotNull JsBlock rootBlock, @NotNull TranslationContext context
+            @NotNull Collection<KtFile> files, @NotNull JsBlock rootBlock, @NotNull TranslationContext context
     ) {
-        JSTester tester =
+        JSTester tester = new QUnitTester();
-                config.getConfiguration().getBoolean(JSConfigurationKeys.UNIT_TEST_CONFIG) ? new JSRhinoUnitTester() : new QUnitTester();
         tester.initialize(context, rootBlock);
         JSTestGenerator.generateTestCalls(context, files, tester);
         tester.deinitialize();

js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSRhinoUnitTester.java

@@ -1,33 +0,0 @@
-/*
- * 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.translate.test;
-
-import org.jetbrains.kotlin.js.backend.ast.JsExpression;
-import org.jetbrains.kotlin.js.backend.ast.JsNameRef;
-import org.jetbrains.annotations.NotNull;
-
-public final class JSRhinoUnitTester extends CommonUnitTester {
-
-    @NotNull
-    private static final JsNameRef TEST_FUN_REF = new JsNameRef("test", "JsTests");
-
-    @NotNull
-    @Override
-    protected JsExpression getTestMethodRef() {
-        return TEST_FUN_REF;
-    }
-}