Coin completion tests moved from class name to normal

java/java-tests/testData/codeInsight/completion/normal/OnlyResourcesInResourceList1.java

@@ -1,6 +1,6 @@
 class MyClass {
   void f() {
-    try (<caret>) {
+    try (A<caret>) {
     }
   }
 }

java/java-tests/testData/codeInsight/completion/normal/OnlyResourcesInResourceList4.java

@@ -0,0 +1,8 @@
+class MyClass {
+  static class MyResource implements AutoCloseable { }
+
+  void f() {
+    try (MyResource r1 = null; My<caret>) {
+    }
+  }
+}

java/java-tests/testData/codeInsight/completion/normal/OnlyResourcesInResourceList4_after.java

@@ -0,0 +1,8 @@
+class MyClass {
+  static class MyResource implements AutoCloseable { }
+
+  void f() {
+    try (MyResource r1 = null; MyResource<caret>) {
+    }
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java

@@ -221,16 +221,6 @@ public class ClassNameCompletionTest extends CompletionTestCase {
     checkResultByFile(BASE_PATH + "/nameCompletion/java/" + getTestName(false) + "-result.java");
   }
 
-  public void testInMultiCatchType1() throws Exception { doJavaTest(); }
-
-  public void testInMultiCatchType2() throws Exception { doJavaTest(); }
-
-  public void testInResourceList1() throws Exception { doJavaTest(); }
-
-  public void testInResourceList2() throws Exception { doJavaTest(); }
-
-  public void testInResourceList3() throws Exception { doJavaTest(); }
-
   private void doJavaTest() throws Exception {
     final String path = BASE_PATH + "/nameCompletion/java";
     configureByFileNoCompletion(path + "/" + getTestName(false) + "-source.java");

java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal17CompletionTest.groovy

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2000-2011 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 com.intellij.codeInsight.completion
+
+import com.intellij.JavaTestUtil
+import com.intellij.testFramework.LightProjectDescriptor
+
+public class Normal17CompletionTest extends LightFixtureCompletionTestCase {
+  @Override
+  protected String getBasePath() {
+    return JavaTestUtil.getRelativeJavaTestDataPath() + "/codeInsight/completion/normal/";
+  }
+
+  @Override
+  protected LightProjectDescriptor getProjectDescriptor() {
+    return JAVA_LATEST
+  }
+
+  public void testOnlyExceptionsInMultiCatch1() { doTest() }
+  public void testOnlyExceptionsInMultiCatch2() { doTest() }
+
+  public void testOnlyResourcesInResourceList1() { doTest() }
+  public void testOnlyResourcesInResourceList2() { doTest() }
+  public void testOnlyResourcesInResourceList3() { doTest() }
+  public void testOnlyResourcesInResourceList4() { doTest() }
+
+  private void doTest() {
+    configureByFile(getTestName(false) + ".java")
+    checkResultByFile(getTestName(false) + "_after.java")
+  }
+}