From 0ac0c51c231f02445ac13c433872e7e04a1d25de Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 13 Jun 2023 17:01:21 +0200 Subject: [PATCH] [JS] Remove Ant js test --- .../js/additionalArguments/build.log.expected | 10 - .../ant/js/additionalArguments/build.xml | 10 - .../ant/js/additionalArguments/hello.kt | 13 -- .../bothPrefixAndPostfix/build.log.expected | 10 - .../ant/js/bothPrefixAndPostfix/build.xml | 12 -- .../ant/js/bothPrefixAndPostfix/postfix | 3 - .../ant/js/bothPrefixAndPostfix/prefix | 3 - .../ant/js/bothPrefixAndPostfix/root1/foo.kt | 3 - .../integration/ant/js/manySources/bar.kt | 3 - .../ant/js/manySources/build.log.expected | 10 - .../integration/ant/js/manySources/build.xml | 15 -- .../ant/js/manySources/root1/main.kt | 7 - .../ant/js/manySources/root2/Bar.js | 1 - .../ant/js/manySources/root2/Foo.kt | 3 - .../ant/js/noOutputParam/build.log.expected | 13 -- .../ant/js/noOutputParam/build.xml | 7 - .../ant/js/noSrcParam/build.log.expected | 13 -- .../integration/ant/js/noSrcParam/build.xml | 7 - .../ant/js/outputPostfix/build.log.expected | 10 - .../ant/js/outputPostfix/build.xml | 9 - .../integration/ant/js/outputPostfix/postfix | 3 - .../ant/js/outputPostfix/root1/foo.kt | 3 - .../ant/js/outputPrefix/build.log.expected | 10 - .../integration/ant/js/outputPrefix/build.xml | 9 - .../integration/ant/js/outputPrefix/prefix | 3 - .../ant/js/outputPrefix/root1/foo.kt | 3 - .../outputWithoutDirectory/build.log.expected | 9 - .../ant/js/outputWithoutDirectory/build.xml | 15 -- .../js/outputWithoutDirectory/root1/foo.kt | 3 - .../ant/js/simple/build.log.expected | 10 - .../integration/ant/js/simple/build.xml | 9 - .../integration/ant/js/simple/root1/foo.kt | 12 -- .../amd.js | 39 ---- .../build.log.expected | 14 -- .../build.xml | 26 --- .../jslib-example/LibraryExample.kt | 9 - .../root1/foo.kt | 17 -- .../build.log.expected | 18 -- .../build.xml | 44 ----- .../jslib-example1/LibraryExample.kt | 9 - .../jslib-example2/LibraryExample.kt | 3 - .../root1/foo.kt | 15 -- .../ant/js/simpleWithMain/build.log.expected | 10 - .../ant/js/simpleWithMain/build.xml | 9 - .../ant/js/simpleWithMain/root1/foo.kt | 9 - .../simpleWithMainFQArgs/build.log.expected | 10 - .../ant/js/simpleWithMainFQArgs/build.xml | 9 - .../ant/js/simpleWithMainFQArgs/root1/foo.kt | 10 - .../build.log.expected | 14 -- .../simpleWithTwoJsFilesAsLibraries/build.xml | 33 ---- .../jslib-example1/LibraryExample.kt | 9 - .../jslib-example2/LibraryExample.kt | 3 - .../root1/foo.kt | 15 -- .../simpleWithVarargMain/build.log.expected | 10 - .../ant/js/simpleWithVarargMain/build.xml | 9 - .../ant/js/simpleWithVarargMain/root1/foo.kt | 10 - .../js/simpleWithoutStdlib/build.log.expected | 10 - .../ant/js/simpleWithoutStdlib/build.xml | 9 - .../ant/js/simpleWithoutStdlib/root1/foo.kt | 3 - .../build.log.expected | 13 -- .../build.xml | 25 --- .../jslib-example/LibraryExample.kt | 6 - .../root1/foo.kt | 14 -- .../ant/js/sourceMap/build.log.expected | 10 - .../integration/ant/js/sourceMap/build.xml | 9 - .../integration/ant/js/sourceMap/root1/foo.kt | 3 - .../js/suppressWarnings/build.log.expected | 10 - .../ant/js/suppressWarnings/build.xml | 9 - .../ant/js/suppressWarnings/root1/foo.kt | 13 -- .../ant/js/verbose/build.log.expected | 13 -- .../integration/ant/js/verbose/build.xml | 9 - .../integration/ant/js/verbose/root1/foo.kt | 3 - .../ant/js/version/build.log.expected | 11 -- .../integration/ant/js/version/build.xml | 9 - .../integration/ant/js/version/root1/foo.kt | 3 - .../kotlin/integration/AntTaskJsTest.java | 173 ------------------ 76 files changed, 960 deletions(-) delete mode 100644 compiler/testData/integration/ant/js/additionalArguments/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/additionalArguments/build.xml delete mode 100644 compiler/testData/integration/ant/js/additionalArguments/hello.kt delete mode 100644 compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml delete mode 100644 compiler/testData/integration/ant/js/bothPrefixAndPostfix/postfix delete mode 100644 compiler/testData/integration/ant/js/bothPrefixAndPostfix/prefix delete mode 100644 compiler/testData/integration/ant/js/bothPrefixAndPostfix/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/manySources/bar.kt delete mode 100644 compiler/testData/integration/ant/js/manySources/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/manySources/build.xml delete mode 100644 compiler/testData/integration/ant/js/manySources/root1/main.kt delete mode 100644 compiler/testData/integration/ant/js/manySources/root2/Bar.js delete mode 100644 compiler/testData/integration/ant/js/manySources/root2/Foo.kt delete mode 100644 compiler/testData/integration/ant/js/noOutputParam/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/noOutputParam/build.xml delete mode 100644 compiler/testData/integration/ant/js/noSrcParam/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/noSrcParam/build.xml delete mode 100644 compiler/testData/integration/ant/js/outputPostfix/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/outputPostfix/build.xml delete mode 100644 compiler/testData/integration/ant/js/outputPostfix/postfix delete mode 100644 compiler/testData/integration/ant/js/outputPostfix/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/outputPrefix/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/outputPrefix/build.xml delete mode 100644 compiler/testData/integration/ant/js/outputPrefix/prefix delete mode 100644 compiler/testData/integration/ant/js/outputPrefix/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/outputWithoutDirectory/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml delete mode 100644 compiler/testData/integration/ant/js/outputWithoutDirectory/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/simple/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/simple/build.xml delete mode 100644 compiler/testData/integration/ant/js/simple/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/amd.js delete mode 100644 compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.xml delete mode 100644 compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.xml delete mode 100644 compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example1/LibraryExample.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example2/LibraryExample.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithMain/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/simpleWithMain/build.xml delete mode 100644 compiler/testData/integration/ant/js/simpleWithMain/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml delete mode 100644 compiler/testData/integration/ant/js/simpleWithMainFQArgs/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.xml delete mode 100644 compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example1/LibraryExample.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example2/LibraryExample.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithVarargMain/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml delete mode 100644 compiler/testData/integration/ant/js/simpleWithVarargMain/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithoutStdlib/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/simpleWithoutStdlib/build.xml delete mode 100644 compiler/testData/integration/ant/js/simpleWithoutStdlib/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/build.xml delete mode 100644 compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/jslib-example/LibraryExample.kt delete mode 100644 compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/sourceMap/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/sourceMap/build.xml delete mode 100644 compiler/testData/integration/ant/js/sourceMap/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/suppressWarnings/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/suppressWarnings/build.xml delete mode 100644 compiler/testData/integration/ant/js/suppressWarnings/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/verbose/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/verbose/build.xml delete mode 100644 compiler/testData/integration/ant/js/verbose/root1/foo.kt delete mode 100644 compiler/testData/integration/ant/js/version/build.log.expected delete mode 100644 compiler/testData/integration/ant/js/version/build.xml delete mode 100644 compiler/testData/integration/ant/js/version/root1/foo.kt delete mode 100644 js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java diff --git a/compiler/testData/integration/ant/js/additionalArguments/build.log.expected b/compiler/testData/integration/ant/js/additionalArguments/build.log.expected deleted file mode 100644 index dcf3f910d90..00000000000 --- a/compiler/testData/integration/ant/js/additionalArguments/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/hello.kt] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/additionalArguments/build.xml b/compiler/testData/integration/ant/js/additionalArguments/build.xml deleted file mode 100644 index 2dd18e3231e..00000000000 --- a/compiler/testData/integration/ant/js/additionalArguments/build.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/additionalArguments/hello.kt b/compiler/testData/integration/ant/js/additionalArguments/hello.kt deleted file mode 100644 index c0c7780a920..00000000000 --- a/compiler/testData/integration/ant/js/additionalArguments/hello.kt +++ /dev/null @@ -1,13 +0,0 @@ -package foo - -inline fun foo(f: () -> Unit) = f() - -var ok = "Fail" - -fun main() { - foo { - ok = "OK" - } -} - -fun box(): String = ok \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.log.expected b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.log.expected deleted file mode 100644 index 438f56679ca..00000000000 --- a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml deleted file mode 100644 index 89d7f349b78..00000000000 --- a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/postfix b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/postfix deleted file mode 100644 index 840c7093427..00000000000 --- a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/postfix +++ /dev/null @@ -1,3 +0,0 @@ -/* - some postfix -*/ \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/prefix b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/prefix deleted file mode 100644 index cd252389ee1..00000000000 --- a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/prefix +++ /dev/null @@ -1,3 +0,0 @@ -/* - some prefix -*/ \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/root1/foo.kt b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/root1/foo.kt deleted file mode 100644 index f6123b9882f..00000000000 --- a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/root1/foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -fun box(): String = "OK" diff --git a/compiler/testData/integration/ant/js/manySources/bar.kt b/compiler/testData/integration/ant/js/manySources/bar.kt deleted file mode 100644 index c7712d143f3..00000000000 --- a/compiler/testData/integration/ant/js/manySources/bar.kt +++ /dev/null @@ -1,3 +0,0 @@ -package bar - -fun bar() {} \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/manySources/build.log.expected b/compiler/testData/integration/ant/js/manySources/build.log.expected deleted file mode 100644 index 3f1c2bc5850..00000000000 --- a/compiler/testData/integration/ant/js/manySources/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1, [TestData]/bar.kt, [TestData]/root2/Foo.kt] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/manySources/build.xml b/compiler/testData/integration/ant/js/manySources/build.xml deleted file mode 100644 index ad629c2290a..00000000000 --- a/compiler/testData/integration/ant/js/manySources/build.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/manySources/root1/main.kt b/compiler/testData/integration/ant/js/manySources/root1/main.kt deleted file mode 100644 index 87a768d76bb..00000000000 --- a/compiler/testData/integration/ant/js/manySources/root1/main.kt +++ /dev/null @@ -1,7 +0,0 @@ -package foo - -fun box(): String { - Foo() - bar.bar() - return "OK" -} \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/manySources/root2/Bar.js b/compiler/testData/integration/ant/js/manySources/root2/Bar.js deleted file mode 100644 index af6f049b55d..00000000000 --- a/compiler/testData/integration/ant/js/manySources/root2/Bar.js +++ /dev/null @@ -1 +0,0 @@ -function Bar () {} \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/manySources/root2/Foo.kt b/compiler/testData/integration/ant/js/manySources/root2/Foo.kt deleted file mode 100644 index f4c5585faad..00000000000 --- a/compiler/testData/integration/ant/js/manySources/root2/Foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -class Foo \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/noOutputParam/build.log.expected b/compiler/testData/integration/ant/js/noOutputParam/build.log.expected deleted file mode 100644 index 995c1550e2c..00000000000 --- a/compiler/testData/integration/ant/js/noOutputParam/build.log.expected +++ /dev/null @@ -1,13 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: - -ERR: - -BUILD FAILED -[TestData]/build.xml:5: "output" should be specified - -Total time: [time] - -Return code: 1 diff --git a/compiler/testData/integration/ant/js/noOutputParam/build.xml b/compiler/testData/integration/ant/js/noOutputParam/build.xml deleted file mode 100644 index f5b1c0498d9..00000000000 --- a/compiler/testData/integration/ant/js/noOutputParam/build.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/compiler/testData/integration/ant/js/noSrcParam/build.log.expected b/compiler/testData/integration/ant/js/noSrcParam/build.log.expected deleted file mode 100644 index e27b44df889..00000000000 --- a/compiler/testData/integration/ant/js/noSrcParam/build.log.expected +++ /dev/null @@ -1,13 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: - -ERR: - -BUILD FAILED -[TestData]/build.xml:5: "src" should be specified - -Total time: [time] - -Return code: 1 diff --git a/compiler/testData/integration/ant/js/noSrcParam/build.xml b/compiler/testData/integration/ant/js/noSrcParam/build.xml deleted file mode 100644 index e711ea6175c..00000000000 --- a/compiler/testData/integration/ant/js/noSrcParam/build.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/compiler/testData/integration/ant/js/outputPostfix/build.log.expected b/compiler/testData/integration/ant/js/outputPostfix/build.log.expected deleted file mode 100644 index 438f56679ca..00000000000 --- a/compiler/testData/integration/ant/js/outputPostfix/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/outputPostfix/build.xml b/compiler/testData/integration/ant/js/outputPostfix/build.xml deleted file mode 100644 index 6c6d2053156..00000000000 --- a/compiler/testData/integration/ant/js/outputPostfix/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/outputPostfix/postfix b/compiler/testData/integration/ant/js/outputPostfix/postfix deleted file mode 100644 index 840c7093427..00000000000 --- a/compiler/testData/integration/ant/js/outputPostfix/postfix +++ /dev/null @@ -1,3 +0,0 @@ -/* - some postfix -*/ \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/outputPostfix/root1/foo.kt b/compiler/testData/integration/ant/js/outputPostfix/root1/foo.kt deleted file mode 100644 index f6123b9882f..00000000000 --- a/compiler/testData/integration/ant/js/outputPostfix/root1/foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -fun box(): String = "OK" diff --git a/compiler/testData/integration/ant/js/outputPrefix/build.log.expected b/compiler/testData/integration/ant/js/outputPrefix/build.log.expected deleted file mode 100644 index 438f56679ca..00000000000 --- a/compiler/testData/integration/ant/js/outputPrefix/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/outputPrefix/build.xml b/compiler/testData/integration/ant/js/outputPrefix/build.xml deleted file mode 100644 index 66ae0430b47..00000000000 --- a/compiler/testData/integration/ant/js/outputPrefix/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/outputPrefix/prefix b/compiler/testData/integration/ant/js/outputPrefix/prefix deleted file mode 100644 index cd252389ee1..00000000000 --- a/compiler/testData/integration/ant/js/outputPrefix/prefix +++ /dev/null @@ -1,3 +0,0 @@ -/* - some prefix -*/ \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/outputPrefix/root1/foo.kt b/compiler/testData/integration/ant/js/outputPrefix/root1/foo.kt deleted file mode 100644 index f6123b9882f..00000000000 --- a/compiler/testData/integration/ant/js/outputPrefix/root1/foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -fun box(): String = "OK" diff --git a/compiler/testData/integration/ant/js/outputWithoutDirectory/build.log.expected b/compiler/testData/integration/ant/js/outputWithoutDirectory/build.log.expected deleted file mode 100644 index 7a95e4fb045..00000000000 --- a/compiler/testData/integration/ant/js/outputWithoutDirectory/build.log.expected +++ /dev/null @@ -1,9 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml b/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml deleted file mode 100644 index 3a6c4536623..00000000000 --- a/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/outputWithoutDirectory/root1/foo.kt b/compiler/testData/integration/ant/js/outputWithoutDirectory/root1/foo.kt deleted file mode 100644 index f6123b9882f..00000000000 --- a/compiler/testData/integration/ant/js/outputWithoutDirectory/root1/foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -fun box(): String = "OK" diff --git a/compiler/testData/integration/ant/js/simple/build.log.expected b/compiler/testData/integration/ant/js/simple/build.log.expected deleted file mode 100644 index 438f56679ca..00000000000 --- a/compiler/testData/integration/ant/js/simple/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/simple/build.xml b/compiler/testData/integration/ant/js/simple/build.xml deleted file mode 100644 index d497ee35556..00000000000 --- a/compiler/testData/integration/ant/js/simple/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/simple/root1/foo.kt b/compiler/testData/integration/ant/js/simple/root1/foo.kt deleted file mode 100644 index 7f2587a693c..00000000000 --- a/compiler/testData/integration/ant/js/simple/root1/foo.kt +++ /dev/null @@ -1,12 +0,0 @@ -package foo - -var ok = "FAIL" - -val hello = Pair("Hello", "World") - -fun main() { - ok = "OK" - println(hello.first + " " + hello.second) -} - -fun box(): String = ok diff --git a/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/amd.js b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/amd.js deleted file mode 100644 index 5a820170b51..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/amd.js +++ /dev/null @@ -1,39 +0,0 @@ -(function(global) { - var modules = {}; - modules.kotlin = kotlin; - - // Hard-code expected dependency order since we are unable to refer to modules by filename here. - var names = ["jslib-example", "out"]; - - function define(name, dependencies, body) { - if (Array.isArray(name)) { - body = dependencies; - dependencies = name; - name = names.shift(); - } - else { - if (name !== names.shift()) throw new Error("Unexpected dependency") - } - var resolvedDependencies = []; - var currentModule = {}; - modules[name] = currentModule; - for (var i = 0; i < dependencies.length; ++i) { - var dependencyName = dependencies[i]; - resolvedDependencies[i] = dependencyName === 'exports' ? currentModule : modules[dependencyName]; - } - currentModule = body.apply(body, resolvedDependencies); - if (currentModule) { - modules[name] = currentModule; - } - } - define.amd = {}; - - function require(name) { - return modules[name]; - } - - global.define = define; - global.$kotlin_test_internal$ = { - require : require - }; -})(this); \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.log.expected b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.log.expected deleted file mode 100644 index 3dc293a7e9d..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.log.expected +++ /dev/null @@ -1,14 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: - [mkdir] Created dir: [Temp]/lib -[kotlin2js] Compiling [[TestData]/jslib-example] => [[Temp]/lib/jslib-example.js] -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - [copy] Copying 2 files to [Temp] - [copy] Copying 1 file to [Temp] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.xml b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.xml deleted file mode 100644 index 3ce340f7821..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt deleted file mode 100644 index f77e26551f9..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt +++ /dev/null @@ -1,9 +0,0 @@ -package library.sample - -import kotlin.js.Date - -public class ClassA() { - val value: Int = 100 -} - -public fun Date.extFun(): Int = 100 \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/root1/foo.kt deleted file mode 100644 index 7f2473a4c68..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/root1/foo.kt +++ /dev/null @@ -1,17 +0,0 @@ -package foo - -import library.sample.* -import kotlin.js.Date - -var ok = "FAIL" - -fun main() { - val x = ClassA().value - if (x == 100) { - ok = "OK" - } - val date = Date() - println(date.extFun()) -} - -fun box(): String = ok diff --git a/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.log.expected b/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.log.expected deleted file mode 100644 index b67fc554192..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.log.expected +++ /dev/null @@ -1,18 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: - [mkdir] Created dir: [Temp]/lib -[kotlin2js] Compiling [[TestData]/jslib-example1] => [[Temp]/lib/jslib-example1.js] -[kotlin2js] Compiling [[TestData]/jslib-example2] => [[Temp]/lib/jslib-example2.js] - [delete] Deleting: [Temp]/lib/jslib-example1.js - [delete] Deleting: [Temp]/lib/jslib-example2.js - [delete] Deleting: [Temp]/lib/jslib-example1.meta.js - [delete] Deleting: [Temp]/lib/jslib-example2.meta.js -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - [copy] Copying 1 file to [Temp] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.xml b/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.xml deleted file mode 100644 index 81696d2a5f4..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example1/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example1/LibraryExample.kt deleted file mode 100644 index 16ecae42d13..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example1/LibraryExample.kt +++ /dev/null @@ -1,9 +0,0 @@ -package library.sample - -import kotlin.js.Date - -public class ClassA() { - val value: Int = 100 -} - -public fun Date.extFun(): String = "Date.extFun" \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example2/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example2/LibraryExample.kt deleted file mode 100644 index 540ae2c6468..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example2/LibraryExample.kt +++ /dev/null @@ -1,3 +0,0 @@ -package library.sample - -public fun ClassA.extFun(): String = "ClassA.extFun" \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/root1/foo.kt deleted file mode 100644 index b6bb2e2d46e..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/root1/foo.kt +++ /dev/null @@ -1,15 +0,0 @@ -package foo - -import library.sample.* -import kotlin.js.Date - -var ok = "FAIL" - -fun main() { - val x = ClassA().value - if (x == 100 && Date().extFun() == "Date.extFun" && ClassA().extFun() == "ClassA.extFun") { - ok = "OK" - } -} - -fun box(): String = ok diff --git a/compiler/testData/integration/ant/js/simpleWithMain/build.log.expected b/compiler/testData/integration/ant/js/simpleWithMain/build.log.expected deleted file mode 100644 index 438f56679ca..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithMain/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/simpleWithMain/build.xml b/compiler/testData/integration/ant/js/simpleWithMain/build.xml deleted file mode 100644 index d497ee35556..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithMain/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/simpleWithMain/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithMain/root1/foo.kt deleted file mode 100644 index ae38953291a..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithMain/root1/foo.kt +++ /dev/null @@ -1,9 +0,0 @@ -package foo - -var ok = "FAIL" - -fun main() { - ok = "OK" -} - -fun box(): String = ok diff --git a/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.log.expected b/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.log.expected deleted file mode 100644 index 438f56679ca..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml b/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml deleted file mode 100644 index d497ee35556..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/simpleWithMainFQArgs/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithMainFQArgs/root1/foo.kt deleted file mode 100644 index 5585b13a4b0..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithMainFQArgs/root1/foo.kt +++ /dev/null @@ -1,10 +0,0 @@ -package foo - -var ok = "FAIL" - -fun main(args: kotlin.Array) { - args.size - ok = "OK" -} - -fun box(): String = ok diff --git a/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.log.expected b/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.log.expected deleted file mode 100644 index aff5c825abe..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.log.expected +++ /dev/null @@ -1,14 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: - [mkdir] Created dir: [Temp]/lib -[kotlin2js] Compiling [[TestData]/jslib-example1] => [[Temp]/lib/jslib-example1.js] -[kotlin2js] Compiling [[TestData]/jslib-example2] => [[Temp]/lib/jslib-example2.js] -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - [copy] Copying 4 files to [Temp] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.xml b/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.xml deleted file mode 100644 index 737efcce712..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example1/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example1/LibraryExample.kt deleted file mode 100644 index 16ecae42d13..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example1/LibraryExample.kt +++ /dev/null @@ -1,9 +0,0 @@ -package library.sample - -import kotlin.js.Date - -public class ClassA() { - val value: Int = 100 -} - -public fun Date.extFun(): String = "Date.extFun" \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example2/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example2/LibraryExample.kt deleted file mode 100644 index 540ae2c6468..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example2/LibraryExample.kt +++ /dev/null @@ -1,3 +0,0 @@ -package library.sample - -public fun ClassA.extFun(): String = "ClassA.extFun" \ No newline at end of file diff --git a/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/root1/foo.kt deleted file mode 100644 index b6bb2e2d46e..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/root1/foo.kt +++ /dev/null @@ -1,15 +0,0 @@ -package foo - -import library.sample.* -import kotlin.js.Date - -var ok = "FAIL" - -fun main() { - val x = ClassA().value - if (x == 100 && Date().extFun() == "Date.extFun" && ClassA().extFun() == "ClassA.extFun") { - ok = "OK" - } -} - -fun box(): String = ok diff --git a/compiler/testData/integration/ant/js/simpleWithVarargMain/build.log.expected b/compiler/testData/integration/ant/js/simpleWithVarargMain/build.log.expected deleted file mode 100644 index 438f56679ca..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithVarargMain/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml b/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml deleted file mode 100644 index d497ee35556..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/simpleWithVarargMain/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithVarargMain/root1/foo.kt deleted file mode 100644 index a3f5e1d5c8c..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithVarargMain/root1/foo.kt +++ /dev/null @@ -1,10 +0,0 @@ -package foo - -var ok = "FAIL" - -fun main(vararg args: kotlin.String) { - args.size - ok = "OK" -} - -fun box(): String = ok diff --git a/compiler/testData/integration/ant/js/simpleWithoutStdlib/build.log.expected b/compiler/testData/integration/ant/js/simpleWithoutStdlib/build.log.expected deleted file mode 100644 index 438f56679ca..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithoutStdlib/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/simpleWithoutStdlib/build.xml b/compiler/testData/integration/ant/js/simpleWithoutStdlib/build.xml deleted file mode 100644 index a827ceb9e48..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithoutStdlib/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/simpleWithoutStdlib/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithoutStdlib/root1/foo.kt deleted file mode 100644 index f6123b9882f..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithoutStdlib/root1/foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -fun box(): String = "OK" diff --git a/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/build.log.expected b/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/build.log.expected deleted file mode 100644 index c36a7c11434..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/build.log.expected +++ /dev/null @@ -1,13 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: - [mkdir] Created dir: [Temp]/lib -[kotlin2js] Compiling [[TestData]/jslib-example] => [[Temp]/lib/jslib-example.js] -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - [copy] Copying 2 files to [Temp] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/build.xml b/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/build.xml deleted file mode 100644 index e3736261c1a..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/build.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/jslib-example/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/jslib-example/LibraryExample.kt deleted file mode 100644 index faf1e678458..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/jslib-example/LibraryExample.kt +++ /dev/null @@ -1,6 +0,0 @@ -package library.sample - -public class ClassA() { - val value: Int = 100 -} - diff --git a/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/root1/foo.kt deleted file mode 100644 index 7f768caf014..00000000000 --- a/compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/root1/foo.kt +++ /dev/null @@ -1,14 +0,0 @@ -package foo - -import library.sample.* - -var ok = "FAIL" - -fun main() { - val x = ClassA().value - if (x == 100) { - ok = "OK" - } -} - -fun box(): String = ok diff --git a/compiler/testData/integration/ant/js/sourceMap/build.log.expected b/compiler/testData/integration/ant/js/sourceMap/build.log.expected deleted file mode 100644 index 438f56679ca..00000000000 --- a/compiler/testData/integration/ant/js/sourceMap/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/sourceMap/build.xml b/compiler/testData/integration/ant/js/sourceMap/build.xml deleted file mode 100644 index e0cdedaaf14..00000000000 --- a/compiler/testData/integration/ant/js/sourceMap/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/sourceMap/root1/foo.kt b/compiler/testData/integration/ant/js/sourceMap/root1/foo.kt deleted file mode 100644 index f6123b9882f..00000000000 --- a/compiler/testData/integration/ant/js/sourceMap/root1/foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -fun box(): String = "OK" diff --git a/compiler/testData/integration/ant/js/suppressWarnings/build.log.expected b/compiler/testData/integration/ant/js/suppressWarnings/build.log.expected deleted file mode 100644 index 438f56679ca..00000000000 --- a/compiler/testData/integration/ant/js/suppressWarnings/build.log.expected +++ /dev/null @@ -1,10 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/suppressWarnings/build.xml b/compiler/testData/integration/ant/js/suppressWarnings/build.xml deleted file mode 100644 index e1727965c10..00000000000 --- a/compiler/testData/integration/ant/js/suppressWarnings/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/suppressWarnings/root1/foo.kt b/compiler/testData/integration/ant/js/suppressWarnings/root1/foo.kt deleted file mode 100644 index 996c64e3ab0..00000000000 --- a/compiler/testData/integration/ant/js/suppressWarnings/root1/foo.kt +++ /dev/null @@ -1,13 +0,0 @@ -package foo - -import kotlin.Any - -fun foo(p: Int??) { - -} - -interface T { - abstract fun foo() -} - -fun box(): String = "OK" diff --git a/compiler/testData/integration/ant/js/verbose/build.log.expected b/compiler/testData/integration/ant/js/verbose/build.log.expected deleted file mode 100644 index 47e94efe601..00000000000 --- a/compiler/testData/integration/ant/js/verbose/build.log.expected +++ /dev/null @@ -1,13 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] -[kotlin2js] logging: using Kotlin home directory [KotlinProjectHome]/dist/kotlinc -[kotlin2js] logging: exception on loading scripting plugin: java.lang.ClassNotFoundException: org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCompilerConfigurationComponentRegistrar -[kotlin2js] logging: compiling source files: [TestData]/root1/foo.kt - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/verbose/build.xml b/compiler/testData/integration/ant/js/verbose/build.xml deleted file mode 100644 index b275d4415a4..00000000000 --- a/compiler/testData/integration/ant/js/verbose/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/verbose/root1/foo.kt b/compiler/testData/integration/ant/js/verbose/root1/foo.kt deleted file mode 100644 index f6123b9882f..00000000000 --- a/compiler/testData/integration/ant/js/verbose/root1/foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -fun box(): String = "OK" diff --git a/compiler/testData/integration/ant/js/version/build.log.expected b/compiler/testData/integration/ant/js/version/build.log.expected deleted file mode 100644 index d7e22d9ebdf..00000000000 --- a/compiler/testData/integration/ant/js/version/build.log.expected +++ /dev/null @@ -1,11 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: -[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] -[kotlin2js] info: kotlinc-js [KotlinVersion] (JRE [JREVersion]) - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/js/version/build.xml b/compiler/testData/integration/ant/js/version/build.xml deleted file mode 100644 index 8e5674cf26d..00000000000 --- a/compiler/testData/integration/ant/js/version/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/compiler/testData/integration/ant/js/version/root1/foo.kt b/compiler/testData/integration/ant/js/version/root1/foo.kt deleted file mode 100644 index f6123b9882f..00000000000 --- a/compiler/testData/integration/ant/js/version/root1/foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -fun box(): String = "OK" diff --git a/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java b/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java deleted file mode 100644 index 5ef3d2e1ea0..00000000000 --- a/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.integration; - -import com.intellij.openapi.util.io.FileUtil; -import kotlin.collections.CollectionsKt; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.js.testOld.NashornJsTestChecker; -import org.jetbrains.kotlin.js.testOld.V8JsTestChecker; -import org.jetbrains.kotlin.test.util.KtTestUtil; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class AntTaskJsTest extends AbstractAntTaskTest { - private static final String JS_OUT_FILE = "out.js"; - private static final Boolean useNashorn = Boolean.getBoolean("kotlin.js.useNashorn"); - - @NotNull - private String getTestDataDir() { - return KtTestUtil.getTestDataPathBase() + "/integration/ant/js/" + getTestName(true); - } - - @NotNull - private File getOutputFileByName(@NotNull String name) { - return new File(tmpdir, name); - } - - private void doTest() throws Exception { - doTest(getTestDataDir()); - } - - private void doJsAntTest(String... jsFiles) throws Exception { - doJsAntTest(false, jsFiles); - } - - private void doJsAntTest(boolean withModuleSystem, String... jsFiles) throws Exception { - doTest(); - - List fileNames = new ArrayList<>(Arrays.asList(jsFiles)); - fileNames.add(JS_OUT_FILE); - - List filePaths = CollectionsKt.map(fileNames, s -> getOutputFileByName(s).getAbsolutePath()); - - (useNashorn ? NashornJsTestChecker.INSTANCE : V8JsTestChecker.INSTANCE).check(filePaths, "out", "foo", "box", "OK", withModuleSystem, null); - } - - private void doJsAntTestForPostfixPrefix(@Nullable String prefix, @Nullable String postfix) throws Exception { - doJsAntTest(); - File outputFile = getOutputFileByName(JS_OUT_FILE); - - File prefixFile = prefix != null ? new File(getTestDataDir(), prefix) : null; - File postfixFile = postfix != null ? new File(getTestDataDir(), postfix) : null; - - checkFilePrefixPostfix(outputFile, prefixFile, postfixFile); - } - - private static void checkFilePrefixPostfix(@NotNull File file, @Nullable File prefix, @Nullable File postfix) throws IOException { - String fileContent = FileUtil.loadFile(file, true); - - if (prefix != null) { - String prefixContent = FileUtil.loadFile(prefix, true); - assertTrue(fileContent.startsWith(prefixContent)); - } - - if (postfix != null) { - String postfixContent = FileUtil.loadFile(postfix, true); - assertTrue(fileContent.endsWith(postfixContent)); - } - } - - public void testSimple() throws Exception { - doJsAntTest(); - } - - public void testSimpleWithMain() throws Exception { - doJsAntTest(); - } - - public void testSimpleWithoutStdlib() throws Exception { - doJsAntTest(); - } - - public void testSimpleWithoutStdlibAndFolderAsAnotherLib() throws Exception { - doJsAntTest("jslib-example.js"); - } - - public void testSimpleWithoutStdlibAndJsFileAsAnotherLib() throws Exception { - doJsAntTest("jslib-example.js"); - } - - public void testSimpleWithJsFileAsAnotherLib() throws Exception { - doJsAntTest("jslib-example.js"); - } - - public void testSimpleWithJsFileAsAnotherLibModuleKind() throws Exception { - doJsAntTest(true, "amd.js", "jslib-example.js"); - } - - public void testSimpleWithTwoJsFilesAsLibraries() throws Exception { - doJsAntTest("jslib-example1.js", "jslib-example2.js"); - } - - public void testSimpleWithJsFilesWithTwoModulesAsLibrary() throws Exception { - doJsAntTest("jslib-example.js"); - } - - public void testSimpleWithMainFQArgs() throws Exception { - doJsAntTest(); - } - - public void testSimpleWithVarargMain() throws Exception { - doJsAntTest(); - } - - public void testManySources() throws Exception { - doJsAntTest(); - } - - public void testAdditionalArguments() throws Exception { - doJsAntTest(); - } - - public void testSuppressWarnings() throws Exception { - doJsAntTest(); - } - - public void testVerbose() throws Exception { - doJsAntTest(); - } - - public void testVersion() throws Exception { - doJsAntTest(); - } - - public void testOutputWithoutDirectory() throws Exception { - doJsAntTest(); - } - - public void testNoSrcParam() throws Exception { - doTest(); - } - - public void testNoOutputParam() throws Exception { - doTest(); - } - - public void testOutputPrefix() throws Exception { - doJsAntTestForPostfixPrefix("prefix", null); - } - - public void testOutputPostfix() throws Exception { - doJsAntTestForPostfixPrefix(null, "postfix"); - } - - public void testBothPrefixAndPostfix() throws Exception { - doJsAntTestForPostfixPrefix("prefix", "postfix"); - } - - public void testSourceMap() throws Exception { - doJsAntTest(); - - File sourceMap = getOutputFileByName(JS_OUT_FILE + ".map"); - assertTrue("Source map file \"" + sourceMap.getAbsolutePath() + "\" not found", sourceMap.exists()); - } -}