diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckExamplesTest.java index 2df2afcbb4d..179882296b7 100644 --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckExamplesTest.java @@ -19,12 +19,12 @@ package com.puppycrawl.tools.checkstyle.checks.modifier; -import org.junit.jupiter.api.Disabled; +import static com.puppycrawl.tools.checkstyle.checks.modifier.ClassMemberImpliedModifierCheck.MSG_KEY; + import org.junit.jupiter.api.Test; import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport; -@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345") public class ClassMemberImpliedModifierCheckExamplesTest extends AbstractExamplesModuleTestSupport { @Override protected String getPackageLocation() { @@ -34,9 +34,13 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - + "16:3: " + getCheckMessage(MSG_KEY, "static"), + "23:3: " + getCheckMessage(MSG_KEY, "static"), + "29:3: " + getCheckMessage(MSG_KEY, "static"), + "34:5: " + getCheckMessage(MSG_KEY, "static"), }; - verifyWithInlineConfigParser(getPath("Example1.txt"), expected); + verifyWithInlineConfigParser( + getNonCompilablePath("Example1.java"), expected); } } diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/Example1.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/Example1.java new file mode 100644 index 00000000000..6527781b5d9 --- /dev/null +++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/Example1.java @@ -0,0 +1,37 @@ +/*xml + + + + + +*/ +//non-compiled with javac: Compilable with Java17 +package com.puppycrawl.tools.checkstyle.checks.modifier.classmemberimpliedmodifier; + +// xdoc section -- start +public final class Example1 { + static interface Address1 { + } + + interface Address2 { // violation, 'Implied modifier 'static' should be explicit' + } + + static enum Age1 { + CHILD, ADULT + } + + enum Age2 { // violation, 'Implied modifier 'static' should be explicit' + CHILD, ADULT + } + + public static record GoodRecord() {} + // violation below, 'Implied modifier 'static' should be explicit' + public record BadRecord() {} + + public static record OuterRecord() { + static record InnerRecord1(){} + // violation below, 'Implied modifier 'static' should be explicit' + record InnerRecord2(){} + } +} +// xdoc section -- end diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/Example1.txt deleted file mode 100644 index d3d66b994b2..00000000000 --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/Example1.txt +++ /dev/null @@ -1,33 +0,0 @@ -/*xml - - - - - -*/ - -// xdoc section -- start -public final class Person { - static interface Address1 { // valid - } - - interface Address2 { // violation - } - - static enum Age1 { // valid - CHILD, ADULT - } - - enum Age2 { // violation - CHILD, ADULT - } - - public static record GoodRecord() {} // valid - public record BadRecord() {} // violation - - public static record OuterRecord() { - static record InnerRecord1(){} // valid - record InnerRecord2(){} // violation - } -} -// xdoc section -- end diff --git a/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml b/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml index 62df3378bf6..44ee812075b 100644 --- a/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml +++ b/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml @@ -93,27 +93,29 @@ public final class Person { Code:

-public final class Person { - static interface Address1 { // valid +public final class Example1 { + static interface Address1 { } - interface Address2 { // violation + interface Address2 { // violation, 'Implied modifier 'static' should be explicit' } - static enum Age1 { // valid + static enum Age1 { CHILD, ADULT } - enum Age2 { // violation + enum Age2 { // violation, 'Implied modifier 'static' should be explicit' CHILD, ADULT } - public static record GoodRecord() {} // valid - public record BadRecord() {} // violation + public static record GoodRecord() {} + // violation below, 'Implied modifier 'static' should be explicit' + public record BadRecord() {} public static record OuterRecord() { - static record InnerRecord1(){} // valid - record InnerRecord2(){} // violation + static record InnerRecord1(){} + // violation below, 'Implied modifier 'static' should be explicit' + record InnerRecord2(){} } } diff --git a/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml.template b/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml.template index 6d36b0c848e..16041057351 100644 --- a/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml.template +++ b/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml.template @@ -58,7 +58,7 @@ public final class Person {

+ value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/Example1.java"/>

@@ -66,7 +66,7 @@ public final class Person {

+ value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/Example1.java"/>