From 461b64e0e7822c4509dd44dc909a96eeca130f9a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 23 Aug 2013 00:02:54 +0400 Subject: [PATCH] Removed old injava completion test (all cases are covered by common source/binary tests). --- .../completion/injava/ClassFromPackage.java | 9 --- .../completion/injava/ClassFromPackage.kt | 6 -- .../completion/injava/JetClassInJava.java | 7 --- .../completion/injava/JetClassInJava.kt | 4 -- .../completion/injava/JetEnumFields.java | 7 --- .../completion/injava/JetEnumFields.kt | 7 --- idea/testData/completion/injava/JetEnums.java | 7 --- idea/testData/completion/injava/JetEnums.kt | 31 ---------- .../completion/injava/JetFunction.java | 7 --- .../testData/completion/injava/JetFunction.kt | 5 -- .../completion/injava/JetSubpackage.java | 11 ---- .../completion/injava/JetSubpackage.kt | 4 -- .../completion/injava/TraitInJava.java | 6 -- .../testData/completion/injava/TraitInJava.kt | 4 -- .../completion/JetInJavaCompletionTest.java | 61 ------------------- 15 files changed, 176 deletions(-) delete mode 100644 idea/testData/completion/injava/ClassFromPackage.java delete mode 100644 idea/testData/completion/injava/ClassFromPackage.kt delete mode 100644 idea/testData/completion/injava/JetClassInJava.java delete mode 100644 idea/testData/completion/injava/JetClassInJava.kt delete mode 100644 idea/testData/completion/injava/JetEnumFields.java delete mode 100644 idea/testData/completion/injava/JetEnumFields.kt delete mode 100644 idea/testData/completion/injava/JetEnums.java delete mode 100644 idea/testData/completion/injava/JetEnums.kt delete mode 100644 idea/testData/completion/injava/JetFunction.java delete mode 100644 idea/testData/completion/injava/JetFunction.kt delete mode 100644 idea/testData/completion/injava/JetSubpackage.java delete mode 100644 idea/testData/completion/injava/JetSubpackage.kt delete mode 100644 idea/testData/completion/injava/TraitInJava.java delete mode 100644 idea/testData/completion/injava/TraitInJava.kt delete mode 100644 idea/tests/org/jetbrains/jet/completion/JetInJavaCompletionTest.java diff --git a/idea/testData/completion/injava/ClassFromPackage.java b/idea/testData/completion/injava/ClassFromPackage.java deleted file mode 100644 index 632afe633cc..00000000000 --- a/idea/testData/completion/injava/ClassFromPackage.java +++ /dev/null @@ -1,9 +0,0 @@ -public class Testing { - public static void test() { - jettesting.some. - } -} - -// EXIST: ClassFromJet -// EXIST: SomePackage -// NUMBER: 2 diff --git a/idea/testData/completion/injava/ClassFromPackage.kt b/idea/testData/completion/injava/ClassFromPackage.kt deleted file mode 100644 index f00d4e3bb3d..00000000000 --- a/idea/testData/completion/injava/ClassFromPackage.kt +++ /dev/null @@ -1,6 +0,0 @@ -package jettesting.some - -fun foo() = 1 - -class ClassFromJet { -} diff --git a/idea/testData/completion/injava/JetClassInJava.java b/idea/testData/completion/injava/JetClassInJava.java deleted file mode 100644 index 249911155f2..00000000000 --- a/idea/testData/completion/injava/JetClassInJava.java +++ /dev/null @@ -1,7 +0,0 @@ -public class Testing { - public static void test() { - ClassFr - } -} - -// EXIST: ClassFromJet diff --git a/idea/testData/completion/injava/JetClassInJava.kt b/idea/testData/completion/injava/JetClassInJava.kt deleted file mode 100644 index c9151e568e3..00000000000 --- a/idea/testData/completion/injava/JetClassInJava.kt +++ /dev/null @@ -1,4 +0,0 @@ -package jettesting - -class ClassFromJet { -} \ No newline at end of file diff --git a/idea/testData/completion/injava/JetEnumFields.java b/idea/testData/completion/injava/JetEnumFields.java deleted file mode 100644 index 7d51ac84c67..00000000000 --- a/idea/testData/completion/injava/JetEnumFields.java +++ /dev/null @@ -1,7 +0,0 @@ -public class Testing { - public static void test() { - kotlin.enums.KtEnumColor. - } -} - -// EXIST: RED, GREEN, BLUE diff --git a/idea/testData/completion/injava/JetEnumFields.kt b/idea/testData/completion/injava/JetEnumFields.kt deleted file mode 100644 index 3edfe0655f6..00000000000 --- a/idea/testData/completion/injava/JetEnumFields.kt +++ /dev/null @@ -1,7 +0,0 @@ -package kotlin.enums - -enum class KtEnumColor(val rgb : Int) { - RED : Color(0xFF0000) - GREEN : Color(0x00FF00) - BLUE : Color(0x0000FF) -} diff --git a/idea/testData/completion/injava/JetEnums.java b/idea/testData/completion/injava/JetEnums.java deleted file mode 100644 index ae0d7444a86..00000000000 --- a/idea/testData/completion/injava/JetEnums.java +++ /dev/null @@ -1,7 +0,0 @@ -public class Testing { - public static void test() { - KtEnum - } -} - -// EXIST: KtEnumDirection, KtEnumColor, KtEnumList diff --git a/idea/testData/completion/injava/JetEnums.kt b/idea/testData/completion/injava/JetEnums.kt deleted file mode 100644 index a83cb306f83..00000000000 --- a/idea/testData/completion/injava/JetEnums.kt +++ /dev/null @@ -1,31 +0,0 @@ -package kotlin.enums - -enum class KtEnumDirection { - NORTH - SOUTH - WEST - EAST -} - -enum class KtEnumColor(val rgb : Int) { - RED : Color(0xFF0000) - GREEN : Color(0x00FF00) - BLUE : Color(0x0000FF) -} - -//enum class KtEnumProtocolState { -// WAITING { -// override fun signal() = TALKING -// } -// -// TALKING { -// override fun signal() = WAITING -// } -// -// abstract fun signal() : ProtocolState -//} - -enum class KtEnumList(val size : Int) { - Nil : List(0) - Cons(h : T, t : List) : List(t.size + 1) -} \ No newline at end of file diff --git a/idea/testData/completion/injava/JetFunction.java b/idea/testData/completion/injava/JetFunction.java deleted file mode 100644 index 7975b254956..00000000000 --- a/idea/testData/completion/injava/JetFunction.java +++ /dev/null @@ -1,7 +0,0 @@ -public class Testing { - public static void main(String[] args) { - kotlin.testing.TestingPackage. - } -} - -// EXIST: someFun diff --git a/idea/testData/completion/injava/JetFunction.kt b/idea/testData/completion/injava/JetFunction.kt deleted file mode 100644 index 15a14df9ba9..00000000000 --- a/idea/testData/completion/injava/JetFunction.kt +++ /dev/null @@ -1,5 +0,0 @@ -package kotlin.testing - -fun someFun() : Int { - return 12 -} \ No newline at end of file diff --git a/idea/testData/completion/injava/JetSubpackage.java b/idea/testData/completion/injava/JetSubpackage.java deleted file mode 100644 index cd7a9fe9f01..00000000000 --- a/idea/testData/completion/injava/JetSubpackage.java +++ /dev/null @@ -1,11 +0,0 @@ -public class Testing { - public static void test() { - testing. - } -} - -// EXIST: jet1 -// ABSENT: jet2 - -// Only two proposals expected -// NUMBER: 1 diff --git a/idea/testData/completion/injava/JetSubpackage.kt b/idea/testData/completion/injava/JetSubpackage.kt deleted file mode 100644 index 430d85149cc..00000000000 --- a/idea/testData/completion/injava/JetSubpackage.kt +++ /dev/null @@ -1,4 +0,0 @@ -package testing.jet1.jet2 - -fun somefun() { -} \ No newline at end of file diff --git a/idea/testData/completion/injava/TraitInJava.java b/idea/testData/completion/injava/TraitInJava.java deleted file mode 100644 index 0f32a7221ed..00000000000 --- a/idea/testData/completion/injava/TraitInJava.java +++ /dev/null @@ -1,6 +0,0 @@ -public class Testing implements TraitFr { - public static void test() { - } -} - -// EXIST: TraitFromJet diff --git a/idea/testData/completion/injava/TraitInJava.kt b/idea/testData/completion/injava/TraitInJava.kt deleted file mode 100644 index 11716db1dce..00000000000 --- a/idea/testData/completion/injava/TraitInJava.kt +++ /dev/null @@ -1,4 +0,0 @@ -package jettesting.traits - -trait TraitFromJet { -} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/completion/JetInJavaCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetInJavaCompletionTest.java deleted file mode 100644 index f252b8249df..00000000000 --- a/idea/tests/org/jetbrains/jet/completion/JetInJavaCompletionTest.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.completion; - -import org.jetbrains.jet.plugin.PluginTestCaseBase; - -public class JetInJavaCompletionTest extends JetCompletionMultiTestBase { - - public void testJetClassInJava() { - doFileTest(); - } - - public void testJetSubpackage() { - doFileTest(); - } - - public void testClassFromPackage() { - doFileTest(); - } - - public void testJetFunction() { - doFileTest(); - } - - public void testTraitInJava() { - doFileTest(); - } - - public void testJetEnums() { - doFileTest(); - } - - public void testJetEnumFields() { - doFileTest(); - } - - @Override - protected String getTestDataPath() { - return PluginTestCaseBase.getTestDataPathBase() + "/completion/injava/"; - } - - @Override - String[] getFileNameList() { - String fileName = getTestName(false); - return new String[]{fileName + ".java", fileName + ".kt"}; - } -}