diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageJsTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageJsTest.java index 35503b305ab..fb70e9ec33c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageJsTest.java +++ b/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, diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/JSConfigurationKeys.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/JSConfigurationKeys.java index c890a1af470..11172ada46b 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/JSConfigurationKeys.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/JSConfigurationKeys.java @@ -34,9 +34,6 @@ public class JSConfigurationKeys { public static final CompilerConfigurationKey TARGET = CompilerConfigurationKey.create("ECMA version target"); - public static final CompilerConfigurationKey UNIT_TEST_CONFIG = - CompilerConfigurationKey.create("unit test config"); - public static final CompilerConfigurationKey MODULE_KIND = CompilerConfigurationKey.create("module kind"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java index 62bf49896f7..27ddf5b2040 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java +++ b/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(); - boolean success = FileUtil.delete(outDir); - assert success; + assertTrue(outDir.exists()); + assertTrue(FileUtil.delete(outDir)); } 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 additionalKotlinFiles() { + private List additionalKotlinFiles() { List additionalFiles = Lists.newArrayList(); // add all kotlin files from testData/_commonFiles @@ -263,7 +258,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment { } @NotNull - protected List additionalJsFiles(@NotNull EcmaVersion ecmaVersion) { + private List additionalJsFiles(@NotNull EcmaVersion ecmaVersion) { List 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); } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java index d5d6d2693b6..9917a7acb57 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java +++ b/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 files, @NotNull JsConfig config, @NotNull JsBlock rootBlock, @NotNull TranslationContext context + @NotNull Collection files, @NotNull JsBlock rootBlock, @NotNull TranslationContext context ) { - JSTester tester = - config.getConfiguration().getBoolean(JSConfigurationKeys.UNIT_TEST_CONFIG) ? new JSRhinoUnitTester() : new QUnitTester(); + JSTester tester = new QUnitTester(); tester.initialize(context, rootBlock); JSTestGenerator.generateTestCalls(context, files, tester); tester.deinitialize(); diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSRhinoUnitTester.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSRhinoUnitTester.java deleted file mode 100644 index e1285341320..00000000000 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSRhinoUnitTester.java +++ /dev/null @@ -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; - } -}