From 339e0ff9a6694e2724027c5e41028d2cd7b138cb Mon Sep 17 00:00:00 2001 From: rnveach Date: Sat, 7 Nov 2015 21:55:24 -0500 Subject: [PATCH] Issue #2161: unify it input file names for chapter4formatting --- .../rule411bracesareused/NeedBracesTest.java | 2 +- .../LeftCurlyRightCurlyTest.java | 10 +++++----- .../rule413emptyblocks/EmptyBlockTest.java | 4 ++-- .../rule413emptyblocks/EmptyCatchBlockTest.java | 8 ++++---- .../OneStatementPerLineTest.java | 2 +- .../rule451wheretobreack/MethodParamPadTest.java | 2 +- .../rule451wheretobreack/OperatorWrapTest.java | 4 ++-- .../rule451wheretobreack/SeparatorWrapTest.java | 2 +- .../rule4841indentation/IndentationTest.java | 14 +++++++------- .../EmptyBlockTest.java | 2 +- .../{NeedBracesInput.java => InputNeedBraces.java} | 4 ++-- ...tations.java => InputLeftCurlyAnnotations.java} | 2 +- ...Input_Braces.java => InputLeftCurlyBraces.java} | 4 ++-- ...Input_Method.java => InputLeftCurlyMethod.java} | 8 ++++---- ...yInput_Other.java => InputRightCurlyOther.java} | 4 ++-- ...urlyInputSame.java => InputRightCurlySame.java} | 2 +- ...kInput_Basic.java => InputEmptyBlockBasic.java} | 0 ...ckInputCatch.java => InputEmptyBlockCatch.java} | 0 ....java => InputEmptyCatchBlockNoViolations.java} | 2 +- ...> InputEmptyCatchBlockViolationsByComment.java} | 2 +- ...utEmptyCatchBlockViolationsByVariableName.java} | 2 +- ...rectInput.java => InputIndentationCorrect.java} | 6 +++--- ...nput.java => InputIndentationCorrectClass.java} | 4 ++-- ... InputIndentationCorrectFieldAndParameter.java} | 0 ...=> InputIndentationCorrectForAndParameter.java} | 0 ... => InputIndentationCorrectIfAndParameter.java} | 0 ...InputIndentationCorrectReturnAndParameter.java} | 0 ...ndentationCorrectWhileDoWhileAndParameter.java} | 0 ...ineInput.java => InputOneStatementPerLine.java} | 2 +- ...ParamPadInput.java => InputMethodParamPad.java} | 4 ++-- ...eratorWrapInput.java => InputOperatorWrap.java} | 4 ++-- ...signInput.java => InputOperatorWrapAssign.java} | 4 ++-- ...ratorWrapInput.java => InputSeparatorWrap.java} | 4 ++-- ...rectInput.java => InputIndentationCorrect.java} | 6 +++--- ...nput.java => InputIndentationCorrectClass.java} | 4 ++-- ... InputIndentationCorrectFieldAndParameter.java} | 0 ...=> InputIndentationCorrectForAndParameter.java} | 0 ... => InputIndentationCorrectIfAndParameter.java} | 0 ...InputIndentationCorrectReturnAndParameter.java} | 0 ...ndentationCorrectWhileDoWhileAndParameter.java} | 0 ...rectInput.java => InputIndentationCorrect.java} | 6 +++--- ...nput.java => InputIndentationCorrectClass.java} | 4 ++-- ... InputIndentationCorrectFieldAndParameter.java} | 0 ...=> InputIndentationCorrectForAndParameter.java} | 0 ... => InputIndentationCorrectIfAndParameter.java} | 0 ...InputIndentationCorrectReturnAndParameter.java} | 0 ...ndentationCorrectWhileDoWhileAndParameter.java} | 0 47 files changed, 64 insertions(+), 64 deletions(-) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/{NeedBracesInput.java => InputNeedBraces.java} (98%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/{LeftCurlyInput_Annotations.java => InputLeftCurlyAnnotations.java} (97%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/{LeftCurlyInput_Braces.java => InputLeftCurlyBraces.java} (97%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/{LeftCurlyInput_Method.java => InputLeftCurlyMethod.java} (91%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/{RightCurlyInput_Other.java => InputRightCurlyOther.java} (98%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/{RightCurlyInputSame.java => InputRightCurlySame.java} (85%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/{EmptyBlockInput_Basic.java => InputEmptyBlockBasic.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/{EmptyBlockInputCatch.java => InputEmptyBlockCatch.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/{EmptyCatchBlockNoViolationsInput.java => InputEmptyCatchBlockNoViolations.java} (97%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/{EmptyCatchBlockViolationsByCommentInput.java => InputEmptyCatchBlockViolationsByComment.java} (97%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/{EmptyCatchBlockViolationsByVariableNameInput.java => InputEmptyCatchBlockViolationsByVariableName.java} (95%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/{IndentationCorrectInput.java => InputIndentationCorrect.java} (95%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/{IndentationCorrectClassInput.java => InputIndentationCorrectClass.java} (92%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/{IndentationCorrectFieldAndParameterInput.java => InputIndentationCorrectFieldAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/{IndentationCorrectForAndParameterInput.java => InputIndentationCorrectForAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/{IndentationCorrectIfAndParameterInput.java => InputIndentationCorrectIfAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/{IndentationCorrectReturnAndParameterInput.java => InputIndentationCorrectReturnAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/{IndentationCorrectWhileDoWhileAndParameterInput.java => InputIndentationCorrectWhileDoWhileAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule43onestatement/{OneStatementPerLineInput.java => InputOneStatementPerLine.java} (99%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/{MethodParamPadInput.java => InputMethodParamPad.java} (99%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/{OperatorWrapInput.java => InputOperatorWrap.java} (99%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/{OperatorWrapAssignInput.java => InputOperatorWrapAssign.java} (99%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/{SeparatorWrapInput.java => InputSeparatorWrap.java} (96%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/{IndentationCorrectInput.java => InputIndentationCorrect.java} (95%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/{IndentationCorrectClassInput.java => InputIndentationCorrectClass.java} (92%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/{IndentationCorrectFieldAndParameterInput.java => InputIndentationCorrectFieldAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/{IndentationCorrectForAndParameterInput.java => InputIndentationCorrectForAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/{IndentationCorrectIfAndParameterInput.java => InputIndentationCorrectIfAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/{IndentationCorrectReturnAndParameterInput.java => InputIndentationCorrectReturnAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/{IndentationCorrectWhileDoWhileAndParameterInput.java => InputIndentationCorrectWhileDoWhileAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/{IndentationCorrectInput.java => InputIndentationCorrect.java} (95%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/{IndentationCorrectClassInput.java => InputIndentationCorrectClass.java} (92%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/{IndentationCorrectFieldAndParameterInput.java => InputIndentationCorrectFieldAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/{IndentationCorrectForAndParameterInput.java => InputIndentationCorrectForAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/{IndentationCorrectIfAndParameterInput.java => InputIndentationCorrectIfAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/{IndentationCorrectReturnAndParameterInput.java => InputIndentationCorrectReturnAndParameter.java} (100%) rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/{IndentationCorrectWhileDoWhileAndParameterInput.java => InputIndentationCorrectWhileDoWhileAndParameter.java} (100%) 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 f8868e940..2e68aa7e9 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 @@ -86,7 +86,7 @@ public class NeedBracesTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("NeedBraces"); - final String filePath = builder.getFilePath("NeedBracesInput"); + final String filePath = builder.getFilePath("InputNeedBraces"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyRightCurlyTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyRightCurlyTest.java index 32fd0bb81..5358532f8 100644 --- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyRightCurlyTest.java +++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyRightCurlyTest.java @@ -60,7 +60,7 @@ public class LeftCurlyRightCurlyTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("LeftCurly"); - final String filePath = builder.getFilePath("LeftCurlyInput_Braces"); + final String filePath = builder.getFilePath("InputLeftCurlyBraces"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -78,7 +78,7 @@ public class LeftCurlyRightCurlyTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("LeftCurly"); - final String filePath = builder.getFilePath("LeftCurlyInput_Annotations"); + final String filePath = builder.getFilePath("InputLeftCurlyAnnotations"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -106,7 +106,7 @@ public class LeftCurlyRightCurlyTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("LeftCurly"); - final String filePath = builder.getFilePath("LeftCurlyInput_Method"); + final String filePath = builder.getFilePath("InputLeftCurlyMethod"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -126,7 +126,7 @@ public class LeftCurlyRightCurlyTest extends BaseCheckTestSupport { "122:6: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_NEW, "}", 6), }; - final String filePath = builder.getFilePath("RightCurlyInput_Other"); + final String filePath = builder.getFilePath("InputRightCurlyOther"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(newCheckConfig, filePath, expected, warnList); } @@ -138,7 +138,7 @@ public class LeftCurlyRightCurlyTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - final String filePath = builder.getFilePath("RightCurlyInputSame"); + final String filePath = builder.getFilePath("InputRightCurlySame"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(newCheckConfig, filePath, expected, warnList); } 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 a61dd7eba..2efa48095 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 @@ -78,7 +78,7 @@ public class EmptyBlockTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("EmptyBlock"); - final String filePath = builder.getFilePath("EmptyBlockInput_Basic"); + final String filePath = builder.getFilePath("InputEmptyBlockBasic"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -94,7 +94,7 @@ public class EmptyBlockTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("EmptyBlock"); - final String filePath = builder.getFilePath("EmptyBlockInputCatch"); + final String filePath = builder.getFilePath("InputEmptyBlockCatch"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); 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 eafff63b6..8fe7aa17a 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 @@ -48,7 +48,7 @@ public class EmptyCatchBlockTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("EmptyCatchBlock"); - final String filePath = builder.getFilePath("EmptyBlockInputCatch"); + final String filePath = builder.getFilePath("InputEmptyBlockCatch"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -60,7 +60,7 @@ public class EmptyCatchBlockTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; final Configuration checkConfig = builder.getCheckConfig("EmptyCatchBlock"); - final String filePath = builder.getFilePath("EmptyCatchBlockNoViolationsInput"); + final String filePath = builder.getFilePath("InputEmptyCatchBlockNoViolations"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -75,7 +75,7 @@ public class EmptyCatchBlockTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("EmptyCatchBlock"); - final String filePath = builder.getFilePath("EmptyCatchBlockViolationsByCommentInput"); + final String filePath = builder.getFilePath("InputEmptyCatchBlockViolationsByComment"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -91,7 +91,7 @@ public class EmptyCatchBlockTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("EmptyCatchBlock"); - final String filePath = builder.getFilePath("EmptyCatchBlockViolationsByVariableNameInput"); + final String filePath = builder.getFilePath("InputEmptyCatchBlockViolationsByVariableName"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); 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 2410874c9..51ce9a845 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 @@ -69,7 +69,7 @@ public class OneStatementPerLineTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("OneStatementPerLine"); - final String filePath = builder.getFilePath("OneStatementPerLineInput"); + final String filePath = builder.getFilePath("InputOneStatementPerLine"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/MethodParamPadTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/MethodParamPadTest.java index e54098073..d77da9b6f 100644 --- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/MethodParamPadTest.java +++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/MethodParamPadTest.java @@ -50,7 +50,7 @@ public class MethodParamPadTest extends BaseCheckTestSupport { "130:9: " + getCheckMessage(clazz, messageKey, "("), }; final Configuration checkConfig = builder.getCheckConfig("MethodParamPad"); - final String filePath = builder.getFilePath("MethodParamPadInput"); + final String filePath = builder.getFilePath("InputMethodParamPad"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/OperatorWrapTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/OperatorWrapTest.java index 20c13a3a5..297a66597 100644 --- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/OperatorWrapTest.java +++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/OperatorWrapTest.java @@ -69,7 +69,7 @@ public class OperatorWrapTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("OperatorWrap"); - final String filePath = builder.getFilePath("OperatorWrapInput"); + final String filePath = builder.getFilePath("InputOperatorWrap"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -123,7 +123,7 @@ public class OperatorWrapTest extends BaseCheckTestSupport { "348:17: " + getCheckMessage(clazz, messageKey, "<<="), }; - final String filePath = builder.getFilePath("OperatorWrapAssignInput"); + final String filePath = builder.getFilePath("InputOperatorWrapAssign"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(newCheckConfig, filePath, expected, warnList); } diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/SeparatorWrapTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/SeparatorWrapTest.java index 2d5b62130..8130ece2d 100644 --- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/SeparatorWrapTest.java +++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/SeparatorWrapTest.java @@ -46,7 +46,7 @@ public class SeparatorWrapTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("SeparatorWrap"); - final String filePath = builder.getFilePath("SeparatorWrapInput"); + final String filePath = builder.getFilePath("InputSeparatorWrap"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); 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 697252d04..97617a7f1 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 @@ -45,7 +45,7 @@ public class IndentationTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; final Configuration checkConfig = builder.getCheckConfig("Indentation"); - final String filePath = builder.getFilePath("IndentationCorrectClassInput"); + final String filePath = builder.getFilePath("InputIndentationCorrectClass"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -57,7 +57,7 @@ public class IndentationTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; final Configuration checkConfig = builder.getCheckConfig("Indentation"); - final String filePath = builder.getFilePath("IndentationCorrectFieldAndParameterInput"); + final String filePath = builder.getFilePath("InputIndentationCorrectFieldAndParameter"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -69,7 +69,7 @@ public class IndentationTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; final Configuration checkConfig = builder.getCheckConfig("Indentation"); - final String filePath = builder.getFilePath("IndentationCorrectForAndParameterInput"); + final String filePath = builder.getFilePath("InputIndentationCorrectForAndParameter"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -81,7 +81,7 @@ public class IndentationTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; final Configuration checkConfig = builder.getCheckConfig("Indentation"); - final String filePath = builder.getFilePath("IndentationCorrectIfAndParameterInput"); + final String filePath = builder.getFilePath("InputIndentationCorrectIfAndParameter"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -93,7 +93,7 @@ public class IndentationTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; final Configuration checkConfig = builder.getCheckConfig("Indentation"); - final String filePath = builder.getFilePath("IndentationCorrectInput"); + final String filePath = builder.getFilePath("InputIndentationCorrect"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -105,7 +105,7 @@ public class IndentationTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; final Configuration checkConfig = builder.getCheckConfig("Indentation"); - final String filePath = builder.getFilePath("IndentationCorrectReturnAndParameterInput"); + final String filePath = builder.getFilePath("InputIndentationCorrectReturnAndParameter"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); @@ -118,7 +118,7 @@ public class IndentationTest extends BaseCheckTestSupport { final Configuration checkConfig = builder.getCheckConfig("Indentation"); final String filePath = builder - .getFilePath("IndentationCorrectWhileDoWhileAndParameterInput"); + .getFilePath("InputIndentationCorrectWhileDoWhileAndParameter"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); 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 979d4b019..6d207501e 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 @@ -48,7 +48,7 @@ public class EmptyBlockTest extends BaseCheckTestSupport { }; final Configuration checkConfig = builder.getCheckConfig("EmptyBlock"); - final String filePath = builder.getFilePath("EmptyBlockInputCatch"); + final String filePath = builder.getFilePath("InputEmptyBlockCatch"); final Integer[] warnList = builder.getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/NeedBracesInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/InputNeedBraces.java similarity index 98% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/NeedBracesInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/InputNeedBraces.java index 6738edfb2..dcc9acb5b 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/NeedBracesInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/InputNeedBraces.java @@ -8,7 +8,7 @@ import java.awt.print.*; import java.lang.management.*; import javax.lang.model.element.*; -class NeedBracesInput +class InputNeedBraces { /** @return helper func **/ boolean condition() @@ -112,7 +112,7 @@ class NeedBracesInput } /** Empty constructor block. **/ - public NeedBracesInput() {} + public InputNeedBraces() {} /** Empty method block. **/ public void emptyImplementation() {} diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyInput_Annotations.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputLeftCurlyAnnotations.java similarity index 97% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyInput_Annotations.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputLeftCurlyAnnotations.java index 64e3e12e4..e6ed0a986 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyInput_Annotations.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputLeftCurlyAnnotations.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; @TestClassAnnotation -class LeftCurlyInput_Annotations +class InputLeftCurlyAnnotations { //warn private static final int X = 10; @Override diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyInput_Braces.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputLeftCurlyBraces.java similarity index 97% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyInput_Braces.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputLeftCurlyBraces.java index fc440b3df..6316ca683 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyInput_Braces.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputLeftCurlyBraces.java @@ -1,6 +1,6 @@ package com.google.checkstyle.test.chapter4formatting.rule412nonemptyblocks; -class LeftCurlyInput_Braces +class InputLeftCurlyBraces { //warn /** @return helper func **/ boolean condition() @@ -104,7 +104,7 @@ class LeftCurlyInput_Braces } /** Empty constructor block. **/ - public LeftCurlyInput_Braces() {} + public InputLeftCurlyBraces() {} /** Empty method block. **/ public void emptyImplementation() {} diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyInput_Method.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputLeftCurlyMethod.java similarity index 91% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyInput_Method.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputLeftCurlyMethod.java index 313267f54..ebbe5101a 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyInput_Method.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputLeftCurlyMethod.java @@ -1,11 +1,11 @@ package com.google.checkstyle.test.chapter4formatting.rule412nonemptyblocks; -class LeftCurlyInput_Method +class InputLeftCurlyMethod { //warn - LeftCurlyInput_Method() {} //ok - LeftCurlyInput_Method(String aOne) {//ok + InputLeftCurlyMethod() {} //ok + InputLeftCurlyMethod(String aOne) {//ok } - LeftCurlyInput_Method(int aOne) + InputLeftCurlyMethod(int aOne) { //warn } diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyInput_Other.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlyOther.java similarity index 98% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyInput_Other.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlyOther.java index 4991fd1ee..6c8ea7d6f 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyInput_Other.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlyOther.java @@ -1,6 +1,6 @@ package com.google.checkstyle.test.chapter4formatting.rule412nonemptyblocks; -class RightCurlyInput_Other +class InputRightCurlyOther { /** @see test method **/ int foo() throws InterruptedException @@ -142,4 +142,4 @@ class WithArrays { }; // ok String[] s4 = {"foo", "foo"}; // ok -} \ No newline at end of file +} diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyInputSame.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlySame.java similarity index 85% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyInputSame.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlySame.java index a4dae053d..b0f9c88b5 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyInputSame.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlySame.java @@ -1,6 +1,6 @@ package com.google.checkstyle.test.chapter4formatting.rule412nonemptyblocks; -public class RightCurlyInputSame { +public class InputRightCurlySame { public static void main(String[] args) { boolean after = false; try { diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockInput_Basic.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyBlockBasic.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockInput_Basic.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyBlockBasic.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockInputCatch.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyBlockCatch.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockInputCatch.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyBlockCatch.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockNoViolationsInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyCatchBlockNoViolations.java similarity index 97% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockNoViolationsInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyCatchBlockNoViolations.java index f565cc5ba..6229a1feb 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockNoViolationsInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyCatchBlockNoViolations.java @@ -5,7 +5,7 @@ package com.google.checkstyle.test.chapter4formatting.rule413emptyblocks; import java.io.IOException; -public class EmptyCatchBlockNoViolationsInput +public class InputEmptyCatchBlockNoViolations { private void foo6() { try { diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockViolationsByCommentInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyCatchBlockViolationsByComment.java similarity index 97% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockViolationsByCommentInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyCatchBlockViolationsByComment.java index 491fc8ab1..7112327e0 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockViolationsByCommentInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyCatchBlockViolationsByComment.java @@ -2,7 +2,7 @@ package com.google.checkstyle.test.chapter4formatting.rule413emptyblocks; import java.io.IOException; -public class EmptyCatchBlockViolationsByCommentInput +public class InputEmptyCatchBlockViolationsByComment { private void foo() { try { diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockViolationsByVariableNameInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyCatchBlockViolationsByVariableName.java similarity index 95% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockViolationsByVariableNameInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyCatchBlockViolationsByVariableName.java index e70e2a7ee..d4b66c6ff 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockViolationsByVariableNameInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/InputEmptyCatchBlockViolationsByVariableName.java @@ -2,7 +2,7 @@ package com.google.checkstyle.test.chapter4formatting.rule413emptyblocks; import java.io.IOException; -public class EmptyCatchBlockViolationsByVariableNameInput +public class InputEmptyCatchBlockViolationsByVariableName { private void foo() { try { diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrect.java similarity index 95% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrect.java index 80c10d54e..5a7e34cca 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrect.java @@ -3,7 +3,7 @@ package com.google.checkstyle.test.chapter4formatting.rule42blockindentaion; //i import java.util.Map; //indent:0 exp:0 import java.util.ArrayList;//indent:0 exp:0 -public abstract class IndentationCorrectInput { //indent:0 exp:0 +public abstract class InputIndentationCorrect { //indent:0 exp:0 static int i; //indent:2 exp:2 @@ -26,8 +26,8 @@ public abstract class IndentationCorrectInput { //indent:0 exp:0 + "\u0c66\u0ce6" //indent:8 exp:8 + "\u1c40\u1c50"; //indent:8 exp:8 - public static final IndentationCorrectInput JAVA_LETTER_OR_DIGIT = //indent:4 exp:4 - new IndentationCorrectInput() { //indent:8 exp:8 + public static final InputIndentationCorrect JAVA_LETTER_OR_DIGIT = //indent:4 exp:4 + new InputIndentationCorrect() { //indent:8 exp:8 @Override public boolean matches(char c) { //indent:10 exp:10 return Character.isLetterOrDigit(c); //indent:12 exp:12 } //indent:10 exp:10 diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectClassInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectClass.java similarity index 92% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectClassInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectClass.java index 8698b550b..1eac40499 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectClassInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectClass.java @@ -2,7 +2,7 @@ package com.google.checkstyle.test.chapter4formatting.rule42blockindentaion; //i import java.util.Iterator; //indent:0 exp:0 -public class IndentationCorrectClassInput //indent:0 exp:0 +public class InputIndentationCorrectClass //indent:0 exp:0 implements Runnable, Cloneable { //indent:4 exp:4 class InnerClass implements //indent:2 exp:2 @@ -39,6 +39,6 @@ public class IndentationCorrectClassInput //indent:0 exp:0 class SecondClassWithLongLongLongLongName //indent:0 exp:0 extends //indent:4 exp:4 - IndentationCorrectClassInput{ //indent:9 exp:>=4 + InputIndentationCorrectClass{ //indent:9 exp:>=4 } //indent:0 exp:0 diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectFieldAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectFieldAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectFieldAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectFieldAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectForAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectForAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectForAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectForAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectIfAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectIfAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectIfAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectIfAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectReturnAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectReturnAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectReturnAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectReturnAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectWhileDoWhileAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectWhileDoWhileAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/IndentationCorrectWhileDoWhileAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule42blockindentaion/InputIndentationCorrectWhileDoWhileAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule43onestatement/OneStatementPerLineInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule43onestatement/InputOneStatementPerLine.java similarity index 99% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule43onestatement/OneStatementPerLineInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule43onestatement/InputOneStatementPerLine.java index 9d3715f7b..e87f25167 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule43onestatement/OneStatementPerLineInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule43onestatement/InputOneStatementPerLine.java @@ -5,7 +5,7 @@ package com.google.checkstyle.test.chapter4formatting.rule43onestatement; */ import java.io.EOFException; import java.io.BufferedReader; //warn -public class OneStatementPerLineInput { +public class InputOneStatementPerLine { /** * Dummy variable to work on. diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/MethodParamPadInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputMethodParamPad.java similarity index 99% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/MethodParamPadInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputMethodParamPad.java index 55e43037a..e5c2be046 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/MethodParamPadInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputMethodParamPad.java @@ -3,7 +3,7 @@ package com.google.checkstyle.test.chapter4formatting.rule451wheretobreack; import java.util.HashMap; import java.util.Map; -class MethodParamPadInput +class InputMethodParamPad { void test() { @@ -348,4 +348,4 @@ class AssignClass3 { <<= 2; } }; -} \ No newline at end of file +} diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/OperatorWrapInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputOperatorWrap.java similarity index 99% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/OperatorWrapInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputOperatorWrap.java index cbecff02f..6c0c971f8 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/OperatorWrapInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputOperatorWrap.java @@ -3,7 +3,7 @@ package com.google.checkstyle.test.chapter4formatting.rule451wheretobreack; import java.util.HashMap; import java.util.Map; -class OperatorWrapInput +class InputOperatorWrap { void test() { @@ -348,4 +348,4 @@ class AssignClass { <<= 2; } }; -} \ No newline at end of file +} diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/OperatorWrapAssignInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputOperatorWrapAssign.java similarity index 99% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/OperatorWrapAssignInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputOperatorWrapAssign.java index 689762266..e946b4f5b 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/OperatorWrapAssignInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputOperatorWrapAssign.java @@ -3,7 +3,7 @@ package com.google.checkstyle.test.chapter4formatting.rule451wheretobreack; import java.util.HashMap; import java.util.Map; -class OperatorWrapAssignInput +class InputOperatorWrapAssign { void test() { @@ -348,4 +348,4 @@ class AssignClass5 { <<= 2; //warn } }; -} \ No newline at end of file +} diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/SeparatorWrapInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputSeparatorWrap.java similarity index 96% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/SeparatorWrapInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputSeparatorWrap.java index 1cf8af813..029906732 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/SeparatorWrapInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule451wheretobreack/InputSeparatorWrap.java @@ -1,6 +1,6 @@ package com.google.checkstyle.test.chapter4formatting.rule451wheretobreack; -public class SeparatorWrapInput { +public class InputSeparatorWrap { public void goodCase() { int i = 0; @@ -42,4 +42,4 @@ class badCase { .append(truncationIndicator) .toString(); } -} \ No newline at end of file +} diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrect.java similarity index 95% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrect.java index b3b86df3c..10118c682 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrect.java @@ -3,7 +3,7 @@ package com.google.checkstyle.test.chapter4formatting.rule452indentcontinuationl import java.util.Map; //indent:0 exp:0 import java.util.ArrayList;//indent:0 exp:0 -public abstract class IndentationCorrectInput { //indent:0 exp:0 +public abstract class InputIndentationCorrect { //indent:0 exp:0 static int i; //indent:2 exp:2 @@ -26,8 +26,8 @@ public abstract class IndentationCorrectInput { //indent:0 exp:0 + "\u0c66\u0ce6" //indent:8 exp:8 + "\u1c40\u1c50"; //indent:8 exp:8 - public static final IndentationCorrectInput JAVA_LETTER_OR_DIGIT = //indent:4 exp:4 - new IndentationCorrectInput() { //indent:8 exp:8 + public static final InputIndentationCorrect JAVA_LETTER_OR_DIGIT = //indent:4 exp:4 + new InputIndentationCorrect() { //indent:8 exp:8 @Override public boolean matches(char c) { //indent:10 exp:10 return Character.isLetterOrDigit(c); //indent:12 exp:12 } //indent:10 exp:10 diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectClassInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectClass.java similarity index 92% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectClassInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectClass.java index e98e7e335..ae383b5a7 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectClassInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectClass.java @@ -2,7 +2,7 @@ package com.google.checkstyle.test.chapter4formatting.rule452indentcontinuationl import java.util.Iterator; //indent:0 exp:0 -public class IndentationCorrectClassInput //indent:0 exp:0 +public class InputIndentationCorrectClass //indent:0 exp:0 implements Runnable, Cloneable { //indent:4 exp:4 class InnerClass implements //indent:2 exp:2 @@ -39,6 +39,6 @@ public class IndentationCorrectClassInput //indent:0 exp:0 class SecondClassWithLongLongLongLongName //indent:0 exp:0 extends //indent:4 exp:4 - IndentationCorrectClassInput{ //indent:9 exp:>=4 + InputIndentationCorrectClass{ //indent:9 exp:>=4 } //indent:0 exp:0 diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectFieldAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectFieldAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectFieldAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectFieldAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectForAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectForAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectForAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectForAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectIfAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectIfAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectIfAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectIfAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectReturnAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectReturnAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectReturnAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectReturnAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectWhileDoWhileAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectWhileDoWhileAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/IndentationCorrectWhileDoWhileAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule452indentcontinuationlines/InputIndentationCorrectWhileDoWhileAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrect.java similarity index 95% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrect.java index 4ab30ec65..1cf911ce2 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrect.java @@ -3,7 +3,7 @@ package com.google.checkstyle.test.chapter4formatting.rule4841indentation; //ind import java.util.Map; //indent:0 exp:0 import java.util.ArrayList;//indent:0 exp:0 -public abstract class IndentationCorrectInput { //indent:0 exp:0 +public abstract class InputIndentationCorrect { //indent:0 exp:0 static int i; //indent:2 exp:2 @@ -26,8 +26,8 @@ public abstract class IndentationCorrectInput { //indent:0 exp:0 + "\u0c66\u0ce6" //indent:8 exp:8 + "\u1c40\u1c50"; //indent:8 exp:8 - public static final IndentationCorrectInput JAVA_LETTER_OR_DIGIT = //indent:4 exp:4 - new IndentationCorrectInput() { //indent:8 exp:8 + public static final InputIndentationCorrect JAVA_LETTER_OR_DIGIT = //indent:4 exp:4 + new InputIndentationCorrect() { //indent:8 exp:8 @Override public boolean matches(char c) { //indent:10 exp:10 return Character.isLetterOrDigit(c); //indent:12 exp:12 } //indent:10 exp:10 diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectClassInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectClass.java similarity index 92% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectClassInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectClass.java index d30fc6a47..ff8d2f4c9 100644 --- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectClassInput.java +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectClass.java @@ -2,7 +2,7 @@ package com.google.checkstyle.test.chapter4formatting.rule4841indentation; //in import java.util.Iterator; //indent:0 exp:0 -public class IndentationCorrectClassInput //indent:0 exp:0 +public class InputIndentationCorrectClass //indent:0 exp:0 implements Runnable, Cloneable { //indent:4 exp:4 class InnerClass implements //indent:2 exp:2 @@ -39,6 +39,6 @@ public class IndentationCorrectClassInput //indent:0 exp:0 class SecondClassWithLongLongLongLongName //indent:0 exp:0 extends //indent:4 exp:4 - IndentationCorrectClassInput{ //indent:9 exp:>=4 + InputIndentationCorrectClass{ //indent:9 exp:>=4 } //indent:0 exp:0 diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectFieldAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectFieldAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectFieldAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectFieldAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectForAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectForAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectForAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectForAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectIfAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectIfAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectIfAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectIfAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectReturnAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectReturnAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectReturnAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectReturnAndParameter.java diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectWhileDoWhileAndParameterInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectWhileDoWhileAndParameter.java similarity index 100% rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationCorrectWhileDoWhileAndParameterInput.java rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4841indentation/InputIndentationCorrectWhileDoWhileAndParameter.java