diff --git a/testData/inspection/localCanBeFinal/SCR11757/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/SCR11757/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/SCR11757/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/SCR11757/expected.xml diff --git a/testData/inspection/localCanBeFinal/SCR11757/src/Test.java b/java/java-tests/testData/inspection/localCanBeFinal/SCR11757/src/Test.java similarity index 100% rename from testData/inspection/localCanBeFinal/SCR11757/src/Test.java rename to java/java-tests/testData/inspection/localCanBeFinal/SCR11757/src/Test.java diff --git a/testData/inspection/localCanBeFinal/SCR6744_1/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_1/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_1/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_1/expected.xml diff --git a/testData/inspection/localCanBeFinal/SCR6744_1/src/foo/Test.java b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_1/src/foo/Test.java similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_1/src/foo/Test.java rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_1/src/foo/Test.java diff --git a/testData/inspection/localCanBeFinal/SCR6744_2/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_2/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_2/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_2/expected.xml diff --git a/testData/inspection/localCanBeFinal/SCR6744_2/src/foo/Test.java b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_2/src/foo/Test.java similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_2/src/foo/Test.java rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_2/src/foo/Test.java diff --git a/testData/inspection/localCanBeFinal/SCR6744_3/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_3/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_3/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_3/expected.xml diff --git a/testData/inspection/localCanBeFinal/SCR6744_3/src/foo/Test.java b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_3/src/foo/Test.java similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_3/src/foo/Test.java rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_3/src/foo/Test.java diff --git a/testData/inspection/localCanBeFinal/SCR6744_4/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_4/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_4/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_4/expected.xml diff --git a/testData/inspection/localCanBeFinal/SCR6744_4/src/foo/Test.java b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_4/src/foo/Test.java similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_4/src/foo/Test.java rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_4/src/foo/Test.java diff --git a/testData/inspection/localCanBeFinal/SCR6744_5/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_5/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_5/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_5/expected.xml diff --git a/testData/inspection/localCanBeFinal/SCR6744_5/src/foo/Test.java b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_5/src/foo/Test.java similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_5/src/foo/Test.java rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_5/src/foo/Test.java diff --git a/testData/inspection/localCanBeFinal/SCR6744_6/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_6/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_6/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_6/expected.xml diff --git a/testData/inspection/localCanBeFinal/SCR6744_6/src/foo/Test.java b/java/java-tests/testData/inspection/localCanBeFinal/SCR6744_6/src/foo/Test.java similarity index 100% rename from testData/inspection/localCanBeFinal/SCR6744_6/src/foo/Test.java rename to java/java-tests/testData/inspection/localCanBeFinal/SCR6744_6/src/foo/Test.java diff --git a/testData/inspection/localCanBeFinal/SCR7428/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/SCR7428/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/SCR7428/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/SCR7428/expected.xml diff --git a/testData/inspection/localCanBeFinal/SCR7428/src/Junk.java b/java/java-tests/testData/inspection/localCanBeFinal/SCR7428/src/Junk.java similarity index 100% rename from testData/inspection/localCanBeFinal/SCR7428/src/Junk.java rename to java/java-tests/testData/inspection/localCanBeFinal/SCR7428/src/Junk.java diff --git a/testData/inspection/localCanBeFinal/SCR7428_1/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/SCR7428_1/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/SCR7428_1/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/SCR7428_1/expected.xml diff --git a/testData/inspection/localCanBeFinal/SCR7428_1/src/Junk.java b/java/java-tests/testData/inspection/localCanBeFinal/SCR7428_1/src/Junk.java similarity index 100% rename from testData/inspection/localCanBeFinal/SCR7428_1/src/Junk.java rename to java/java-tests/testData/inspection/localCanBeFinal/SCR7428_1/src/Junk.java diff --git a/testData/inspection/localCanBeFinal/SCR7601/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/SCR7601/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/SCR7601/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/SCR7601/expected.xml diff --git a/testData/inspection/localCanBeFinal/SCR7601/src/TestFinal2.java b/java/java-tests/testData/inspection/localCanBeFinal/SCR7601/src/TestFinal2.java similarity index 100% rename from testData/inspection/localCanBeFinal/SCR7601/src/TestFinal2.java rename to java/java-tests/testData/inspection/localCanBeFinal/SCR7601/src/TestFinal2.java diff --git a/testData/inspection/localCanBeFinal/foreach/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/foreach/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/foreach/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/foreach/expected.xml diff --git a/testData/inspection/localCanBeFinal/foreach/src/TestFinal2.java b/java/java-tests/testData/inspection/localCanBeFinal/foreach/src/TestFinal2.java similarity index 100% rename from testData/inspection/localCanBeFinal/foreach/src/TestFinal2.java rename to java/java-tests/testData/inspection/localCanBeFinal/foreach/src/TestFinal2.java diff --git a/testData/inspection/localCanBeFinal/if/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/if/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/if/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/if/expected.xml diff --git a/testData/inspection/localCanBeFinal/if/src/Test.java b/java/java-tests/testData/inspection/localCanBeFinal/if/src/Test.java similarity index 100% rename from testData/inspection/localCanBeFinal/if/src/Test.java rename to java/java-tests/testData/inspection/localCanBeFinal/if/src/Test.java diff --git a/testData/inspection/localCanBeFinal/incompleteAssignment/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/incompleteAssignment/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/incompleteAssignment/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/incompleteAssignment/expected.xml diff --git a/testData/inspection/localCanBeFinal/incompleteAssignment/src/Test.java b/java/java-tests/testData/inspection/localCanBeFinal/incompleteAssignment/src/Test.java similarity index 100% rename from testData/inspection/localCanBeFinal/incompleteAssignment/src/Test.java rename to java/java-tests/testData/inspection/localCanBeFinal/incompleteAssignment/src/Test.java diff --git a/testData/inspection/localCanBeFinal/multiWriteNoRead/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/multiWriteNoRead/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/multiWriteNoRead/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/multiWriteNoRead/expected.xml diff --git a/testData/inspection/localCanBeFinal/multiWriteNoRead/src/Test.java b/java/java-tests/testData/inspection/localCanBeFinal/multiWriteNoRead/src/Test.java similarity index 100% rename from testData/inspection/localCanBeFinal/multiWriteNoRead/src/Test.java rename to java/java-tests/testData/inspection/localCanBeFinal/multiWriteNoRead/src/Test.java diff --git a/testData/inspection/localCanBeFinal/parameters/expected.xml b/java/java-tests/testData/inspection/localCanBeFinal/parameters/expected.xml similarity index 100% rename from testData/inspection/localCanBeFinal/parameters/expected.xml rename to java/java-tests/testData/inspection/localCanBeFinal/parameters/expected.xml diff --git a/testData/inspection/localCanBeFinal/parameters/src/Test.java b/java/java-tests/testData/inspection/localCanBeFinal/parameters/src/Test.java similarity index 100% rename from testData/inspection/localCanBeFinal/parameters/src/Test.java rename to java/java-tests/testData/inspection/localCanBeFinal/parameters/src/Test.java diff --git a/inspections/tests/com/intellij/codeInspection/LocalCanBeFinalTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/LocalCanBeFinalTest.java similarity index 94% rename from inspections/tests/com/intellij/codeInspection/LocalCanBeFinalTest.java rename to java/java-tests/testSrc/com/intellij/codeInspection/LocalCanBeFinalTest.java index 7b9abe1d3ae1..3f5729be4d89 100644 --- a/inspections/tests/com/intellij/codeInspection/LocalCanBeFinalTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/LocalCanBeFinalTest.java @@ -1,5 +1,6 @@ package com.intellij.codeInspection; +import com.intellij.JavaTestUtil; import com.intellij.codeInspection.localCanBeFinal.LocalCanBeFinal; import com.intellij.testFramework.InspectionTestCase; @@ -10,6 +11,11 @@ import com.intellij.testFramework.InspectionTestCase; public class LocalCanBeFinalTest extends InspectionTestCase { private LocalCanBeFinal myTool; + @Override + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath() + "/inspection"; + } + protected void setUp() throws Exception { super.setUp(); myTool = new LocalCanBeFinal();