From 7521c516165e1a1aa2149b27139b6db7b61c7525 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 1 Feb 2013 21:43:45 +0400
Subject: [PATCH] Name case conflict fixed, sorry

---
 .../advHighlighting/packageClassClash/pkg/Sub.java            | 3 ---
 .../com/intellij/codeInsight/daemon/AdvHighlightingTest.java  | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/packageClassClash/pkg/Sub.java

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/packageClassClash/pkg/Sub.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/packageClassClash/pkg/Sub.java
deleted file mode 100644
index bea47a75e0e3..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/packageClassClash/pkg/Sub.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package pkg;
-
-public class Sub { }
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingTest.java
index 6f4e704ad43f..8e252db02ff8 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingTest.java
@@ -294,9 +294,9 @@ public class AdvHighlightingTest extends DaemonAnalyzerTestCase {
     doTest(BASE_PATH + "/packageClassClash/pkg/sub.java", BASE_PATH + "/packageClassClash", false, false);
   }
 
-  public void testPackageAndClassConflict3() throws Exception {
+  /*public void testPackageAndClassConflict3() throws Exception {
     doTest(BASE_PATH + "/packageClassClash/pkg/Sub.java", BASE_PATH + "/packageClassClash", false, false);
-  }
+  }*/
 
   public void testDefaultPackageAndClassConflict() throws Exception {
     doTest(BASE_PATH + "/packageClassClash/java/lang.java", false, false);