KT-1051 Java interoperability completion - more tests

idea/testData/completion/injava/ClassFromNamespace.java

@@ -0,0 +1,9 @@
+public class Testing {
+    public static void test() {
+        jettesting.some.<caret>
+    }
+}
+
+// EXIST: ClassFromJet
+// EXIST: namespace
+// NUMBER: 2

idea/testData/completion/injava/ClassFromNamespace.kt

@@ -0,0 +1,4 @@
+package jettesting.some
+
+class ClassFromJet {
+}

idea/testData/completion/injava/TopLevelPackages.java

@@ -1,7 +0,0 @@
-public class Testing {
-    public static void test() {
-        jett<caret>
-    }
-}
-
-// EXIST: jettesting

idea/testData/completion/injava/TopLevelPackages.kt

@@ -1,4 +0,0 @@
-package jettesting
-
-class ClassFromJet {
-}

idea/testData/completion/injava/TraitInJava.java

@@ -0,0 +1,6 @@
+public class Testing implements TraitFr<caret> {
+    public static void test() {
+    }
+}
+
+// EXIST: TraitFromJet

idea/testData/completion/injava/TraitInJava.kt

@@ -0,0 +1,4 @@
+package jettesting.traits
+
+trait TraitFromJet {
+}

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

@@ -17,23 +17,27 @@ public abstract class JetCompletionMultiTestBase extends CompletionTestCase {
      * @param completionLevel {@see CompletionParameters.getInvocationCount()} javadoc
      * @throws Exception
      */
-    protected void doFileTest(int completionLevel) throws Exception {
-        configureByFiles(null, getFileNameList());
-        complete(completionLevel);
+    protected void doFileTest(int completionLevel) {
+        try {
+            configureByFiles(null, getFileNameList());
+            complete(completionLevel);
 
-        final String fileText = getFile().getText();
-        final ExpectedCompletionUtils completionUtils = new ExpectedCompletionUtils();
+            final String fileText = getFile().getText();
+            final ExpectedCompletionUtils completionUtils = new ExpectedCompletionUtils();
 
-        assertContainsItems(completionUtils.itemsShouldExist(fileText));
-        assertNotContainItems(completionUtils.itemsShouldAbsent(fileText));
+            assertContainsItems(completionUtils.itemsShouldExist(fileText));
+            assertNotContainItems(completionUtils.itemsShouldAbsent(fileText));
 
-        Integer itemsNumber = completionUtils.getExpectedNumber(fileText);
-        if (itemsNumber != null) {
-            assertEquals(itemsNumber.intValue(), myItems.length);
+            Integer itemsNumber = completionUtils.getExpectedNumber(fileText);
+            if (itemsNumber != null) {
+                assertEquals(itemsNumber.intValue(), myItems.length);
+            }
+        } catch (Exception e) {
+            throw new AssertionError(e);
         }
     }
 
-    protected void doFileTest() throws Exception {
+    protected void doFileTest() {
         doFileTest(1);
     }
 

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

@@ -7,16 +7,23 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase;
  */
 public class JetInJavaCompletionTest extends JetCompletionMultiTestBase {
 
-    public void testJetClassInJava() throws Exception {
+    public void testJetClassInJava() {
         doFileTest();
     }
 
-    public void testJetSubpackage() throws Exception {
+    public void testJetSubpackage() {
         doFileTest();
     }
 
-    // TODO: fix and uncomment
-    public void skiptestTopLevelPackages() throws Exception {
+    public void testClassFromNamespace() {
+        doFileTest();
+    }
+
+    public void testJetFunction() {
+        doFileTest();
+    }
+
+    public void testTraitInJava() {
         doFileTest();
     }