diff --git a/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationWithDirectivesTest.java b/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationWithDirectivesTest.java index b6ebd2bf20f..211bc528dcb 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationWithDirectivesTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationWithDirectivesTest.java @@ -36,12 +36,12 @@ public abstract class SingleFileTranslationWithDirectivesTest extends SingleFile nodeConsumer.consume(null); } - protected void checkFooBoxIsOkWithInlineDirectives() throws Exception { + protected void checkFooBoxIsOkWithDirectives() throws Exception { checkFooBoxIsOk(); - processInlineDirectives(); + processDirectives(); } - protected void processInlineDirectives() throws Exception { + protected void processDirectives() throws Exception { String fileName = getInputFilePath(getTestName(true) + ".kt"); String fileText = JsTestUtils.readFile(fileName); diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineTest.java index aa9117d33d9..9dae081bf19 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineTest.java @@ -25,214 +25,214 @@ public final class InlineTest extends SingleFileTranslationWithDirectivesTest { } public void testInlineSimpleAssignment() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineGenericSimple() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineIntSimple() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineInc() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineCallNoInline() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineFunctionInLambda() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineLambdaNoCapture() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineLambdaWithCapture() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineChain() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineChainWithFewStatements() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testCallInlineFunctionOnTopLevelSimple() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testCallInlineFunctionOnTopLevel() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineIf() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineNoReturn() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testStatementsAfterReturn() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testLambdaReassignment() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testLambdaReassignmentWithCapture() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineMethod() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testThisImplicitlyCaptured() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testAstCopy() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testNoInlineLambda() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testlambdaInLambda() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testInlineDefaultArgument() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testLocalInlineFunction() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testLocalInlineFunctionDeclaredInLambda() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testLocalInlineExtensionFunction() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testLocalInlineFunctionNameClash() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testLocalInlineFunctionComplex() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testArrayLiteralAliasing() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testLocalInlineFunctionReference() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testThisLiteralAliasing() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testIdentityEquals() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testVararg() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testMutualRecursion() throws Exception { try { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } catch (Exception e) { assert e.getCause() instanceof InlineRecursionException; } } public void testInlineOrder() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testCallableReference() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testCallableReferenceOfLocalInline() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testAnonymousObjectInlineMethod() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testClassObject() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testExtension() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testExtensionWithManyArguments() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testParams() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testRootConstructor() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSeveralClosures() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSeveralUsage() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSimpleDouble() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSimpleInt() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSimpleEnum() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSimpleLambda() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSimpleObject() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testIncrementProperty() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSimpleReturnFunctionWithResultUnused() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/LabelTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/LabelTest.java index abf37d3b50c..5edebf3c637 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/LabelTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/LabelTest.java @@ -24,38 +24,38 @@ public class LabelTest extends SingleFileTranslationWithDirectivesTest { } public void testSimpleLabel() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSiblingLabels() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testNestedLabels() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSimpleLabelInlined() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSiblingLabelsInlined() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testSiblingLabelsInlinedClashing() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testNestedLabelsInlinedClashing() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testLabelWithVariableClashing() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } public void testNestedLabelsInlinedClashingAtFunctionsWithClosure() throws Exception { - checkFooBoxIsOkWithInlineDirectives(); + checkFooBoxIsOkWithDirectives(); } }