diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckExamplesTest.java index 94d914f5811..2a8966176c7 100644 --- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckExamplesTest.java +++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckExamplesTest.java @@ -19,12 +19,12 @@ package com.puppycrawl.tools.checkstyle.checks.imports; -import org.junit.jupiter.api.Disabled; +import static com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.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 UnusedImportsCheckExamplesTest extends AbstractExamplesModuleTestSupport { @Override protected String getPackageLocation() { @@ -34,18 +34,21 @@ protected String getPackageLocation() { @Test public void testExample1() throws Exception { final String[] expected = { - + "19:8: " + getCheckMessage(MSG_KEY, "java.lang.String"), + "22:8: " + getCheckMessage(MSG_KEY, "java.util.Map"), }; - verifyWithInlineConfigParser(getPath("Example1.txt"), expected); + verifyWithInlineConfigParser(getPath("Example1.java"), expected); } @Test public void testExample2() throws Exception { final String[] expected = { - + "21:8: " + getCheckMessage(MSG_KEY, "java.lang.String"), + "24:8: " + getCheckMessage(MSG_KEY, "java.util.Map"), + "26:8: " + getCheckMessage(MSG_KEY, "java.util.List"), }; - verifyWithInlineConfigParser(getPath("Example2.txt"), expected); + verifyWithInlineConfigParser(getPath("Example2.java"), expected); } } diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.java similarity index 66% rename from src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.txt rename to src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.java index 15a120e1723..3993442ac80 100644 --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.txt +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.java @@ -6,6 +6,8 @@ */ +package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports; + // xdoc section -- start // limitation as it match field name in code import java.awt.Component; //OK @@ -16,18 +18,18 @@ import java.lang.String; // violation -import java.util.Stack; // OK +import java.util.Stack; import java.util.Map; // violation -import java.util.List; // OK +import java.util.List; /** * @link List */ -class MyClass{ - Stack stack = new Stack(); - private Object Component; - int[] arr = {0,0}; - int[] array = copyOf(arr , 1); +class Example1{ + Stack stack = new Stack(); + private Object Component; + int[] arr = {0,0}; + int[] array = copyOf(arr , 1); } // xdoc section -- end diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.java similarity index 72% rename from src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.txt rename to src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.java index f218d6f0bdc..c4579c95a9c 100644 --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.txt +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.java @@ -8,6 +8,8 @@ */ +package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports; + // xdoc section -- start // limitation as it match field name in code import java.awt.Component; //OK @@ -18,7 +20,7 @@ import java.lang.String; // violation -import java.util.Stack; // OK +import java.util.Stack; import java.util.Map; // violation import java.util.List; // violation @@ -26,10 +28,10 @@ /** * @link List */ -class MyClass{ - Stack stack = new Stack(); - private Object Component; - int[] arr = {0,0}; - int[] array = copyOf(arr , 1); +class Example2{ + Stack stack = new Stack(); + private Object Component; + int[] arr = {0,0}; + int[] array = copyOf(arr , 1); } // xdoc section -- end diff --git a/src/xdocs/checks/imports/unusedimports.xml b/src/xdocs/checks/imports/unusedimports.xml index 717ee93ab34..2dd105e9b0c 100644 --- a/src/xdocs/checks/imports/unusedimports.xml +++ b/src/xdocs/checks/imports/unusedimports.xml @@ -100,19 +100,19 @@ import static java.util.Arrays.copyOf; //OK import java.lang.String; // violation -import java.util.Stack; // OK +import java.util.Stack; import java.util.Map; // violation -import java.util.List; // OK +import java.util.List; /** * @link List */ -class MyClass{ - Stack stack = new Stack(); - private Object Component; - int[] arr = {0,0}; - int[] array = copyOf(arr , 1); +class Example1{ + Stack stack = new Stack(); + private Object Component; + int[] arr = {0,0}; + int[] array = copyOf(arr , 1); }

@@ -138,7 +138,7 @@ import static java.util.Arrays.copyOf; //OK import java.lang.String; // violation -import java.util.Stack; // OK +import java.util.Stack; import java.util.Map; // violation import java.util.List; // violation @@ -146,11 +146,11 @@ import java.util.List; // violation /** * @link List */ -class MyClass{ - Stack stack = new Stack(); - private Object Component; - int[] arr = {0,0}; - int[] array = copyOf(arr , 1); +class Example2{ + Stack stack = new Stack(); + private Object Component; + int[] arr = {0,0}; + int[] array = copyOf(arr , 1); } diff --git a/src/xdocs/checks/imports/unusedimports.xml.template b/src/xdocs/checks/imports/unusedimports.xml.template index 019d628c6c6..b14f25776bc 100644 --- a/src/xdocs/checks/imports/unusedimports.xml.template +++ b/src/xdocs/checks/imports/unusedimports.xml.template @@ -84,13 +84,13 @@

+ value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.java"/>

Example:

+ value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.java"/>

@@ -98,13 +98,13 @@

+ value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.java"/>

Example:

+ value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.java"/>