Issue #3153: IllegalTokenTextCheck and IllegalTokenCheck does not work with COMMENT_CONTENT token

3 files changed, 83 insertions, 2 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java
index 7568c1861..55ac7b6b5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java
@@ -28,6 +28,7 @@ import org.junit.Test;
 
 import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.utils.JavadocUtils;
 
 public class IllegalTokenCheckTest
     extends BaseCheckTestSupport {
@@ -73,4 +74,67 @@ public class IllegalTokenCheckTest
         };
         verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
     }
+
+    @Test
+    public void testCommentContentToken()
+            throws Exception {
+        final DefaultConfiguration checkConfig =
+                createCheckConfig(IllegalTokenCheck.class);
+        checkConfig.addAttribute("tokens", "COMMENT_CONTENT");
+
+        final String[] expected = {
+            "3:3: " + getCheckMessage(MSG_KEY,
+                        JavadocUtils.excapeAllControlChars(
+                            "*" + System.lineSeparator()
+                            + " * Test for illegal tokens"
+                            + System.lineSeparator() + " ")),
+            "31:29: " + getCheckMessage(MSG_KEY,
+                        JavadocUtils.excapeAllControlChars(
+                            " some comment href" + System.lineSeparator())),
+            "35:28: " + getCheckMessage(MSG_KEY,
+                        JavadocUtils.excapeAllControlChars(
+                            " some a href" + System.lineSeparator())),
+        };
+        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+    }
+
+    @Test
+    public void testBlockCommentBeginToken()
+            throws Exception {
+        final DefaultConfiguration checkConfig =
+                createCheckConfig(IllegalTokenCheck.class);
+        checkConfig.addAttribute("tokens", "BLOCK_COMMENT_BEGIN");
+
+        final String[] expected = {
+            "3:1: " + getCheckMessage(MSG_KEY, "/*"),
+        };
+        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+    }
+
+    @Test
+    public void testBlockCommentEndToken()
+            throws Exception {
+        final DefaultConfiguration checkConfig =
+                createCheckConfig(IllegalTokenCheck.class);
+        checkConfig.addAttribute("tokens", "BLOCK_COMMENT_END");
+
+        final String[] expected = {
+            "5:2: " + getCheckMessage(MSG_KEY, "*/"),
+        };
+        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+    }
+
+    @Test
+    public void testSingleLineCommentToken()
+            throws Exception {
+        final DefaultConfiguration checkConfig =
+                createCheckConfig(IllegalTokenCheck.class);
+        checkConfig.addAttribute("tokens", "SINGLE_LINE_COMMENT");
+
+        final String[] expected = {
+            "31:27: " + getCheckMessage(MSG_KEY, "//"),
+            "35:26: " + getCheckMessage(MSG_KEY, "//"),
+        };
+        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java
index fa71b279d..0a899d7bf 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java
@@ -104,5 +104,22 @@ public class IllegalTokenTextCheckTest
         Assert.assertNotNull(check.getAcceptableTokens());
         Assert.assertNotNull(check.getDefaultTokens());
         Assert.assertNotNull(check.getRequiredTokens());
+        Assert.assertTrue("Comments are also TokenType token", check.isCommentNodesRequired());
     }
+
+    @Test
+    public void testCommentToken()
+            throws Exception {
+        final DefaultConfiguration checkConfig =
+                createCheckConfig(IllegalTokenTextCheck.class);
+        checkConfig.addAttribute("tokens", "COMMENT_CONTENT");
+        checkConfig.addAttribute("format", "a href");
+
+        checkConfig.addAttribute("message", null);
+        final String[] expected = {
+            "35:28: " + getCheckMessage(MSG_KEY, "a href"),
+        };
+        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+    }
+
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTokens.java
index 6a70448a9..55cf3a8c2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTokens.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTokens.java
@@ -28,11 +28,11 @@ public class InputIllegalTokens
     public void methodWithLabels() {
         label:
         {
-            anotherLabel:
+            anotherLabel: // some comment href
             do {
                 continue anotherLabel;
             } while (false);
-            break label;
+            break label; // some a href
         }
     }
 }
\ No newline at end of file