Issue #2161: unify it input file names for chapter4formatting

This commit is contained in:
rnveach 2015-11-07 21:55:24 -05:00 committed by Roman Ivanov
parent 21c8c76f93
commit 339e0ff9a6
47 changed files with 64 additions and 64 deletions

View File

@ -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);

View File

@ -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);
}

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);
}

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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() {}

View File

@ -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

View File

@ -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() {}

View File

@ -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
}

View File

@ -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
}
}

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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;
}
};
}
}

View File

@ -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;
}
};
}
}

View File

@ -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
}
};
}
}

View File

@ -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();
}
}
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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