From 9d2c56074fbdaa1994585d086d148be649b40018 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 25 Sep 2009 21:34:06 +0400 Subject: [PATCH] moving tests to CE --- .../testData}/inspection/visibility/IDEADEV10312/expected.xml | 0 .../inspection/visibility/IDEADEV10312/ext_src/weaker/b/B.java | 0 .../inspection/visibility/IDEADEV10312/src/weaker/a/A.java | 0 .../testData}/inspection/visibility/IDEADEV10883/expected.xml | 0 .../testData}/inspection/visibility/IDEADEV10883/src/Bar.java | 0 .../testData}/inspection/visibility/IDEADEV10883/src/Foo.java | 0 .../testData}/inspection/visibility/SCR11792/expected.xml | 0 .../testData}/inspection/visibility/SCR11792/src/Foo.java | 0 .../testData}/inspection/visibility/SCR5008/expected.xml | 0 .../inspection/visibility/SCR5008/src/marti/p1/SubClass.java | 0 .../inspection/visibility/SCR5008/src/marti/p1/SuperClass.java | 0 .../testData}/inspection/visibility/SCR6856/expected.xml | 0 .../java-tests/testData}/inspection/visibility/SCR6856/src/A.java | 0 .../testData}/inspection/visibility/annotationUsages/expected.xml | 0 .../inspection/visibility/annotationUsages/src/Observer.java | 0 .../testData}/inspection/visibility/annotationUsages/src/Test.java | 0 .../inspection/visibility/annotationUsages/src/Usage.java | 0 .../inspection/visibility/defaultConstructor/expected.xml | 0 .../inspection/visibility/defaultConstructor/ext_src/res.xml | 0 .../inspection/visibility/defaultConstructor/src/Test.java | 0 .../inspection/visibility/enumConstantsVisibility/expected.xml | 0 .../inspection/visibility/enumConstantsVisibility/src/Foo.java | 0 .../inspection/visibility/implicitConstructor/expected.xml | 0 .../inspection/visibility/implicitConstructor/ext_src/res.xml | 0 .../inspection/visibility/implicitConstructor/src/Test.java | 0 .../testData}/inspection/visibility/innerConstructor/expected.xml | 0 .../testData}/inspection/visibility/innerConstructor/src/Foo.java | 0 .../testData}/inspection/visibility/packageLevelTops/expected.xml | 0 .../packageLevelTops/src/package1/PackageLevelServer.java | 0 .../visibility/packageLevelTops/src/package1/PublicServer.java | 0 .../visibility/packageLevelTops/src/package2/Client.java | 0 .../testData}/inspection/visibility/typeArguments/expected.xml | 0 .../inspection/visibility/typeArguments/src/AbstractSetup.java | 0 .../visibility/typeArguments/src/AbstractSetupParams.java | 0 .../inspection/visibility/typeArguments/src/ChildClass.java | 0 .../inspection/visibility/typeArguments/src/Superclass.java | 0 .../com/intellij/codeInspection/VisibilityInspectionTest.java | 7 +++++++ 37 files changed, 7 insertions(+) rename {testData => java/java-tests/testData}/inspection/visibility/IDEADEV10312/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/IDEADEV10312/ext_src/weaker/b/B.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/IDEADEV10312/src/weaker/a/A.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/IDEADEV10883/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/IDEADEV10883/src/Bar.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/IDEADEV10883/src/Foo.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/SCR11792/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/SCR11792/src/Foo.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/SCR5008/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/SCR5008/src/marti/p1/SubClass.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/SCR5008/src/marti/p1/SuperClass.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/SCR6856/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/SCR6856/src/A.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/annotationUsages/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/annotationUsages/src/Observer.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/annotationUsages/src/Test.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/annotationUsages/src/Usage.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/defaultConstructor/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/defaultConstructor/ext_src/res.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/defaultConstructor/src/Test.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/enumConstantsVisibility/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/enumConstantsVisibility/src/Foo.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/implicitConstructor/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/implicitConstructor/ext_src/res.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/implicitConstructor/src/Test.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/innerConstructor/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/innerConstructor/src/Foo.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/packageLevelTops/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/packageLevelTops/src/package1/PackageLevelServer.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/packageLevelTops/src/package1/PublicServer.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/packageLevelTops/src/package2/Client.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/typeArguments/expected.xml (100%) rename {testData => java/java-tests/testData}/inspection/visibility/typeArguments/src/AbstractSetup.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/typeArguments/src/AbstractSetupParams.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/typeArguments/src/ChildClass.java (100%) rename {testData => java/java-tests/testData}/inspection/visibility/typeArguments/src/Superclass.java (100%) rename {inspections/tests => java/java-tests/testSrc}/com/intellij/codeInspection/VisibilityInspectionTest.java (95%) diff --git a/testData/inspection/visibility/IDEADEV10312/expected.xml b/java/java-tests/testData/inspection/visibility/IDEADEV10312/expected.xml similarity index 100% rename from testData/inspection/visibility/IDEADEV10312/expected.xml rename to java/java-tests/testData/inspection/visibility/IDEADEV10312/expected.xml diff --git a/testData/inspection/visibility/IDEADEV10312/ext_src/weaker/b/B.java b/java/java-tests/testData/inspection/visibility/IDEADEV10312/ext_src/weaker/b/B.java similarity index 100% rename from testData/inspection/visibility/IDEADEV10312/ext_src/weaker/b/B.java rename to java/java-tests/testData/inspection/visibility/IDEADEV10312/ext_src/weaker/b/B.java diff --git a/testData/inspection/visibility/IDEADEV10312/src/weaker/a/A.java b/java/java-tests/testData/inspection/visibility/IDEADEV10312/src/weaker/a/A.java similarity index 100% rename from testData/inspection/visibility/IDEADEV10312/src/weaker/a/A.java rename to java/java-tests/testData/inspection/visibility/IDEADEV10312/src/weaker/a/A.java diff --git a/testData/inspection/visibility/IDEADEV10883/expected.xml b/java/java-tests/testData/inspection/visibility/IDEADEV10883/expected.xml similarity index 100% rename from testData/inspection/visibility/IDEADEV10883/expected.xml rename to java/java-tests/testData/inspection/visibility/IDEADEV10883/expected.xml diff --git a/testData/inspection/visibility/IDEADEV10883/src/Bar.java b/java/java-tests/testData/inspection/visibility/IDEADEV10883/src/Bar.java similarity index 100% rename from testData/inspection/visibility/IDEADEV10883/src/Bar.java rename to java/java-tests/testData/inspection/visibility/IDEADEV10883/src/Bar.java diff --git a/testData/inspection/visibility/IDEADEV10883/src/Foo.java b/java/java-tests/testData/inspection/visibility/IDEADEV10883/src/Foo.java similarity index 100% rename from testData/inspection/visibility/IDEADEV10883/src/Foo.java rename to java/java-tests/testData/inspection/visibility/IDEADEV10883/src/Foo.java diff --git a/testData/inspection/visibility/SCR11792/expected.xml b/java/java-tests/testData/inspection/visibility/SCR11792/expected.xml similarity index 100% rename from testData/inspection/visibility/SCR11792/expected.xml rename to java/java-tests/testData/inspection/visibility/SCR11792/expected.xml diff --git a/testData/inspection/visibility/SCR11792/src/Foo.java b/java/java-tests/testData/inspection/visibility/SCR11792/src/Foo.java similarity index 100% rename from testData/inspection/visibility/SCR11792/src/Foo.java rename to java/java-tests/testData/inspection/visibility/SCR11792/src/Foo.java diff --git a/testData/inspection/visibility/SCR5008/expected.xml b/java/java-tests/testData/inspection/visibility/SCR5008/expected.xml similarity index 100% rename from testData/inspection/visibility/SCR5008/expected.xml rename to java/java-tests/testData/inspection/visibility/SCR5008/expected.xml diff --git a/testData/inspection/visibility/SCR5008/src/marti/p1/SubClass.java b/java/java-tests/testData/inspection/visibility/SCR5008/src/marti/p1/SubClass.java similarity index 100% rename from testData/inspection/visibility/SCR5008/src/marti/p1/SubClass.java rename to java/java-tests/testData/inspection/visibility/SCR5008/src/marti/p1/SubClass.java diff --git a/testData/inspection/visibility/SCR5008/src/marti/p1/SuperClass.java b/java/java-tests/testData/inspection/visibility/SCR5008/src/marti/p1/SuperClass.java similarity index 100% rename from testData/inspection/visibility/SCR5008/src/marti/p1/SuperClass.java rename to java/java-tests/testData/inspection/visibility/SCR5008/src/marti/p1/SuperClass.java diff --git a/testData/inspection/visibility/SCR6856/expected.xml b/java/java-tests/testData/inspection/visibility/SCR6856/expected.xml similarity index 100% rename from testData/inspection/visibility/SCR6856/expected.xml rename to java/java-tests/testData/inspection/visibility/SCR6856/expected.xml diff --git a/testData/inspection/visibility/SCR6856/src/A.java b/java/java-tests/testData/inspection/visibility/SCR6856/src/A.java similarity index 100% rename from testData/inspection/visibility/SCR6856/src/A.java rename to java/java-tests/testData/inspection/visibility/SCR6856/src/A.java diff --git a/testData/inspection/visibility/annotationUsages/expected.xml b/java/java-tests/testData/inspection/visibility/annotationUsages/expected.xml similarity index 100% rename from testData/inspection/visibility/annotationUsages/expected.xml rename to java/java-tests/testData/inspection/visibility/annotationUsages/expected.xml diff --git a/testData/inspection/visibility/annotationUsages/src/Observer.java b/java/java-tests/testData/inspection/visibility/annotationUsages/src/Observer.java similarity index 100% rename from testData/inspection/visibility/annotationUsages/src/Observer.java rename to java/java-tests/testData/inspection/visibility/annotationUsages/src/Observer.java diff --git a/testData/inspection/visibility/annotationUsages/src/Test.java b/java/java-tests/testData/inspection/visibility/annotationUsages/src/Test.java similarity index 100% rename from testData/inspection/visibility/annotationUsages/src/Test.java rename to java/java-tests/testData/inspection/visibility/annotationUsages/src/Test.java diff --git a/testData/inspection/visibility/annotationUsages/src/Usage.java b/java/java-tests/testData/inspection/visibility/annotationUsages/src/Usage.java similarity index 100% rename from testData/inspection/visibility/annotationUsages/src/Usage.java rename to java/java-tests/testData/inspection/visibility/annotationUsages/src/Usage.java diff --git a/testData/inspection/visibility/defaultConstructor/expected.xml b/java/java-tests/testData/inspection/visibility/defaultConstructor/expected.xml similarity index 100% rename from testData/inspection/visibility/defaultConstructor/expected.xml rename to java/java-tests/testData/inspection/visibility/defaultConstructor/expected.xml diff --git a/testData/inspection/visibility/defaultConstructor/ext_src/res.xml b/java/java-tests/testData/inspection/visibility/defaultConstructor/ext_src/res.xml similarity index 100% rename from testData/inspection/visibility/defaultConstructor/ext_src/res.xml rename to java/java-tests/testData/inspection/visibility/defaultConstructor/ext_src/res.xml diff --git a/testData/inspection/visibility/defaultConstructor/src/Test.java b/java/java-tests/testData/inspection/visibility/defaultConstructor/src/Test.java similarity index 100% rename from testData/inspection/visibility/defaultConstructor/src/Test.java rename to java/java-tests/testData/inspection/visibility/defaultConstructor/src/Test.java diff --git a/testData/inspection/visibility/enumConstantsVisibility/expected.xml b/java/java-tests/testData/inspection/visibility/enumConstantsVisibility/expected.xml similarity index 100% rename from testData/inspection/visibility/enumConstantsVisibility/expected.xml rename to java/java-tests/testData/inspection/visibility/enumConstantsVisibility/expected.xml diff --git a/testData/inspection/visibility/enumConstantsVisibility/src/Foo.java b/java/java-tests/testData/inspection/visibility/enumConstantsVisibility/src/Foo.java similarity index 100% rename from testData/inspection/visibility/enumConstantsVisibility/src/Foo.java rename to java/java-tests/testData/inspection/visibility/enumConstantsVisibility/src/Foo.java diff --git a/testData/inspection/visibility/implicitConstructor/expected.xml b/java/java-tests/testData/inspection/visibility/implicitConstructor/expected.xml similarity index 100% rename from testData/inspection/visibility/implicitConstructor/expected.xml rename to java/java-tests/testData/inspection/visibility/implicitConstructor/expected.xml diff --git a/testData/inspection/visibility/implicitConstructor/ext_src/res.xml b/java/java-tests/testData/inspection/visibility/implicitConstructor/ext_src/res.xml similarity index 100% rename from testData/inspection/visibility/implicitConstructor/ext_src/res.xml rename to java/java-tests/testData/inspection/visibility/implicitConstructor/ext_src/res.xml diff --git a/testData/inspection/visibility/implicitConstructor/src/Test.java b/java/java-tests/testData/inspection/visibility/implicitConstructor/src/Test.java similarity index 100% rename from testData/inspection/visibility/implicitConstructor/src/Test.java rename to java/java-tests/testData/inspection/visibility/implicitConstructor/src/Test.java diff --git a/testData/inspection/visibility/innerConstructor/expected.xml b/java/java-tests/testData/inspection/visibility/innerConstructor/expected.xml similarity index 100% rename from testData/inspection/visibility/innerConstructor/expected.xml rename to java/java-tests/testData/inspection/visibility/innerConstructor/expected.xml diff --git a/testData/inspection/visibility/innerConstructor/src/Foo.java b/java/java-tests/testData/inspection/visibility/innerConstructor/src/Foo.java similarity index 100% rename from testData/inspection/visibility/innerConstructor/src/Foo.java rename to java/java-tests/testData/inspection/visibility/innerConstructor/src/Foo.java diff --git a/testData/inspection/visibility/packageLevelTops/expected.xml b/java/java-tests/testData/inspection/visibility/packageLevelTops/expected.xml similarity index 100% rename from testData/inspection/visibility/packageLevelTops/expected.xml rename to java/java-tests/testData/inspection/visibility/packageLevelTops/expected.xml diff --git a/testData/inspection/visibility/packageLevelTops/src/package1/PackageLevelServer.java b/java/java-tests/testData/inspection/visibility/packageLevelTops/src/package1/PackageLevelServer.java similarity index 100% rename from testData/inspection/visibility/packageLevelTops/src/package1/PackageLevelServer.java rename to java/java-tests/testData/inspection/visibility/packageLevelTops/src/package1/PackageLevelServer.java diff --git a/testData/inspection/visibility/packageLevelTops/src/package1/PublicServer.java b/java/java-tests/testData/inspection/visibility/packageLevelTops/src/package1/PublicServer.java similarity index 100% rename from testData/inspection/visibility/packageLevelTops/src/package1/PublicServer.java rename to java/java-tests/testData/inspection/visibility/packageLevelTops/src/package1/PublicServer.java diff --git a/testData/inspection/visibility/packageLevelTops/src/package2/Client.java b/java/java-tests/testData/inspection/visibility/packageLevelTops/src/package2/Client.java similarity index 100% rename from testData/inspection/visibility/packageLevelTops/src/package2/Client.java rename to java/java-tests/testData/inspection/visibility/packageLevelTops/src/package2/Client.java diff --git a/testData/inspection/visibility/typeArguments/expected.xml b/java/java-tests/testData/inspection/visibility/typeArguments/expected.xml similarity index 100% rename from testData/inspection/visibility/typeArguments/expected.xml rename to java/java-tests/testData/inspection/visibility/typeArguments/expected.xml diff --git a/testData/inspection/visibility/typeArguments/src/AbstractSetup.java b/java/java-tests/testData/inspection/visibility/typeArguments/src/AbstractSetup.java similarity index 100% rename from testData/inspection/visibility/typeArguments/src/AbstractSetup.java rename to java/java-tests/testData/inspection/visibility/typeArguments/src/AbstractSetup.java diff --git a/testData/inspection/visibility/typeArguments/src/AbstractSetupParams.java b/java/java-tests/testData/inspection/visibility/typeArguments/src/AbstractSetupParams.java similarity index 100% rename from testData/inspection/visibility/typeArguments/src/AbstractSetupParams.java rename to java/java-tests/testData/inspection/visibility/typeArguments/src/AbstractSetupParams.java diff --git a/testData/inspection/visibility/typeArguments/src/ChildClass.java b/java/java-tests/testData/inspection/visibility/typeArguments/src/ChildClass.java similarity index 100% rename from testData/inspection/visibility/typeArguments/src/ChildClass.java rename to java/java-tests/testData/inspection/visibility/typeArguments/src/ChildClass.java diff --git a/testData/inspection/visibility/typeArguments/src/Superclass.java b/java/java-tests/testData/inspection/visibility/typeArguments/src/Superclass.java similarity index 100% rename from testData/inspection/visibility/typeArguments/src/Superclass.java rename to java/java-tests/testData/inspection/visibility/typeArguments/src/Superclass.java diff --git a/inspections/tests/com/intellij/codeInspection/VisibilityInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/VisibilityInspectionTest.java similarity index 95% rename from inspections/tests/com/intellij/codeInspection/VisibilityInspectionTest.java rename to java/java-tests/testSrc/com/intellij/codeInspection/VisibilityInspectionTest.java index dda5cb7260..4eb8bd32ef 100644 --- a/inspections/tests/com/intellij/codeInspection/VisibilityInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/VisibilityInspectionTest.java @@ -1,10 +1,17 @@ package com.intellij.codeInspection; +import com.intellij.JavaTestUtil; import com.intellij.codeInspection.visibility.VisibilityInspection; import com.intellij.testFramework.InspectionTestCase; public class VisibilityInspectionTest extends InspectionTestCase { private final VisibilityInspection myTool = new VisibilityInspection(); + + @Override + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath() + "/inspection"; + } + private void doTest() throws Exception { doTest("visibility/" + getTestName(false), myTool); } -- 2.11.4.GIT