From ea5f4d428c0e7f9bb151ce01a172266baa76bccc Mon Sep 17 00:00:00 2001 From: pTalanov Date: Fri, 15 Jun 2012 13:46:06 +0400 Subject: [PATCH] Refactor NativeInteropTest --- .../jetbrains/k2js/test/semantics/NativeInteropTest.java | 6 +++--- .../testFiles/native/cases/{KT-1519.kt => kt1519.kt} | 0 .../testFiles/native/native/{KT-1519.js => kt1519.js} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename js/js.translator/testFiles/native/cases/{KT-1519.kt => kt1519.kt} (100%) rename js/js.translator/testFiles/native/native/{KT-1519.js => kt1519.js} (100%) diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/NativeInteropTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/NativeInteropTest.java index d7ace866ff9..2a118a0b8a5 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/NativeInteropTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/NativeInteropTest.java @@ -20,7 +20,6 @@ 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.k2js.test.utils.JsTestUtils; import java.util.List; @@ -40,7 +39,8 @@ public final class NativeInteropTest extends SingleFileTranslationTest { @Override protected List additionalJSFiles(@NotNull EcmaVersion ecmaVersion) { List result = Lists.newArrayList(super.additionalJSFiles(ecmaVersion)); - result.addAll(JsTestUtils.getAllFilesInDir(pathToTestFiles() + NATIVE)); + result.add(pathToTestFiles() + NATIVE + "/" + getTestName(true) + ".js"); + //result.addAll(JsTestUtils.getAllFilesInDir(pathToTestFiles() + NATIVE)); return result; } @@ -61,6 +61,6 @@ public final class NativeInteropTest extends SingleFileTranslationTest { } public void testKt1519() throws Exception { - checkFooBoxIsTrue("KT-1519.kt", EcmaVersion.all()); + fooBoxTest(); } } diff --git a/js/js.translator/testFiles/native/cases/KT-1519.kt b/js/js.translator/testFiles/native/cases/kt1519.kt similarity index 100% rename from js/js.translator/testFiles/native/cases/KT-1519.kt rename to js/js.translator/testFiles/native/cases/kt1519.kt diff --git a/js/js.translator/testFiles/native/native/KT-1519.js b/js/js.translator/testFiles/native/native/kt1519.js similarity index 100% rename from js/js.translator/testFiles/native/native/KT-1519.js rename to js/js.translator/testFiles/native/native/kt1519.js