From a4411aa08c3a9744139067dc38ced282adbf9fcc Mon Sep 17 00:00:00 2001 From: MANISH-K-07 Date: Mon, 12 Feb 2024 21:29:12 +0530 Subject: [PATCH] Issue #14436: Enforced naming convention for illegaltoken --- .../checks/coding/IllegalTokenCheckTest.java | 28 +++++++++---------- ...tIllegalTokensCheckBlockCommentBegin.java} | 2 +- ...putIllegalTokensCheckBlockCommentEnd.java} | 2 +- ...putIllegalTokensCheckCommentsContent.java} | 2 +- ...tIllegalTokensCheckDefaultTokenLabel.java} | 2 +- ...tIllegalTokensCheckSingleLineComment.java} | 2 +- ...llegalTokensCheckSwitchAndPostIncDec.java} | 2 +- ...> InputIllegalTokensCheckTokenNative.java} | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/{InputIllegalTokens5.java => InputIllegalTokensCheckBlockCommentBegin.java} (93%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/{InputIllegalTokens6.java => InputIllegalTokensCheckBlockCommentEnd.java} (94%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/{InputIllegalTokens4.java => InputIllegalTokensCheckCommentsContent.java} (94%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/{InputIllegalTokens.java => InputIllegalTokensCheckDefaultTokenLabel.java} (93%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/{InputIllegalTokens7.java => InputIllegalTokensCheckSingleLineComment.java} (93%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/{InputIllegalTokens2.java => InputIllegalTokensCheckSwitchAndPostIncDec.java} (93%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/{InputIllegalTokens3.java => InputIllegalTokensCheckTokenNative.java} (94%) 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 5c289ffe3da..9d626ec0425 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 @@ -38,18 +38,18 @@ protected String getPackageLocation() { } @Test - public void testCheckWithDefaultSettings() + public void testIllegalTokensCheckDefaultTokenLabel() throws Exception { final String[] expected = { "36:14: " + getCheckMessage(MSG_KEY, "label:"), "38:25: " + getCheckMessage(MSG_KEY, "anotherLabel:"), }; verifyWithInlineConfigParser( - getPath("InputIllegalTokens.java"), expected); + getPath("InputIllegalTokensCheckDefaultTokenLabel.java"), expected); } @Test - public void testPreviouslyIllegalTokens() + public void testIllegalTokensCheckSwitchAndPostIncDec() throws Exception { final String[] expected = { "18:9: " + getCheckMessage(MSG_KEY, "switch"), @@ -57,23 +57,23 @@ public void testPreviouslyIllegalTokens() "22:18: " + getCheckMessage(MSG_KEY, "++"), }; verifyWithInlineConfigParser( - getPath("InputIllegalTokens2.java"), expected); + getPath("InputIllegalTokensCheckSwitchAndPostIncDec.java"), expected); } @Test - public void testNative() throws Exception { + public void testIllegalTokensCheckTokenNative() throws Exception { final String[] expected = { "27:12: " + getCheckMessage(MSG_KEY, "native"), }; verifyWithInlineConfigParser( - getPath("InputIllegalTokens3.java"), expected); + getPath("InputIllegalTokensCheckTokenNative.java"), expected); } @Test - public void testCommentContentToken() + public void testIllegalTokensCheckCommentsContent() throws Exception { - final String path = getPath("InputIllegalTokens4.java"); + final String path = getPath("InputIllegalTokensCheckCommentsContent.java"); final String lineSeparator = CheckUtil.getLineSeparatorForFile(path, StandardCharsets.UTF_8); final String[] expected = { @@ -100,7 +100,7 @@ public void testCommentContentToken() } @Test - public void testBlockCommentBeginToken() + public void testIllegalTokensCheckBlockCommentBegin() throws Exception { final String[] expected = { @@ -108,11 +108,11 @@ public void testBlockCommentBeginToken() "10:1: " + getCheckMessage(MSG_KEY, "/*"), }; verifyWithInlineConfigParser( - getPath("InputIllegalTokens5.java"), expected); + getPath("InputIllegalTokensCheckBlockCommentBegin.java"), expected); } @Test - public void testBlockCommentEndToken() + public void testIllegalTokensCheckBlockCommentEnd() throws Exception { final String[] expected = { @@ -120,11 +120,11 @@ public void testBlockCommentEndToken() "12:2: " + getCheckMessage(MSG_KEY, "*/"), }; verifyWithInlineConfigParser( - getPath("InputIllegalTokens6.java"), expected); + getPath("InputIllegalTokensCheckBlockCommentEnd.java"), expected); } @Test - public void testSingleLineCommentToken() + public void testIllegalTokensCheckSingleLineComment() throws Exception { final String[] expected = { @@ -132,7 +132,7 @@ public void testSingleLineCommentToken() "42:26: " + getCheckMessage(MSG_KEY, "//"), }; verifyWithInlineConfigParser( - getPath("InputIllegalTokens7.java"), expected); + getPath("InputIllegalTokensCheckSingleLineComment.java"), expected); } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentBegin.java similarity index 93% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens5.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentBegin.java index 82994a1e0da..a1a4233d514 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens5.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentBegin.java @@ -10,7 +10,7 @@ /** // violation * Test for illegal tokens */ -public class InputIllegalTokens5 +public class InputIllegalTokensCheckBlockCommentBegin { public void methodWithPreviouslyIllegalTokens() { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens6.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentEnd.java similarity index 94% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens6.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentEnd.java index af44fb1800c..a627739c46e 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens6.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentEnd.java @@ -10,7 +10,7 @@ /** * Test for illegal tokens */ // violation -public class InputIllegalTokens6 +public class InputIllegalTokensCheckBlockCommentEnd { public void methodWithPreviouslyIllegalTokens() { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckCommentsContent.java similarity index 94% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens4.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckCommentsContent.java index e9db381854b..32f58d7a276 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens4.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckCommentsContent.java @@ -10,7 +10,7 @@ /** // violation * Test for illegal tokens */ -public class InputIllegalTokens4 +public class InputIllegalTokensCheckCommentsContent { public void methodWithPreviouslyIllegalTokens() { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckDefaultTokenLabel.java similarity index 93% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckDefaultTokenLabel.java index 2bc26554434..6a25504772b 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckDefaultTokenLabel.java @@ -10,7 +10,7 @@ /** * Test for illegal tokens */ -public class InputIllegalTokens +public class InputIllegalTokensCheckDefaultTokenLabel { public void methodWithPreviouslyIllegalTokens() { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens7.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSingleLineComment.java similarity index 93% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens7.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSingleLineComment.java index f3cc82f2ab6..b2a1608f753 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens7.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSingleLineComment.java @@ -10,7 +10,7 @@ /** * Test for illegal tokens */ -public class InputIllegalTokens7 +public class InputIllegalTokensCheckSingleLineComment { public void methodWithPreviouslyIllegalTokens() { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSwitchAndPostIncDec.java similarity index 93% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens2.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSwitchAndPostIncDec.java index 8799e44cdbf..b62dab38fb3 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens2.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSwitchAndPostIncDec.java @@ -10,7 +10,7 @@ /** * Test for illegal tokens */ -public class InputIllegalTokens2 +public class InputIllegalTokensCheckSwitchAndPostIncDec { public void methodWithPreviouslyIllegalTokens() { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckTokenNative.java similarity index 94% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens3.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckTokenNative.java index 4d9b493ab4a..198626f3366 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens3.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckTokenNative.java @@ -10,7 +10,7 @@ /** * Test for illegal tokens */ -public class InputIllegalTokens3 +public class InputIllegalTokensCheckTokenNative { public void methodWithPreviouslyIllegalTokens() {