diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckExamplesTest.java index bbc76741883..2f8592369ae 100644 --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckExamplesTest.java @@ -19,12 +19,10 @@ package com.puppycrawl.tools.checkstyle.checks.coding; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport; -@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345") public class NoArrayTrailingCommaCheckExamplesTest extends AbstractExamplesModuleTestSupport { @Override protected String getPackageLocation() { @@ -34,9 +32,10 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - + "15:12: " + getCheckMessage(NoArrayTrailingCommaCheck.MSG_KEY), + "18:35: " + getCheckMessage(NoArrayTrailingCommaCheck.MSG_KEY), }; - verifyWithInlineConfigParser(getPath("Example1.txt"), expected); + verifyWithInlineConfigParser(getPath("Example1.java"), expected); } } diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/noarraytrailingcomma/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/noarraytrailingcomma/Example1.java new file mode 100644 index 00000000000..ccd05a9b248 --- /dev/null +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/noarraytrailingcomma/Example1.java @@ -0,0 +1,26 @@ +/*xml + + + + + +*/ +package com.puppycrawl.tools.checkstyle.checks.coding.noarraytrailingcomma; + +// xdoc section -- start +class Example1 { + void InvalidExample() { + String[] foo1 = { + "FOO", + "BAR", // violation, 'Array should not contain trailing comma' + }; + // violation below, 'Array should not contain trailing comma' + String[] foo2 = { "FOO", "BAR", }; + String[] foo3 = { + "FOO", + "BAR" + }; + String[] foo4 = { "FOO", "BAR" }; + } +} +// xdoc section -- end diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/noarraytrailingcomma/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/noarraytrailingcomma/Example1.txt deleted file mode 100644 index 621b5449879..00000000000 --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/noarraytrailingcomma/Example1.txt +++ /dev/null @@ -1,20 +0,0 @@ -/*xml - - - - - -*/ - -// xdoc section -- start -String[] foo1 = { - "FOO", // OK - "BAR", // violation -}; -String[] foo2 = { "FOO", "BAR", }; // violation -String[] foo3 = { - "FOO", // OK - "BAR" // OK -}; -String[] foo4 = { "FOO", "BAR" }; // OK -// xdoc section -- end diff --git a/src/xdocs/checks/coding/noarraytrailingcomma.xml b/src/xdocs/checks/coding/noarraytrailingcomma.xml index 86340b83556..3c1e7e7d9b2 100644 --- a/src/xdocs/checks/coding/noarraytrailingcomma.xml +++ b/src/xdocs/checks/coding/noarraytrailingcomma.xml @@ -46,16 +46,21 @@ String[] foo = new String[] { Which results in the following violations:

-String[] foo1 = { - "FOO", // OK - "BAR", // violation -}; -String[] foo2 = { "FOO", "BAR", }; // violation -String[] foo3 = { - "FOO", // OK - "BAR" // OK -}; -String[] foo4 = { "FOO", "BAR" }; // OK +class Example1 { + void InvalidExample() { + String[] foo1 = { + "FOO", + "BAR", // violation, 'Array should not contain trailing comma' + }; + // violation below, 'Array should not contain trailing comma' + String[] foo2 = { "FOO", "BAR", }; + String[] foo3 = { + "FOO", + "BAR" + }; + String[] foo4 = { "FOO", "BAR" }; + } +} diff --git a/src/xdocs/checks/coding/noarraytrailingcomma.xml.template b/src/xdocs/checks/coding/noarraytrailingcomma.xml.template index ca51bacac64..a4c531edbf0 100644 --- a/src/xdocs/checks/coding/noarraytrailingcomma.xml.template +++ b/src/xdocs/checks/coding/noarraytrailingcomma.xml.template @@ -37,7 +37,7 @@ String[] foo = new String[] {

+ value="resources/com/puppycrawl/tools/checkstyle/checks/coding/noarraytrailingcomma/Example1.java"/>

@@ -45,7 +45,7 @@ String[] foo = new String[] {

+ value="resources/com/puppycrawl/tools/checkstyle/checks/coding/noarraytrailingcomma/Example1.java"/>