moving tests to CE
authorDmitry Jemerov <yole@intellij.com>
Fri, 25 Sep 2009 16:54:27 +0000 (20:54 +0400)
committerDmitry Jemerov <yole@intellij.com>
Fri, 25 Sep 2009 16:54:27 +0000 (20:54 +0400)
java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/expected.xml [moved from testData/inspection/equalsAndHashcode/hierarchy/expected.xml with 100% similarity]
java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/src/A.java [moved from testData/inspection/equalsAndHashcode/hierarchy/src/A.java with 100% similarity]
java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/src/B.java [moved from testData/inspection/equalsAndHashcode/hierarchy/src/B.java with 100% similarity]
java/java-tests/testData/inspection/equalsAndHashcode/innerClass/expected.xml [moved from testData/inspection/equalsAndHashcode/innerClass/expected.xml with 100% similarity]
java/java-tests/testData/inspection/equalsAndHashcode/innerClass/src/Test.java [moved from testData/inspection/equalsAndHashcode/innerClass/src/Test.java with 100% similarity]
java/java-tests/testSrc/com/intellij/codeInspection/EntryPointsConverterTest.java [moved from inspections/tests/com/intellij/codeInspection/EntryPointsConverterTest.java with 91% similarity]
java/java-tests/testSrc/com/intellij/codeInspection/EqualsAndHashCodeTest.java [moved from inspections/tests/com/intellij/codeInspection/EqualsAndHashCodeTest.java with 86% similarity]

similarity index 91%
rename from inspections/tests/com/intellij/codeInspection/EntryPointsConverterTest.java
rename to java/java-tests/testSrc/com/intellij/codeInspection/EntryPointsConverterTest.java
index 52e88fba1f6f0a4d66002b300e99f26147430ca5..c3700b368cfc59132d8a85119eaacacc98a94465 100644 (file)
@@ -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);
similarity index 86%
rename from inspections/tests/com/intellij/codeInspection/EqualsAndHashCodeTest.java
rename to java/java-tests/testSrc/com/intellij/codeInspection/EqualsAndHashCodeTest.java
index fb09f9962204a93b49f6608d561123aed9265687..405ba90329059413ffa140bf00cae61f370842b7 100644 (file)
  */
 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());