diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties index e623f492f80f..97f2cf8bc504 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties @@ -286,21 +286,21 @@ character.comparison.display.name=Character comparison character.comparison.problem.descriptor=Character comparison #ref in an internationalized context #loc package.visible.field.display.name=Package-visible field package.visible.field.problem.descriptor=Package-visible field #ref #loc -package.visible.inner.class.display.name=Package-visible inner class -package.visible.inner.class.problem.descriptor=Package-visible inner class #ref #loc +package.visible.inner.class.display.name=Package-visible nested class +package.visible.inner.class.problem.descriptor=Package-visible nested class #ref #loc package.visible.inner.class.ignore.enum.option=Ignore package-visible inner enums package.visible.inner.class.ignore.interface.option=Ignore package-visible inner interfaces protected.field.display.name=Protected field protected.field.problem.descriptor=Protected field #ref #loc -protected.inner.class.display.name=Protected inner class -protected.inner.class.problem.descriptor=Protected inner class #ref #loc +protected.inner.class.display.name=Protected nested class +protected.inner.class.problem.descriptor=Protected nested class #ref #loc protected.inner.class.ignore.enum.option=Ignore 'protected' inner enums protected.inner.class.ignore.interface.option=Ignore 'protected' inner interfaces public.field.display.name='public' field public.field.problem.descriptor='public' field #ref #loc public.field.ignore.enum.type.fields.option=Ignore 'public final' fields of an enum type -public.inner.class.display.name='public' inner class -public.inner.class.problem.descriptor='public' inner class #ref #loc +public.inner.class.display.name='public' nested class +public.inner.class.problem.descriptor='public' nested class #ref #loc public.inner.class.ignore.enum.option=Ignore 'public' inner enums public.inner.class.ignore.interface.option=Ignore 'public' inner interfaces return.date.calendar.field.quickfix=Replace with ''{0}.clone()'' diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/package_visible_inner_class/PackageVisibleInnerClassInspection.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/package_visible_inner_class/PackageVisibleInnerClassInspection.java index 992cd9e8751a..ae6749421da1 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/package_visible_inner_class/PackageVisibleInnerClassInspection.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/package_visible_inner_class/PackageVisibleInnerClassInspection.java @@ -2,7 +2,7 @@ package com.siyeh.igtest.encapsulation.package_visible_inner_class; public class PackageVisibleInnerClassInspection { - class Barangus + class Barangus { public Barangus(int val) diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/package_visible_inner_class/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/package_visible_inner_class/expected.xml deleted file mode 100644 index 214a0878fef9..000000000000 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/package_visible_inner_class/expected.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - PackageVisibleInnerClassInspection.java - 5 - Package-visible inner class - Package-visible inner class <code>Barangus</code> #loc - - \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/protected_inner_class/ProtectedInnerClass.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/protected_inner_class/ProtectedInnerClass.java index 76c32d1eb62f..33c9108d03db 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/protected_inner_class/ProtectedInnerClass.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/protected_inner_class/ProtectedInnerClass.java @@ -2,7 +2,7 @@ package com.siyeh.igtest.encapsulation.protected_inner_class; public class ProtectedInnerClass { - protected class Barangus + protected class Barangus { public Barangus(int val) diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/protected_inner_class/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/protected_inner_class/expected.xml deleted file mode 100644 index 2b0a9e2617bd..000000000000 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/protected_inner_class/expected.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - ProtectedInnerClass.java - 5 - Protected inner class - Protected inner class <code>Barangus</code> #loc - - \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/public_inner_class/PublicInnerClass.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/public_inner_class/PublicInnerClass.java index 2a95ad9f4d9b..f8befd126a44 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/public_inner_class/PublicInnerClass.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/public_inner_class/PublicInnerClass.java @@ -2,7 +2,7 @@ package com.siyeh.igtest.encapsulation.public_inner_class; public class PublicInnerClass { - public class Barangus + public class Barangus { public Barangus(int val) diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/public_inner_class/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/public_inner_class/expected.xml deleted file mode 100644 index 89b00eef97dc..000000000000 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/public_inner_class/expected.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - PublicInnerClass.java - 5 - 'public' inner class - 'public' inner class <code>Barangus</code> #loc - - \ No newline at end of file diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/PackageVisibleInnerClassInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/PackageVisibleInnerClassInspectionTest.java index 40f4e27a5889..1d08696bb503 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/PackageVisibleInnerClassInspectionTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/PackageVisibleInnerClassInspectionTest.java @@ -1,13 +1,20 @@ package com.siyeh.ig.encapsulation; -import com.siyeh.ig.IGInspectionTestCase; +import com.intellij.codeInspection.InspectionProfileEntry; +import com.siyeh.ig.LightInspectionTestCase; +import org.jetbrains.annotations.Nullable; -public class PackageVisibleInnerClassInspectionTest extends IGInspectionTestCase { - - public void test() { +public class PackageVisibleInnerClassInspectionTest extends LightInspectionTestCase { + @Nullable + @Override + protected InspectionProfileEntry getInspection() { final PackageVisibleInnerClassInspection tool = new PackageVisibleInnerClassInspection(); tool.ignoreEnums = true; tool.ignoreInterfaces = true; - doTest("com/siyeh/igtest/encapsulation/package_visible_inner_class", tool); + return tool; + } + + public void testPackageVisibleInnerClassInspection() { + doTest(); } } diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/ProtectedInnerClassInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/ProtectedInnerClassInspectionTest.java index a477bdce4310..b60a335bacb6 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/ProtectedInnerClassInspectionTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/ProtectedInnerClassInspectionTest.java @@ -1,13 +1,21 @@ package com.siyeh.ig.encapsulation; -import com.siyeh.ig.IGInspectionTestCase; +import com.intellij.codeInspection.InspectionProfileEntry; +import com.siyeh.ig.LightInspectionTestCase; +import org.jetbrains.annotations.Nullable; -public class ProtectedInnerClassInspectionTest extends IGInspectionTestCase { +public class ProtectedInnerClassInspectionTest extends LightInspectionTestCase { - public void test() { + @Nullable + @Override + protected InspectionProfileEntry getInspection() { final ProtectedInnerClassInspection tool = new ProtectedInnerClassInspection(); tool.ignoreEnums = true; tool.ignoreInterfaces = true; - doTest("com/siyeh/igtest/encapsulation/protected_inner_class", tool); + return tool; + } + + public void testProtectedInnerClass() { + doTest(); } } diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/PublicInnerClassInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/PublicInnerClassInspectionTest.java index e6bf5be0d971..476d7c37f10e 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/PublicInnerClassInspectionTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/encapsulation/PublicInnerClassInspectionTest.java @@ -1,13 +1,20 @@ package com.siyeh.ig.encapsulation; -import com.siyeh.ig.IGInspectionTestCase; +import com.intellij.codeInspection.InspectionProfileEntry; +import com.siyeh.ig.LightInspectionTestCase; +import org.jetbrains.annotations.Nullable; -public class PublicInnerClassInspectionTest extends IGInspectionTestCase { +public class PublicInnerClassInspectionTest extends LightInspectionTestCase { + public void testPublicInnerClass() { + doTest(); + } - public void test() { + @Nullable + @Override + protected InspectionProfileEntry getInspection() { final PublicInnerClassInspection tool = new PublicInnerClassInspection(); tool.ignoreEnums = true; tool.ignoreInterfaces = true; - doTest("com/siyeh/igtest/encapsulation/public_inner_class", tool); + return tool; } }