From 2912d6965bdb8472aea4d1bf6702bf53a1e6e2e3 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@intellij.com>
Date: Fri, 25 Sep 2009 20:54:27 +0400
Subject: [PATCH] moving tests to CE

---
 .../inspection/equalsAndHashcode/hierarchy/expected.xml     | 0
 .../inspection/equalsAndHashcode/hierarchy/src/A.java       | 0
 .../inspection/equalsAndHashcode/hierarchy/src/B.java       | 0
 .../inspection/equalsAndHashcode/innerClass/expected.xml    | 0
 .../inspection/equalsAndHashcode/innerClass/src/Test.java   | 0
 .../intellij/codeInspection/EntryPointsConverterTest.java   | 4 ++--
 .../com/intellij/codeInspection/EqualsAndHashCodeTest.java  | 6 ++++++
 7 files changed, 8 insertions(+), 2 deletions(-)
 rename {testData => java/java-tests/testData}/inspection/equalsAndHashcode/hierarchy/expected.xml (100%)
 rename {testData => java/java-tests/testData}/inspection/equalsAndHashcode/hierarchy/src/A.java (100%)
 rename {testData => java/java-tests/testData}/inspection/equalsAndHashcode/hierarchy/src/B.java (100%)
 rename {testData => java/java-tests/testData}/inspection/equalsAndHashcode/innerClass/expected.xml (100%)
 rename {testData => java/java-tests/testData}/inspection/equalsAndHashcode/innerClass/src/Test.java (100%)
 rename {inspections/tests => java/java-tests/testSrc}/com/intellij/codeInspection/EntryPointsConverterTest.java (91%)
 rename {inspections/tests => java/java-tests/testSrc}/com/intellij/codeInspection/EqualsAndHashCodeTest.java (86%)

diff --git a/testData/inspection/equalsAndHashcode/hierarchy/expected.xml b/java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/expected.xml
similarity index 100%
rename from testData/inspection/equalsAndHashcode/hierarchy/expected.xml
rename to java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/expected.xml
diff --git a/testData/inspection/equalsAndHashcode/hierarchy/src/A.java b/java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/src/A.java
similarity index 100%
rename from testData/inspection/equalsAndHashcode/hierarchy/src/A.java
rename to java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/src/A.java
diff --git a/testData/inspection/equalsAndHashcode/hierarchy/src/B.java b/java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/src/B.java
similarity index 100%
rename from testData/inspection/equalsAndHashcode/hierarchy/src/B.java
rename to java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/src/B.java
diff --git a/testData/inspection/equalsAndHashcode/innerClass/expected.xml b/java/java-tests/testData/inspection/equalsAndHashcode/innerClass/expected.xml
similarity index 100%
rename from testData/inspection/equalsAndHashcode/innerClass/expected.xml
rename to java/java-tests/testData/inspection/equalsAndHashcode/innerClass/expected.xml
diff --git a/testData/inspection/equalsAndHashcode/innerClass/src/Test.java b/java/java-tests/testData/inspection/equalsAndHashcode/innerClass/src/Test.java
similarity index 100%
rename from testData/inspection/equalsAndHashcode/innerClass/src/Test.java
rename to java/java-tests/testData/inspection/equalsAndHashcode/innerClass/src/Test.java
diff --git a/inspections/tests/com/intellij/codeInspection/EntryPointsConverterTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/EntryPointsConverterTest.java
similarity index 91%
rename from inspections/tests/com/intellij/codeInspection/EntryPointsConverterTest.java
rename to java/java-tests/testSrc/com/intellij/codeInspection/EntryPointsConverterTest.java
index 52e88fba1f6f..c3700b368cfc 100644
--- a/inspections/tests/com/intellij/codeInspection/EntryPointsConverterTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/EntryPointsConverterTest.java
@@ -23,7 +23,7 @@ public class EntryPointsConverterTest extends TestCase {
     doTest("field", "java.lang.String.myFakeField", "java.lang.String myFakeField");
   }
 
-  private void doTest(String type, String fqName, String expectedFQName) throws Exception {
+  private static void doTest(String type, String fqName, String expectedFQName) throws Exception {
     final Element entryPoints = setUpEntryPoint(type, fqName);
 
     final EntryPointsManagerImpl manager = new EntryPointsManagerImpl(null);
@@ -40,7 +40,7 @@ public class EntryPointsConverterTest extends TestCase {
     assertTrue(JDOMUtil.areElementsEqual(testElement, expected));
   }
 
-  private Element setUpEntryPoint(String type, String fqName) {
+  private static Element setUpEntryPoint(String type, String fqName) {
     Element entryPoints = new Element("entry_points");
     Element entryPoint = new Element("entry_point");
     entryPoint.setAttribute("TYPE", type);
diff --git a/inspections/tests/com/intellij/codeInspection/EqualsAndHashCodeTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/EqualsAndHashCodeTest.java
similarity index 86%
rename from inspections/tests/com/intellij/codeInspection/EqualsAndHashCodeTest.java
rename to java/java-tests/testSrc/com/intellij/codeInspection/EqualsAndHashCodeTest.java
index fb09f9962204..405ba9032905 100644
--- a/inspections/tests/com/intellij/codeInspection/EqualsAndHashCodeTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/EqualsAndHashCodeTest.java
@@ -10,12 +10,18 @@
  */
 package com.intellij.codeInspection;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.codeInspection.equalsAndHashcode.EqualsAndHashcode;
 import com.intellij.testFramework.InspectionTestCase;
 
 public class EqualsAndHashCodeTest extends InspectionTestCase {
   private final EqualsAndHashcode myTool = new EqualsAndHashcode();
 
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath() + "/inspection";
+  }
+
   protected void setUp() throws Exception {
     super.setUp();
     myTool.projectOpened(getProject());