Move class completion tests into ordinal tests

idea/testData/completion/basic/InExpressionNoPrefix.kt

@@ -4,6 +4,6 @@ class Test {
     }
 }
 
-// RUNTIME: 1
 // EXIST: Any, Nothing, Unit, Int, Number
-// EXIST: Array, Math, Hashable, OutputStream
+// EXIST: Array, Hashable
+// EXIST_JAVA_ONLY: Math, Thread

idea/testData/completion/basic/InExtendTypeAnnotation.kt

@@ -3,6 +3,6 @@ class Test : <caret> {
     }
 }
 
-// RUNTIME: 1
 // EXIST: Any, Nothing, Unit, Int, Number
-// EXIST: Array, Math, Hashable, OutputStream
+// EXIST: Array, Hashable
+// EXIST_JAVA_ONLY: Math, Thread

idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java

@@ -173,6 +173,16 @@ public class JetBasicJSCompletionTest extends AbstractJetJSCompletionTest {
             doTest("idea/testData/completion/basic/InEmptyImport.kt");
         }
         
+        @TestMetadata("InExpressionNoPrefix.kt")
+        public void testInExpressionNoPrefix() throws Exception {
+            doTest("idea/testData/completion/basic/InExpressionNoPrefix.kt");
+        }
+        
+        @TestMetadata("InExtendTypeAnnotation.kt")
+        public void testInExtendTypeAnnotation() throws Exception {
+            doTest("idea/testData/completion/basic/InExtendTypeAnnotation.kt");
+        }
+        
         @TestMetadata("InFileWithMultiDeclaration.kt")
         public void testInFileWithMultiDeclaration() throws Exception {
             doTest("idea/testData/completion/basic/InFileWithMultiDeclaration.kt");

idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java

@@ -173,6 +173,16 @@ public class JetBasicJavaCompletionTest extends AbstractJavaCompletionTest {
             doTest("idea/testData/completion/basic/InEmptyImport.kt");
         }
         
+        @TestMetadata("InExpressionNoPrefix.kt")
+        public void testInExpressionNoPrefix() throws Exception {
+            doTest("idea/testData/completion/basic/InExpressionNoPrefix.kt");
+        }
+        
+        @TestMetadata("InExtendTypeAnnotation.kt")
+        public void testInExtendTypeAnnotation() throws Exception {
+            doTest("idea/testData/completion/basic/InExtendTypeAnnotation.kt");
+        }
+        
         @TestMetadata("InFileWithMultiDeclaration.kt")
         public void testInFileWithMultiDeclaration() throws Exception {
             doTest("idea/testData/completion/basic/InFileWithMultiDeclaration.kt");

idea/tests/org/jetbrains/jet/completion/JetClassCompletionTest.java

@@ -1,45 +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 com.intellij.codeInsight.completion.CompletionType;
-import org.jetbrains.jet.plugin.PluginTestCaseBase;
-
-import java.io.File;
-
-public class JetClassCompletionTest extends JetCompletionTestBase {
-
-    public void testInExpressionNoPrefix() {
-
-        doTest();
-    }
-
-    public void testInExtendTypeAnnotation() {
-        doTest();
-    }
-
-    @Override
-    protected CompletionType getCompletionType(String testName, String fileText) {
-        return CompletionType.BASIC;
-    }
-
-    @Override
-    protected String getTestDataPath() {
-        return new File(PluginTestCaseBase.getTestDataPathBase(), "/completion/class").getPath() +
-               File.separator;
-    }
-}