diff --git a/testData/inspection/canBeFinal/SCR6073/expected.xml b/java/java-tests/testData/inspection/canBeFinal/SCR6073/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/SCR6073/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/SCR6073/expected.xml diff --git a/testData/inspection/canBeFinal/SCR6073/src/A.java b/java/java-tests/testData/inspection/canBeFinal/SCR6073/src/A.java similarity index 100% rename from testData/inspection/canBeFinal/SCR6073/src/A.java rename to java/java-tests/testData/inspection/canBeFinal/SCR6073/src/A.java diff --git a/testData/inspection/canBeFinal/SCR6781/expected.xml b/java/java-tests/testData/inspection/canBeFinal/SCR6781/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/SCR6781/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/SCR6781/expected.xml diff --git a/testData/inspection/canBeFinal/SCR6781/src/A.java b/java/java-tests/testData/inspection/canBeFinal/SCR6781/src/A.java similarity index 100% rename from testData/inspection/canBeFinal/SCR6781/src/A.java rename to java/java-tests/testData/inspection/canBeFinal/SCR6781/src/A.java diff --git a/testData/inspection/canBeFinal/SCR6845/expected.xml b/java/java-tests/testData/inspection/canBeFinal/SCR6845/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/SCR6845/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/SCR6845/expected.xml diff --git a/testData/inspection/canBeFinal/SCR6845/src/A.java b/java/java-tests/testData/inspection/canBeFinal/SCR6845/src/A.java similarity index 100% rename from testData/inspection/canBeFinal/SCR6845/src/A.java rename to java/java-tests/testData/inspection/canBeFinal/SCR6845/src/A.java diff --git a/testData/inspection/canBeFinal/SCR6861/expected.xml b/java/java-tests/testData/inspection/canBeFinal/SCR6861/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/SCR6861/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/SCR6861/expected.xml diff --git a/testData/inspection/canBeFinal/SCR6861/src/A.java b/java/java-tests/testData/inspection/canBeFinal/SCR6861/src/A.java similarity index 100% rename from testData/inspection/canBeFinal/SCR6861/src/A.java rename to java/java-tests/testData/inspection/canBeFinal/SCR6861/src/A.java diff --git a/testData/inspection/canBeFinal/SCR7737/expected.xml b/java/java-tests/testData/inspection/canBeFinal/SCR7737/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/SCR7737/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/SCR7737/expected.xml diff --git a/testData/inspection/canBeFinal/SCR7737/ext_src/B.java b/java/java-tests/testData/inspection/canBeFinal/SCR7737/ext_src/B.java similarity index 100% rename from testData/inspection/canBeFinal/SCR7737/ext_src/B.java rename to java/java-tests/testData/inspection/canBeFinal/SCR7737/ext_src/B.java diff --git a/testData/inspection/canBeFinal/SCR7737/src/A.java b/java/java-tests/testData/inspection/canBeFinal/SCR7737/src/A.java similarity index 100% rename from testData/inspection/canBeFinal/SCR7737/src/A.java rename to java/java-tests/testData/inspection/canBeFinal/SCR7737/src/A.java diff --git a/testData/inspection/canBeFinal/fieldAndTryBlock/expected.xml b/java/java-tests/testData/inspection/canBeFinal/fieldAndTryBlock/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/fieldAndTryBlock/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/fieldAndTryBlock/expected.xml diff --git a/testData/inspection/canBeFinal/fieldAndTryBlock/src/Foo.java b/java/java-tests/testData/inspection/canBeFinal/fieldAndTryBlock/src/Foo.java similarity index 100% rename from testData/inspection/canBeFinal/fieldAndTryBlock/src/Foo.java rename to java/java-tests/testData/inspection/canBeFinal/fieldAndTryBlock/src/Foo.java diff --git a/testData/inspection/canBeFinal/fields/expected.xml b/java/java-tests/testData/inspection/canBeFinal/fields/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/fields/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/fields/expected.xml diff --git a/testData/inspection/canBeFinal/fields/src/Foo.java b/java/java-tests/testData/inspection/canBeFinal/fields/src/Foo.java similarity index 100% rename from testData/inspection/canBeFinal/fields/src/Foo.java rename to java/java-tests/testData/inspection/canBeFinal/fields/src/Foo.java diff --git a/testData/inspection/canBeFinal/fieldsReading/expected.xml b/java/java-tests/testData/inspection/canBeFinal/fieldsReading/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/fieldsReading/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/fieldsReading/expected.xml diff --git a/testData/inspection/canBeFinal/fieldsReading/src/Foo.java b/java/java-tests/testData/inspection/canBeFinal/fieldsReading/src/Foo.java similarity index 100% rename from testData/inspection/canBeFinal/fieldsReading/src/Foo.java rename to java/java-tests/testData/inspection/canBeFinal/fieldsReading/src/Foo.java diff --git a/testData/inspection/canBeFinal/methodInheritance/expected.xml b/java/java-tests/testData/inspection/canBeFinal/methodInheritance/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/methodInheritance/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/methodInheritance/expected.xml diff --git a/testData/inspection/canBeFinal/methodInheritance/src/a.java b/java/java-tests/testData/inspection/canBeFinal/methodInheritance/src/a.java similarity index 100% rename from testData/inspection/canBeFinal/methodInheritance/src/a.java rename to java/java-tests/testData/inspection/canBeFinal/methodInheritance/src/a.java diff --git a/testData/inspection/canBeFinal/privateInners/expected.xml b/java/java-tests/testData/inspection/canBeFinal/privateInners/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/privateInners/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/privateInners/expected.xml diff --git a/testData/inspection/canBeFinal/privateInners/src/Foo.java b/java/java-tests/testData/inspection/canBeFinal/privateInners/src/Foo.java similarity index 100% rename from testData/inspection/canBeFinal/privateInners/src/Foo.java rename to java/java-tests/testData/inspection/canBeFinal/privateInners/src/Foo.java diff --git a/testData/inspection/canBeFinal/simpleClassInheritance/expected.xml b/java/java-tests/testData/inspection/canBeFinal/simpleClassInheritance/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/simpleClassInheritance/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/simpleClassInheritance/expected.xml diff --git a/testData/inspection/canBeFinal/simpleClassInheritance/src/Foo.java b/java/java-tests/testData/inspection/canBeFinal/simpleClassInheritance/src/Foo.java similarity index 100% rename from testData/inspection/canBeFinal/simpleClassInheritance/src/Foo.java rename to java/java-tests/testData/inspection/canBeFinal/simpleClassInheritance/src/Foo.java diff --git a/testData/inspection/canBeFinal/simpleClassInheritance1/expected.xml b/java/java-tests/testData/inspection/canBeFinal/simpleClassInheritance1/expected.xml similarity index 100% rename from testData/inspection/canBeFinal/simpleClassInheritance1/expected.xml rename to java/java-tests/testData/inspection/canBeFinal/simpleClassInheritance1/expected.xml diff --git a/testData/inspection/canBeFinal/simpleClassInheritance1/src/Foo.java b/java/java-tests/testData/inspection/canBeFinal/simpleClassInheritance1/src/Foo.java similarity index 100% rename from testData/inspection/canBeFinal/simpleClassInheritance1/src/Foo.java rename to java/java-tests/testData/inspection/canBeFinal/simpleClassInheritance1/src/Foo.java diff --git a/inspections/tests/com/intellij/codeInspection/CanBeFinalTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/CanBeFinalTest.java similarity index 92% rename from inspections/tests/com/intellij/codeInspection/CanBeFinalTest.java rename to java/java-tests/testSrc/com/intellij/codeInspection/CanBeFinalTest.java index f03398dedd4c..6ca2c22e02cb 100644 --- a/inspections/tests/com/intellij/codeInspection/CanBeFinalTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/CanBeFinalTest.java @@ -8,10 +8,16 @@ */ package com.intellij.codeInspection; +import com.intellij.JavaTestUtil; import com.intellij.codeInspection.canBeFinal.CanBeFinalInspection; import com.intellij.testFramework.InspectionTestCase; public class CanBeFinalTest extends InspectionTestCase { + @Override + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath() + "/inspection"; + } + private void doTest() throws Exception { final CanBeFinalInspection tool = new CanBeFinalInspection(); tool.REPORT_CLASSES = true;