diff --git a/compiler/testData/cli/js/jsCodeError.args b/compiler/testData/cli/js/jsCodeError.args deleted file mode 100644 index ed43350e65f..00000000000 --- a/compiler/testData/cli/js/jsCodeError.args +++ /dev/null @@ -1,3 +0,0 @@ -$TESTDATA_DIR$/jsCodeError.kt --output -$TEMP_DIR$/out.js \ No newline at end of file diff --git a/compiler/testData/cli/js/jsCodeError.kt b/compiler/testData/cli/js/jsCodeError.kt deleted file mode 100644 index 37b18b90d3f..00000000000 --- a/compiler/testData/cli/js/jsCodeError.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun f1(): Unit = js("var = 10;") -fun f2(): Unit = js("""var = 10;""") \ No newline at end of file diff --git a/compiler/testData/cli/js/jsCodeError.out b/compiler/testData/cli/js/jsCodeError.out deleted file mode 100644 index 4b2b46ec2ed..00000000000 --- a/compiler/testData/cli/js/jsCodeError.out +++ /dev/null @@ -1,3 +0,0 @@ -ERROR: compiler/testData/cli/js/jsCodeError.kt: (1, 25) JavaScript: missing variable name -ERROR: compiler/testData/cli/js/jsCodeError.kt: (2, 27) JavaScript: missing variable name -COMPILATION_ERROR \ No newline at end of file diff --git a/compiler/testData/cli/js/jsCodeNotLiteralError.args b/compiler/testData/cli/js/jsCodeNotLiteralError.args deleted file mode 100644 index be9f8c51b05..00000000000 --- a/compiler/testData/cli/js/jsCodeNotLiteralError.args +++ /dev/null @@ -1,3 +0,0 @@ -$TESTDATA_DIR$/jsCodeNotLiteralError.kt --output -$TEMP_DIR$/out.js \ No newline at end of file diff --git a/compiler/testData/cli/js/jsCodeNotLiteralError.kt b/compiler/testData/cli/js/jsCodeNotLiteralError.kt deleted file mode 100644 index 7a1d1117b15..00000000000 --- a/compiler/testData/cli/js/jsCodeNotLiteralError.kt +++ /dev/null @@ -1,3 +0,0 @@ -val s = "1 + 1;" -fun two(): Int = js(s) -fun three(): Int = js("1" + "+ 2;") \ No newline at end of file diff --git a/compiler/testData/cli/js/jsCodeNotLiteralError.out b/compiler/testData/cli/js/jsCodeNotLiteralError.out deleted file mode 100644 index fe966af2efa..00000000000 --- a/compiler/testData/cli/js/jsCodeNotLiteralError.out +++ /dev/null @@ -1,3 +0,0 @@ -ERROR: compiler/testData/cli/js/jsCodeNotLiteralError.kt: (2, 18) Argument must be string literal -ERROR: compiler/testData/cli/js/jsCodeNotLiteralError.kt: (3, 20) Argument must be string literal -COMPILATION_ERROR \ No newline at end of file diff --git a/compiler/testData/cli/js/jsCodeWarning.args b/compiler/testData/cli/js/jsCodeWarning.args deleted file mode 100644 index 868e777a7d2..00000000000 --- a/compiler/testData/cli/js/jsCodeWarning.args +++ /dev/null @@ -1,3 +0,0 @@ -$TESTDATA_DIR$/jsCodeWarning.kt --output -$TEMP_DIR$/out.js \ No newline at end of file diff --git a/compiler/testData/cli/js/jsCodeWarning.kt b/compiler/testData/cli/js/jsCodeWarning.kt deleted file mode 100644 index 7ee479ddb43..00000000000 --- a/compiler/testData/cli/js/jsCodeWarning.kt +++ /dev/null @@ -1 +0,0 @@ -fun main(args: Array): Unit = js("var a = 08;") \ No newline at end of file diff --git a/compiler/testData/cli/js/jsCodeWarning.out b/compiler/testData/cli/js/jsCodeWarning.out deleted file mode 100644 index e6d5117c059..00000000000 --- a/compiler/testData/cli/js/jsCodeWarning.out +++ /dev/null @@ -1,2 +0,0 @@ -WARNING: compiler/testData/cli/js/jsCodeWarning.kt: (1, 50) JavaScript: illegal octal literal digit 8; interpreting it as a decimal digit -OK \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java index 3ea1ef7ea5e..d9559e77a16 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java @@ -156,24 +156,6 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js"), Pattern.compile("^(.+)\\.args$"), false); } - @TestMetadata("jsCodeError.args") - public void testJsCodeError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsCodeError.args"); - doJsTest(fileName); - } - - @TestMetadata("jsCodeNotLiteralError.args") - public void testJsCodeNotLiteralError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsCodeNotLiteralError.args"); - doJsTest(fileName); - } - - @TestMetadata("jsCodeWarning.args") - public void testJsCodeWarning() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsCodeWarning.args"); - doJsTest(fileName); - } - @TestMetadata("jsExtraHelp.args") public void testJsExtraHelp() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsExtraHelp.args"); diff --git a/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java b/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java index dab2fbe225b..bc17f881f33 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java @@ -83,19 +83,4 @@ public class K2JsCliTest extends CliBaseTest { Assert.assertFalse(new File(tmpdir.getTmpDir(), "out.js").isFile()); } - - @Test - public void jsCodeError() throws Exception { - executeCompilerCompareOutputJS(); - } - - @Test - public void jsCodeWarning() throws Exception { - executeCompilerCompareOutputJS(); - } - - @Test - public void jsCodeNotLiteralError() throws Exception { - executeCompilerCompareOutputJS(); - } }