Issue #4518: fix pmd violations for TestClassWithoutTestCases

49 files changed, 82 insertions, 84 deletions

diff --git a/config/pmd-test.xml b/config/pmd-test.xml
index 6b59cd5a6..8b8b03f57 100644
--- a/config/pmd-test.xml
+++ b/config/pmd-test.xml
@@ -73,8 +73,6 @@
         <exclude name="JUnitTestsShouldIncludeAssert"/>
         <!--tentative-->
         <exclude name="JUnitAssertionsShouldIncludeMessage"/>
-        <!-- tentative -->
-        <exclude name="TestClassWithoutTestCases"/>
     </rule>
 
     <rule ref="config/pmd.xml/ConfusingTernary">
diff --git a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule21filename/OuterTypeFilenameTest.java b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule21filename/OuterTypeFilenameTest.java
index e91db0666..cd81962dc 100644
--- a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule21filename/OuterTypeFilenameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule21filename/OuterTypeFilenameTest.java
@@ -40,7 +40,7 @@ public class OuterTypeFilenameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void outerTypeFilenameTest1() throws Exception {
+    public void testOuterTypeFilename1() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -52,7 +52,7 @@ public class OuterTypeFilenameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void outerTypeFilenameTest2() throws Exception {
+    public void testOuterTypeFilename2() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -64,7 +64,7 @@ public class OuterTypeFilenameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void outerTypeFilenameTest3() throws Exception {
+    public void testOuterTypeFilename3() throws Exception {
 
         final String[] expected = {
             "3: " + getCheckMessage(OuterTypeFilenameCheck.class, MSG_KEY),
diff --git a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule231filetab/FileTabCharacterTest.java b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule231filetab/FileTabCharacterTest.java
index d5578ce3c..c7771d838 100644
--- a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule231filetab/FileTabCharacterTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule231filetab/FileTabCharacterTest.java
@@ -46,7 +46,7 @@ public class FileTabCharacterTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void fileTabTest() throws Exception {
+    public void testFileTab() throws Exception {
 
         final String[] expected = {
             "8:25: " + getCheckMessage(FileTabCharacterCheck.class, "containsTab"),
diff --git a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule232specialescape/IllegalTokenTextTest.java b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule232specialescape/IllegalTokenTextTest.java
index 357c46920..00347252b 100644
--- a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule232specialescape/IllegalTokenTextTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule232specialescape/IllegalTokenTextTest.java
@@ -36,7 +36,7 @@ public class IllegalTokenTextTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void illegalTokensTest() throws Exception {
+    public void testIllegalTokens() throws Exception {
         final String message = "Consider using special escape sequence instead of octal value or "
                 + "Unicode escaped value.";
 
diff --git a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule233nonascii/AvoidEscapedUnicodeCharactersTest.java b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule233nonascii/AvoidEscapedUnicodeCharactersTest.java
index e349c9321..96acfae0a 100644
--- a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule233nonascii/AvoidEscapedUnicodeCharactersTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule233nonascii/AvoidEscapedUnicodeCharactersTest.java
@@ -39,7 +39,7 @@ public class AvoidEscapedUnicodeCharactersTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void unicodeEscapesTest() throws Exception {
+    public void testUnicodeEscapes() throws Exception {
 
         final String[] expected = {
             "5: " + getCheckMessage(AvoidEscapedUnicodeCharactersCheck.class, MSG_KEY),
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule32packagestate/LineLengthTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule32packagestate/LineLengthTest.java
index c111beaa3..ba66401cb 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule32packagestate/LineLengthTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule32packagestate/LineLengthTest.java
@@ -37,7 +37,7 @@ public class LineLengthTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void lineLengthTest() throws Exception {
+    public void testLineLength() throws Exception {
 
         final String[] expected = {
             "5: " + getCheckMessage(LineLengthCheck.class, "maxLineLen", 100, 112),
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule331nowildcard/AvoidStarImportTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule331nowildcard/AvoidStarImportTest.java
index 89c7480da..611c5a693 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule331nowildcard/AvoidStarImportTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule331nowildcard/AvoidStarImportTest.java
@@ -36,7 +36,7 @@ public class AvoidStarImportTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void starImportTest() throws Exception {
+    public void testStarImport() throws Exception {
 
         final String[] expected = {
             "3: Using the '.*' form of import should be avoided - java.io.*.",
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule332nolinewrap/NoLineWrapTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule332nolinewrap/NoLineWrapTest.java
index c09dbf596..c46af1d8a 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule332nolinewrap/NoLineWrapTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule332nolinewrap/NoLineWrapTest.java
@@ -39,7 +39,7 @@ public class NoLineWrapTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void badLineWrapTest() throws Exception {
+    public void testBadLineWrap() throws Exception {
 
         final String[] expected = {
             "1: " + getCheckMessage(NoLineWrapCheck.class, "no.line.wrap", "package"),
@@ -55,7 +55,7 @@ public class NoLineWrapTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void goodLineWrapTest() throws Exception {
+    public void testGoodLineWrap() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule333orderingandspacing/CustomImportOrderTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule333orderingandspacing/CustomImportOrderTest.java
index 30e283cff..299fd8716 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule333orderingandspacing/CustomImportOrderTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule333orderingandspacing/CustomImportOrderTest.java
@@ -48,7 +48,7 @@ public class CustomImportOrderTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void customImportTest1() throws Exception {
+    public void testCustomImport1() throws Exception {
 
         final String[] expected = {
             "4: " + getCheckMessage(clazz, MSG_LEX, "java.awt.Button.ABORT",
@@ -71,7 +71,7 @@ public class CustomImportOrderTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void customImportTest2() throws Exception {
+    public void testCustomImport2() throws Exception {
 
         final String[] expected = {
             "4: " + getCheckMessage(clazz, MSG_LEX, "java.awt.Button.ABORT",
@@ -96,7 +96,7 @@ public class CustomImportOrderTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void customImportTest3() throws Exception {
+    public void testCustomImport3() throws Exception {
 
         final String[] expected = {
             "4: " + getCheckMessage(clazz, MSG_LINE_SEPARATOR, "java.awt.Dialog"),
@@ -123,7 +123,7 @@ public class CustomImportOrderTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void validTest() throws Exception {
+    public void testValid() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -135,7 +135,7 @@ public class CustomImportOrderTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void validGoogleStyleOrderOfImportsTest() throws Exception {
+    public void testValidGoogleStyleOrderOfImports() throws Exception {
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
         final Configuration checkConfig = getCheckConfig("CustomImportOrder");
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule341onetoplevel/OneTopLevelClassTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule341onetoplevel/OneTopLevelClassTest.java
index 67dde5e87..90d68d9c9 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule341onetoplevel/OneTopLevelClassTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule341onetoplevel/OneTopLevelClassTest.java
@@ -38,7 +38,7 @@ public class OneTopLevelClassTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void badTest() throws Exception {
+    public void testBad() throws Exception {
 
         final Class<OneTopLevelClassCheck> clazz = OneTopLevelClassCheck.class;
         final String messageKey = "one.top.level.class";
@@ -60,7 +60,7 @@ public class OneTopLevelClassTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void goodTest() throws Exception {
+    public void testGood() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -72,7 +72,7 @@ public class OneTopLevelClassTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void bad1Test() throws Exception {
+    public void testBad1() throws Exception {
 
         final Class<OneTopLevelClassCheck> clazz = OneTopLevelClassCheck.class;
         final String messageKey = "one.top.level.class";
@@ -89,7 +89,7 @@ public class OneTopLevelClassTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void bad2Test() throws Exception {
+    public void testBad2() throws Exception {
 
         final Class<OneTopLevelClassCheck> clazz = OneTopLevelClassCheck.class;
         final String messageKey = "one.top.level.class";
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3421overloadsplit/OverloadMethodsDeclarationOrderTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3421overloadsplit/OverloadMethodsDeclarationOrderTest.java
index f2539d400..09240c6a1 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3421overloadsplit/OverloadMethodsDeclarationOrderTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3421overloadsplit/OverloadMethodsDeclarationOrderTest.java
@@ -37,7 +37,7 @@ public class OverloadMethodsDeclarationOrderTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void overloadMethodsTest() throws Exception {
+    public void testOverloadMethods() throws Exception {
 
         final Class<OverloadMethodsDeclarationOrderCheck> clazz =
             OverloadMethodsDeclarationOrderCheck.class;
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3sourcefile/EmptyLineSeparatorTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3sourcefile/EmptyLineSeparatorTest.java
index 2925e8e70..47e407ddd 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3sourcefile/EmptyLineSeparatorTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3sourcefile/EmptyLineSeparatorTest.java
@@ -37,7 +37,7 @@ public class EmptyLineSeparatorTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void emptyLineSeparatorTest() throws Exception {
+    public void testEmptyLineSeparator() throws Exception {
 
         final Class<EmptyLineSeparatorCheck> clazz = EmptyLineSeparatorCheck.class;
         final String messageKey = "empty.line.separator";
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/NeedBracesTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/NeedBracesTest.java
index 025e309a9..658250704 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/NeedBracesTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/NeedBracesTest.java
@@ -37,7 +37,7 @@ public class NeedBracesTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void needBracesTest() throws Exception {
+    public void testNeedBraces() throws Exception {
 
         final Class<NeedBracesCheck> clazz = NeedBracesCheck.class;
         final String messageKey = "needBraces";
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyTest.java
index 998f905bf..d37149f68 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyTest.java
@@ -39,7 +39,7 @@ public class LeftCurlyTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void leftCurlyBracesTest() throws Exception {
+    public void testLeftCurlyBraces() throws Exception {
 
         final String[] expected = {
             "4:1: " + getCheckMessage(LeftCurlyCheck.class, MSG_KEY_LINE_PREVIOUS, "{", 1),
@@ -59,7 +59,7 @@ public class LeftCurlyTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void leftCurlyAnnotationsTest() throws Exception {
+    public void testLeftCurlyAnnotations() throws Exception {
 
         final String[] expected = {
             "10:1: " + getCheckMessage(LeftCurlyCheck.class, MSG_KEY_LINE_PREVIOUS, "{", 1),
@@ -77,7 +77,7 @@ public class LeftCurlyTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void leftCurlyMethodsTest() throws Exception {
+    public void testLeftCurlyMethods() throws Exception {
 
         final String[] expected = {
             "4:1: " + getCheckMessage(LeftCurlyCheck.class, MSG_KEY_LINE_PREVIOUS, "{", 1),
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java
index 377bbef2e..cbd7819ed 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java
@@ -43,7 +43,7 @@ public class RightCurlyTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void rightCurlyTestAlone() throws Exception {
+    public void testRightCurlyAlone() throws Exception {
         final String[] expected = {
             "20:17: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_SAME, "}", 17),
             "32:13: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_SAME, "}", 13),
@@ -58,7 +58,7 @@ public class RightCurlyTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void rightCurlyTestSame() throws Exception {
+    public void testRightCurlySame() throws Exception {
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
         final Configuration checkConfig = getCheckConfig("RightCurly", "RightCurlySame");
@@ -101,7 +101,7 @@ public class RightCurlyTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void rightCurlyAloneTestSame() throws Exception {
+    public void testRightCurlyAloneSame() throws Exception {
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
         final Configuration checkConfig = getCheckConfig("RightCurly", "RightCurlyAlone");
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockTest.java
index 9a3471efe..b5409db5a 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockTest.java
@@ -37,7 +37,7 @@ public class EmptyBlockTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void emptyBlockTest() throws Exception {
+    public void testEmptyBlock() throws Exception {
 
         final String[] expected = {
             "19:21: " + getCheckMessage(EmptyBlockCheck.class, "block.empty", "if"),
@@ -83,7 +83,7 @@ public class EmptyBlockTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void emptyBlockTestCatch() throws Exception {
+    public void testEmptyBlockCatch() throws Exception {
 
         final String[] expected = {
             "29:17: " + getCheckMessage(EmptyBlockCheck.class, "block.empty", "finally"),
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockTest.java
index f9bc7407b..89d4f72e2 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockTest.java
@@ -38,7 +38,7 @@ public class EmptyCatchBlockTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void emptyBlockTestCatch() throws Exception {
+    public void testEmptyBlockCatch() throws Exception {
 
         final String[] expected = {
             "28: " + getCheckMessage(EmptyCatchBlockCheck.class, "catch.block.empty"),
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule43onestatement/OneStatementPerLineTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule43onestatement/OneStatementPerLineTest.java
index 8ad8b7a27..e5344a6b0 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule43onestatement/OneStatementPerLineTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule43onestatement/OneStatementPerLineTest.java
@@ -37,7 +37,7 @@ public class OneStatementPerLineTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void oneStatementTest() throws Exception {
+    public void testOneStatement() throws Exception {
 
         final String msg = getCheckMessage(OneStatementPerLineCheck.class,
             "multiple.statements.line");
@@ -74,7 +74,7 @@ public class OneStatementPerLineTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void oneStatementNonCompilableInputTest() throws Exception {
+    public void testOneStatementNonCompilableInput() throws Exception {
 
         final String msg = getCheckMessage(OneStatementPerLineCheck.class,
             "multiple.statements.line");
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule44columnlimit/LineLengthTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule44columnlimit/LineLengthTest.java
index 0aad05a56..af0b242d3 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule44columnlimit/LineLengthTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule44columnlimit/LineLengthTest.java
@@ -37,7 +37,7 @@ public class LineLengthTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void lineLengthTest() throws Exception {
+    public void testLineLength() throws Exception {
 
         final String[] expected = {
             "5: " + getCheckMessage(LineLengthCheck.class, "maxLineLen", 100, 112),
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/MethodParamPadTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/MethodParamPadTest.java
index 1b74f084e..558e018e5 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/MethodParamPadTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/MethodParamPadTest.java
@@ -37,7 +37,7 @@ public class MethodParamPadTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void operatorWrapTest() throws Exception {
+    public void testOperatorWrap() throws Exception {
 
         final Class<MethodParamPadCheck> clazz = MethodParamPadCheck.class;
         final String messageKeyPrevious = "line.previous";
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/OperatorWrapTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/OperatorWrapTest.java
index 96cc48b19..e0041e1d4 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/OperatorWrapTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/OperatorWrapTest.java
@@ -37,7 +37,7 @@ public class OperatorWrapTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void operatorWrapTest() throws Exception {
+    public void testOperatorWrap() throws Exception {
 
         final Class<OperatorWrapCheck> clazz = OperatorWrapCheck.class;
         final String messageKey = "line.new";
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/SeparatorWrapTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/SeparatorWrapTest.java
index 393f773d7..146babf81 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/SeparatorWrapTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/SeparatorWrapTest.java
@@ -39,7 +39,7 @@ public class SeparatorWrapTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void separatorWrapDotTest() throws Exception {
+    public void testSeparatorWrapDot() throws Exception {
 
         final String[] expected = {
             "28:30: " + getCheckMessage(SeparatorWrapCheck.class, "line.new", "."),
@@ -53,7 +53,7 @@ public class SeparatorWrapTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void separatorWrapCommaTest() throws Exception {
+    public void testSeparatorWrapComma() throws Exception {
 
         final String[] expected = {
             "31:17: " + getCheckMessage(SeparatorWrapCheck.class, "line.previous", ","),
@@ -67,7 +67,7 @@ public class SeparatorWrapTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void separatorWrapMethodRefTest() throws Exception {
+    public void testSeparatorWrapMethodRef() throws Exception {
 
         final String[] expected = {
             "17:49: " + getCheckMessage(SeparatorWrapCheck.class, MSG_LINE_NEW, "::"),
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule461verticalwhitespace/EmptyLineSeparatorTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule461verticalwhitespace/EmptyLineSeparatorTest.java
index 486a4a479..8097138b4 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule461verticalwhitespace/EmptyLineSeparatorTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule461verticalwhitespace/EmptyLineSeparatorTest.java
@@ -37,7 +37,7 @@ public class EmptyLineSeparatorTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void emptyLineSeparatorTest() throws Exception {
+    public void testEmptyLineSeparator() throws Exception {
 
         final Class<EmptyLineSeparatorCheck> clazz = EmptyLineSeparatorCheck.class;
         final String messageKey = "empty.line.separator";
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java
index eb9b87efe..c750d9d2b 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java
@@ -36,7 +36,7 @@ public class GenericWhitespaceTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void whitespaceAroundGenericsTest() throws Exception {
+    public void testWhitespaceAroundGenerics() throws Exception {
 
         final String msgPreceded = "ws.preceded";
         final String msgFollowed = "ws.followed";
@@ -68,7 +68,7 @@ public class GenericWhitespaceTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void genericWhitespaceTest() throws Exception {
+    public void testGenericWhitespace() throws Exception {
         final String msgPreceded = "ws.preceded";
         final String msgFollowed = "ws.followed";
         final String msgNotPreceded = "ws.notPreceded";
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/MethodParamPadTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/MethodParamPadTest.java
index 578b472a9..35294af60 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/MethodParamPadTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/MethodParamPadTest.java
@@ -37,7 +37,7 @@ public class MethodParamPadTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void operatorWrapTest() throws Exception {
+    public void testOperatorWrap() throws Exception {
 
         final Class<MethodParamPadCheck> clazz = MethodParamPadCheck.class;
         final String messageKeyPreceded = "ws.preceded";
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/ParenPadTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/ParenPadTest.java
index 9bdaf66c0..6c8e1b119 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/ParenPadTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/ParenPadTest.java
@@ -37,7 +37,7 @@ public class ParenPadTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void methodParenTest() throws Exception {
+    public void testMethodParen() throws Exception {
 
         final Class<ParenPadCheck> clazz = ParenPadCheck.class;
         final String messageKeyPreceded = "ws.preceded";
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java
index 01ad807ab..4c9944bf2 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java
@@ -37,7 +37,7 @@ public class WhitespaceAroundTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void whitespaceAroundBasicTest() throws Exception {
+    public void testWhitespaceAroundBasic() throws Exception {
 
         final Configuration checkConfig = getCheckConfig("WhitespaceAround");
         final String msgPreceded = "ws.notPreceded";
@@ -76,7 +76,7 @@ public class WhitespaceAroundTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void whitespaceAroundEmptyTypesCyclesTest() throws Exception {
+    public void testWhitespaceAroundEmptyTypesCycles() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java
index ea4d451b9..9958cd9a0 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java
@@ -37,7 +37,7 @@ public class MultipleVariableDeclarationsTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void multipleVariableDeclarationsTest() throws Exception {
+    public void testMultipleVariableDeclarations() throws Exception {
 
         final String msgComma = getCheckMessage(MultipleVariableDeclarationsCheck.class,
             "multiple.variable.declarations.comma");
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/VariableDeclarationUsageDistanceTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/VariableDeclarationUsageDistanceTest.java
index ebd7f26e7..1d9221cdf 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/VariableDeclarationUsageDistanceTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/VariableDeclarationUsageDistanceTest.java
@@ -37,7 +37,7 @@ public class VariableDeclarationUsageDistanceTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void arrayTypeStyleTest() throws Exception {
+    public void testArrayTypeStyle() throws Exception {
 
         final String msgExt = "variable.declaration.usage.distance.extend";
         final Class<VariableDeclarationUsageDistanceCheck> clazz =
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java
index d4cb9307e..e71861d05 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java
@@ -39,7 +39,7 @@ public class ArrayTypeStyleTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void arrayTypeStyleTest() throws Exception {
+    public void testArrayTypeStyle() throws Exception {
 
         final String[] expected = {
             "9:23: " + getCheckMessage(ArrayTypeStyleCheck.class, MSG_KEY),
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationTest.java
index cacbe526d..3976fca43 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationTest.java
@@ -37,7 +37,7 @@ public class IndentationTest extends BaseIndentationCheckSupport {
     }
 
     @Test
-    public void correctClassTest() throws Exception {
+    public void testCorrectClass() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -49,7 +49,7 @@ public class IndentationTest extends BaseIndentationCheckSupport {
     }
 
     @Test
-    public void correctFieldTest() throws Exception {
+    public void testCorrectField() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -61,7 +61,7 @@ public class IndentationTest extends BaseIndentationCheckSupport {
     }
 
     @Test
-    public void correctForTest() throws Exception {
+    public void testCorrectFor() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -73,7 +73,7 @@ public class IndentationTest extends BaseIndentationCheckSupport {
     }
 
     @Test
-    public void correctIfTest() throws Exception {
+    public void testCorrectIf() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -85,7 +85,7 @@ public class IndentationTest extends BaseIndentationCheckSupport {
     }
 
     @Test
-    public void correctTest() throws Exception {
+    public void testCorrect() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -97,7 +97,7 @@ public class IndentationTest extends BaseIndentationCheckSupport {
     }
 
     @Test
-    public void correctReturnTest() throws Exception {
+    public void testCorrectReturn() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -109,7 +109,7 @@ public class IndentationTest extends BaseIndentationCheckSupport {
     }
 
     @Test
-    public void correctWhileTest() throws Exception {
+    public void testCorrectWhile() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java
index eb0f8e823..466199a4c 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java
@@ -37,7 +37,7 @@ public class FallThroughTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void fallThroughTest() throws Exception {
+    public void testFallThrough() throws Exception {
 
         final String msg = getCheckMessage(FallThroughCheck.class, "fall.through");
 
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java
index 58e9a386d..439d81988 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java
@@ -37,7 +37,7 @@ public class MissingSwitchDefaultTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void missingSwitchDefaultTest() throws Exception {
+    public void testMissingSwitchDefault() throws Exception {
 
         final String msg = getCheckMessage(MissingSwitchDefaultCheck.class,
             "missing.switch.default");
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java
index 89659445b..c3ea59499 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java
@@ -37,7 +37,7 @@ public class AnnotationLocationTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void annotationTest() throws Exception {
+    public void testAnnotation() throws Exception {
 
         final Class<AnnotationLocationCheck> clazz = AnnotationLocationCheck.class;
         getCheckMessage(clazz, "annotation.location.alone");
@@ -67,7 +67,7 @@ public class AnnotationLocationTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void annotationTestVariables() throws Exception {
+    public void testAnnotationVariables() throws Exception {
 
         final Class<AnnotationLocationCheck> clazz = AnnotationLocationCheck.class;
         getCheckMessage(clazz, "annotation.location.alone");
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java
index 8535e2201..9ecea409f 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java
@@ -37,7 +37,7 @@ public class ModifierOrderTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void modifierOrderTest() throws Exception {
+    public void testModifierOrder() throws Exception {
 
         final Class<ModifierOrderCheck> clazz = ModifierOrderCheck.class;
         final String msgMod = "mod.order";
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java
index e216cf40c..a317e752f 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java
@@ -36,7 +36,7 @@ public class UpperEllTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void upperEllTest() throws Exception {
+    public void testUpperEll() throws Exception {
 
         final String[] expected = {
             "6:36: Should use uppercase 'L'.",
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule51identifiernames/CatchParameterNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule51identifiernames/CatchParameterNameTest.java
index a182c2ba1..b38e4c600 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule51identifiernames/CatchParameterNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule51identifiernames/CatchParameterNameTest.java
@@ -46,7 +46,7 @@ public class CatchParameterNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void catchParameterNameTest() throws Exception {
+    public void testCatchParameterName() throws Exception {
         final String msgKey = "name.invalidPattern";
 
         final String[] expected = {
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule521packagenames/PackageNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule521packagenames/PackageNameTest.java
index ebd57064c..91f690b16 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule521packagenames/PackageNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule521packagenames/PackageNameTest.java
@@ -48,7 +48,7 @@ public class PackageNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void goodPackageNameTest() throws Exception {
+    public void testGoodPackageName() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -59,7 +59,7 @@ public class PackageNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void badPackageNameTest() throws Exception {
+    public void testBadPackageName() throws Exception {
 
         final String packagePath =
                 "com.google.checkstyle.test.chapter5naming.rule521packageNamesCamelCase";
@@ -76,7 +76,7 @@ public class PackageNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void badPackageName2Test() throws Exception {
+    public void testBadPackageName2() throws Exception {
 
         final String packagePath = "com.google.checkstyle.test.chapter5naming.rule521_packagenames";
         final String msg = getCheckMessage(checkConfig.getMessages(), MSG_KEY, packagePath, format);
@@ -92,7 +92,7 @@ public class PackageNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void badPackageName3Test() throws Exception {
+    public void testBadPackageName3() throws Exception {
 
         final String packagePath = "com.google.checkstyle.test.chapter5naming.rule521$packagenames";
         final String msg = getCheckMessage(checkConfig.getMessages(), MSG_KEY, packagePath, format);
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule522typenames/TypeNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule522typenames/TypeNameTest.java
index 6958ea2a4..ae72f3803 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule522typenames/TypeNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule522typenames/TypeNameTest.java
@@ -36,7 +36,7 @@ public class TypeNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void typeNameTest() throws Exception {
+    public void testTypeName() throws Exception {
 
         final Configuration checkConfig = getCheckConfig("TypeName");
         final String msgKey = "name.invalidPattern";
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule523methodnames/MethodNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule523methodnames/MethodNameTest.java
index 4c917561f..1a3d3f52a 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule523methodnames/MethodNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule523methodnames/MethodNameTest.java
@@ -36,7 +36,7 @@ public class MethodNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void methodNameTest() throws Exception {
+    public void testMethodName() throws Exception {
 
         final Configuration checkConfig = getCheckConfig("MethodName");
         final String msgKey = "name.invalidPattern";
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule525nonconstantfieldnames/MemberNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule525nonconstantfieldnames/MemberNameTest.java
index 498a0d813..a85881d13 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule525nonconstantfieldnames/MemberNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule525nonconstantfieldnames/MemberNameTest.java
@@ -48,7 +48,7 @@ public class MemberNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void memberNameTest() throws Exception {
+    public void testMemberName() throws Exception {
 
         final String[] expected = {
             "5:16: " + getCheckMessage(checkConfig.getMessages(), MSG_KEY, "mPublic", format),
@@ -73,7 +73,7 @@ public class MemberNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void simpleTest() throws Exception {
+    public void testSimple() throws Exception {
 
         final String[] expected = {
             "12:17: " + getCheckMessage(checkConfig.getMessages(), MSG_KEY, "bad$Static", format),
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/ParameterNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/ParameterNameTest.java
index eb288b244..a9eb52ce9 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/ParameterNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/ParameterNameTest.java
@@ -54,7 +54,7 @@ public class ParameterNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void generalParameterNameTest() throws Exception {
+    public void testGeneralParameterName() throws Exception {
 
         final String[] expected = {
             "10:21: " + getCheckMessage(config.getMessages(), MSG_KEY, "bB", format),
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameTest.java
index dd6c265cb..1e6ee14bc 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameTest.java
@@ -48,7 +48,7 @@ public class LocalVariableNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void localVariableNameTest() throws Exception {
+    public void testLocalVariableName() throws Exception {
 
         final String[] expected = {
             "27:13: " + getCheckMessage(checkConfig.getMessages(), MSG_KEY, "aA", format),
@@ -70,7 +70,7 @@ public class LocalVariableNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void oneCharTest() throws Exception {
+    public void testOneChar() throws Exception {
 
         final String[] expected = {
             "21:17: " + getCheckMessage(checkConfig.getMessages(), MSG_KEY, "I_ndex", format),
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java
index 43a130c28..ad4ecbc14 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java
@@ -40,7 +40,7 @@ public class AbbreviationAsWordInNameTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void abbreviationAsWordInNameTest() throws Exception {
+    public void testAbbreviationAsWordInName() throws Exception {
 
         final int maxCapitalCount = 2;
 
diff --git a/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule62donotignoreexceptions/EmptyBlockTest.java b/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule62donotignoreexceptions/EmptyBlockTest.java
index 220ec8a23..9fa2885ec 100644
--- a/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule62donotignoreexceptions/EmptyBlockTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule62donotignoreexceptions/EmptyBlockTest.java
@@ -37,7 +37,7 @@ public class EmptyBlockTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void emptyBlockTestCatch() throws Exception {
+    public void testEmptyBlockCatch() throws Exception {
 
         final String[] expected = {
             "29:17: " + getCheckMessage(EmptyBlockCheck.class, "block.empty", "finally"),
diff --git a/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java b/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java
index 15738b7c3..381f2c5f7 100644
--- a/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java
@@ -37,7 +37,7 @@ public class NoFinalizerTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void noFinalizerBasicTest() throws Exception {
+    public void testNoFinalizerBasic() throws Exception {
 
         final String msg = getCheckMessage(NoFinalizerCheck.class, "avoid.finalizer.method");
 
@@ -53,7 +53,7 @@ public class NoFinalizerTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void noFinalizerExtendedTest() throws Exception {
+    public void testNoFinalizerExtended() throws Exception {
 
         final String msg = getCheckMessage(NoFinalizerCheck.class, "avoid.finalizer.method");
 
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/SingleLineJavadocTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/SingleLineJavadocTest.java
index 488697c26..623b2555f 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/SingleLineJavadocTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/SingleLineJavadocTest.java
@@ -37,7 +37,7 @@ public class SingleLineJavadocTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void singleLineJavadocTest() throws Exception {
+    public void testSingleLineJavadoc() throws Exception {
 
         final String msg = getCheckMessage(SingleLineJavadocCheck.class, "singleline.javadoc");
 
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/JavadocParagraphTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/JavadocParagraphTest.java
index 98fbf9f11..6181e105e 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/JavadocParagraphTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/JavadocParagraphTest.java
@@ -38,7 +38,7 @@ public class JavadocParagraphTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void javadocParagraphCorrectTest() throws Exception {
+    public void testJavadocParagraphCorrect() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
@@ -50,7 +50,7 @@ public class JavadocParagraphTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void javadocParagraphIncorrectTest() throws Exception {
+    public void testJavadocParagraphIncorrect() throws Exception {
 
         final String msgBefore = getCheckMessage(JavadocParagraphCheck.class,
                 "javadoc.paragraph.line.before");
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/JavadocMethodTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/JavadocMethodTest.java
index fc0295b93..1134b5433 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/JavadocMethodTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/JavadocMethodTest.java
@@ -37,7 +37,7 @@ public class JavadocMethodTest extends BaseCheckTestSupport {
     }
 
     @Test
-    public void javadocMethodTest() throws Exception {
+    public void testJavadocMethod() throws Exception {
 
         final String msg = getCheckMessage(JavadocMethodCheck.class, "javadoc.missing");