From f5ec8d685071a818a537fcc4e249289ff0964ada Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 5 Jun 2015 15:50:48 +0300 Subject: [PATCH] Minor, delete useless test 'withKotlinNoJavaSources' tests exactly the same --- .../integration/ant/jvm/noClasspathGiven/J.java | 4 ---- .../ant/jvm/noClasspathGiven/build.log.expected | 14 -------------- .../integration/ant/jvm/noClasspathGiven/build.xml | 13 ------------- .../integration/ant/jvm/noClasspathGiven/hello.kt | 5 ----- .../kotlin/integration/AntTaskTestGenerated.java | 6 ------ 5 files changed, 42 deletions(-) delete mode 100644 compiler/testData/integration/ant/jvm/noClasspathGiven/J.java delete mode 100644 compiler/testData/integration/ant/jvm/noClasspathGiven/build.log.expected delete mode 100644 compiler/testData/integration/ant/jvm/noClasspathGiven/build.xml delete mode 100644 compiler/testData/integration/ant/jvm/noClasspathGiven/hello.kt diff --git a/compiler/testData/integration/ant/jvm/noClasspathGiven/J.java b/compiler/testData/integration/ant/jvm/noClasspathGiven/J.java deleted file mode 100644 index 6802ccd0451..00000000000 --- a/compiler/testData/integration/ant/jvm/noClasspathGiven/J.java +++ /dev/null @@ -1,4 +0,0 @@ -package hello; - -public class J { -} diff --git a/compiler/testData/integration/ant/jvm/noClasspathGiven/build.log.expected b/compiler/testData/integration/ant/jvm/noClasspathGiven/build.log.expected deleted file mode 100644 index 32882961591..00000000000 --- a/compiler/testData/integration/ant/jvm/noClasspathGiven/build.log.expected +++ /dev/null @@ -1,14 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: - [mkdir] Created dir: [Temp]/classes - [javac] Compiling 2 source files to [Temp]/classes - [javac] Compiling [[TestData]] => [[Temp]/classes] - [javac] Running javac... - [jar] Building jar: [Temp]/hello.jar - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/jvm/noClasspathGiven/build.xml b/compiler/testData/integration/ant/jvm/noClasspathGiven/build.xml deleted file mode 100644 index 3b3c222aab9..00000000000 --- a/compiler/testData/integration/ant/jvm/noClasspathGiven/build.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/compiler/testData/integration/ant/jvm/noClasspathGiven/hello.kt b/compiler/testData/integration/ant/jvm/noClasspathGiven/hello.kt deleted file mode 100644 index 6c9ab7fe60a..00000000000 --- a/compiler/testData/integration/ant/jvm/noClasspathGiven/hello.kt +++ /dev/null @@ -1,5 +0,0 @@ -package hello - -fun main(args: Array) { - println("Hello!") -} diff --git a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java index 8fa5c7d745c..97f00ca2681 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java @@ -59,12 +59,6 @@ public class AntTaskTestGenerated extends AbstractAntTaskTest { doTest(fileName); } - @TestMetadata("noClasspathGiven") - public void testNoClasspathGiven() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/noClasspathGiven/"); - doTest(fileName); - } - @TestMetadata("suppressWarnings") public void testSuppressWarnings() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/suppressWarnings/");