Similar highlighting tests united

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/enumSyntheticMethods.java

@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+enum Color {
+  RED, GREEN, BLUE;
+
+  void foo () {
+    for (Color c : values ()) {
+    }
+
+    Color red = valueOf("RED");
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/staticImports/P1/C1.java

@@ -0,0 +1,20 @@
+/*
+ * 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 P1;
+
+public class C1 {
+    public static int Foo;
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/staticImports/P1/C2.java

@@ -0,0 +1,20 @@
+/*
+ * 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 P1;
+
+public class C2 {
+    public static int Foo;
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/staticImports/staticImports.java

@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+import static P1.C1.<error descr="Cannot resolve symbol 'Bar'">Bar</error>;
+import static P1.C1.Foo;
+import static <error descr="Field 'Foo' is already defined in a single static import">P1.C2.Foo</error>;
+
+import static java.lang.Byte.valueOf;
+import static java.lang.Integer.valueOf;
+
+class C {}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingJdk7Test.java

@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NonNls;
  * For "lightweight" tests use LightAdvHighlightingTest
  */
 public class AdvHighlightingJdk7Test extends DaemonAnalyzerTestCase {
-  @NonNls private static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/advHighlighting";
+  @NonNls private static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/advHighlighting7/";
 
   @Override
   protected Sdk getTestProjectJdk() {
@@ -41,7 +41,15 @@ public class AdvHighlightingJdk7Test extends DaemonAnalyzerTestCase {
     return new LocalInspectionTool[]{new DefUseInspection()};
   }
 
+  public void testStaticImports() throws Exception {
+    doTest(BASE_PATH + "staticImports/staticImports.java", BASE_PATH + "/staticImports", false, false);
+  }
+
+  public void testEnumSyntheticMethods() throws Exception {
+    doTest(BASE_PATH + getTestName(true) + ".java", false, false);
+  }
+
   public void testStaticImportConflict() throws Exception {
-    doTest(BASE_PATH + "/staticImportConflict/Usage.java", BASE_PATH + "/staticImportConflict", false, false);
+    doTest(BASE_PATH + "staticImportConflict/Usage.java", BASE_PATH + "/staticImportConflict", false, false);
   }
 }