Issue #2540: unify it input file names for chapter4formatting
This commit is contained in:
parent
4346d41010
commit
662cb2e20e
|
|
@ -63,7 +63,7 @@ public class GenericWhitespaceTest extends BaseCheckTestSupport {
|
|||
"20:61: " + getCheckMessage(checkConfig.getMessages(), msgPreceded, ">"),
|
||||
};
|
||||
|
||||
final String filePath = builder.getFilePath("WhitespaceAroundInput_Generics");
|
||||
final String filePath = builder.getFilePath("InputWhitespaceAroundGenerics");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
@ -106,7 +106,7 @@ public class GenericWhitespaceTest extends BaseCheckTestSupport {
|
|||
"63:60: " + getCheckMessage(checkConfig.getMessages(), msgFollowed, ">"),
|
||||
};
|
||||
|
||||
final String filePath = builder.getFilePath("GenericWhitespaceInput");
|
||||
final String filePath = builder.getFilePath("InputGenericWhitespace");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ public class WhitespaceAroundTest extends BaseCheckTestSupport {
|
|||
"150:20: " + getCheckMessage(checkConfig.getMessages(), msgPreceded, ":"),
|
||||
};
|
||||
|
||||
final String filePath = builder.getFilePath("WhitespaceAroundInput_Basic");
|
||||
final String filePath = builder.getFilePath("InputWhitespaceAroundBasic");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
@ -80,7 +80,7 @@ public class WhitespaceAroundTest extends BaseCheckTestSupport {
|
|||
final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
|
||||
|
||||
final Configuration checkConfig = builder.getCheckConfig("WhitespaceAround");
|
||||
final String filePath = builder.getFilePath("WhitespaceAroundInput_EmptyTypesAndCycles");
|
||||
final String filePath = builder.getFilePath("InputWhitespaceAroundEmptyTypesAndCycles");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ public class MultipleVariableDeclarationsTest extends BaseCheckTestSupport {
|
|||
};
|
||||
|
||||
final Configuration checkConfig = builder.getCheckConfig("MultipleVariableDeclarations");
|
||||
final String filePath = builder.getFilePath("MultipleVariableDeclarationsInput");
|
||||
final String filePath = builder.getFilePath("InputMultipleVariableDeclarations");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public class ArrayTypeStyleTest extends BaseCheckTestSupport {
|
|||
};
|
||||
|
||||
final Configuration checkConfig = builder.getCheckConfig("ArrayTypeStyle");
|
||||
final String filePath = builder.getFilePath("ArrayTypeStyleInput");
|
||||
final String filePath = builder.getFilePath("InputArrayTypeStyle");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ public class FallThroughTest extends BaseCheckTestSupport {
|
|||
};
|
||||
|
||||
final Configuration checkConfig = builder.getCheckConfig("FallThrough");
|
||||
final String filePath = builder.getFilePath("FallThroughInput");
|
||||
final String filePath = builder.getFilePath("InputFallThrough");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ public class MissingSwitchDefaultTest extends BaseCheckTestSupport {
|
|||
};
|
||||
|
||||
final Configuration checkConfig = builder.getCheckConfig("MissingSwitchDefault");
|
||||
final String filePath = builder.getFilePath("MissingSwitchDefaultInput");
|
||||
final String filePath = builder.getFilePath("InputMissingSwitchDefault");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ public class AnnotationLocationTest extends BaseCheckTestSupport {
|
|||
"90: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "1", "0"),
|
||||
};
|
||||
|
||||
final String filePath = builder.getFilePath("AnnotationLocationInput");
|
||||
final String filePath = builder.getFilePath("InputAnnotationLocation");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ public class CommentsIndentationTest extends BaseCheckTestSupport {
|
|||
|
||||
final Configuration checkConfig = builder.getCheckConfig("CommentsIndentation");
|
||||
final String filePath =
|
||||
builder.getFilePath("CommentsIndentationCommentIsAtTheEndOfBlockInput");
|
||||
builder.getFilePath("InputCommentsIndentationCommentIsAtTheEndOfBlock");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
@ -144,7 +144,7 @@ public class CommentsIndentationTest extends BaseCheckTestSupport {
|
|||
|
||||
final Configuration checkConfig = builder.getCheckConfig("CommentsIndentation");
|
||||
final String filePath =
|
||||
builder.getFilePath("CommentsIndentationInSwitchBlockInput");
|
||||
builder.getFilePath("InputCommentsIndentationInSwitchBlock");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
@ -167,7 +167,7 @@ public class CommentsIndentationTest extends BaseCheckTestSupport {
|
|||
|
||||
final Configuration checkConfig = builder.getCheckConfig("CommentsIndentation");
|
||||
final String filePath =
|
||||
builder.getFilePath("CommentsIndentationInEmptyBlockInput");
|
||||
builder.getFilePath("InputCommentsIndentationInEmptyBlock");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
@ -198,7 +198,7 @@ public class CommentsIndentationTest extends BaseCheckTestSupport {
|
|||
|
||||
final Configuration checkConfig = builder.getCheckConfig("CommentsIndentation");
|
||||
final String filePath =
|
||||
builder.getFilePath("CommentsIndentationSurroundingCodeInput");
|
||||
builder.getFilePath("InputCommentsIndentationSurroundingCode");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ public class ModifierOrderTest extends BaseCheckTestSupport {
|
|||
};
|
||||
|
||||
final Configuration checkConfig = builder.getCheckConfig("ModifierOrder");
|
||||
final String filePath = builder.getFilePath("ModifierOrderInput");
|
||||
final String filePath = builder.getFilePath("InputModifierOrder");
|
||||
|
||||
final Integer[] warnList = builder.getLinesWithWarn(filePath);
|
||||
verify(checkConfig, filePath, expected, warnList);
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.Collections;
|
||||
class GenericWhitespaceInput implements Comparable<GenericWhitespaceInput>, Serializable
|
||||
class InputGenericWhitespace implements Comparable<InputGenericWhitespace>, Serializable
|
||||
{
|
||||
void meth()
|
||||
{
|
||||
|
|
@ -17,7 +17,7 @@ class GenericWhitespaceInput implements Comparable<GenericWhitespaceInput>, Seri
|
|||
List < List < Integer > > b = new ArrayList < List < Integer > > (); // warn
|
||||
}
|
||||
|
||||
public int compareTo(GenericWhitespaceInput aObject)
|
||||
public int compareTo(InputGenericWhitespace aObject)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -43,11 +43,11 @@ class GenericWhitespaceInput implements Comparable<GenericWhitespaceInput>, Seri
|
|||
return 666;
|
||||
}
|
||||
|
||||
<T> GenericWhitespaceInput(List<T> things, int i)
|
||||
<T> InputGenericWhitespace(List<T> things, int i)
|
||||
{
|
||||
}
|
||||
|
||||
public <T> GenericWhitespaceInput(List<T> things)
|
||||
public <T> InputGenericWhitespace(List<T> things)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -3,7 +3,7 @@ package com.google.checkstyle.test.chapter4formatting.rule462horizontalwhitespac
|
|||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
|
||||
public class WhitespaceAroundInput_Generics
|
||||
public class InputWhitespaceAroundGenerics
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package com.google.checkstyle.test.chapter4formatting.rule4821onevariableperline;
|
||||
|
||||
public class MultipleVariableDeclarationsInput
|
||||
public class InputMultipleVariableDeclarations
|
||||
{
|
||||
int i, j; //warn
|
||||
int i1; int j1; //warn
|
||||
|
|
@ -3,7 +3,7 @@ package com.google.checkstyle.test.chapter4formatting.rule4832nocstylearray;
|
|||
/**
|
||||
* Test case for ArrayTypeStyle (Java vs C)
|
||||
**/
|
||||
public class ArrayTypeStyleInput
|
||||
public class InputArrayTypeStyle
|
||||
{
|
||||
private int[] javaStyle = new int[0];
|
||||
private int cStyle[] = new int[0]; //warn
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package com.google.checkstyle.test.chapter4formatting.rule4842fallthrough;
|
||||
|
||||
public class FallThroughInput
|
||||
public class InputFallThrough
|
||||
{
|
||||
void method(int i, int j, boolean cond) {
|
||||
while (true) {
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package com.google.checkstyle.test.chapter4formatting.rule4843defaultcasepresent;
|
||||
|
||||
public class MissingSwitchDefaultInput {
|
||||
public class InputMissingSwitchDefault {
|
||||
public void foo() {
|
||||
int i = 1;
|
||||
switch (i) {
|
||||
|
|
@ -6,7 +6,7 @@ import com.puppycrawl.tools.checkstyle.utils.CheckUtils;
|
|||
/**
|
||||
* Contains examples of using comments at the end of the block.
|
||||
*/
|
||||
public class CommentsIndentationCommentIsAtTheEndOfBlockInput {
|
||||
public class InputCommentsIndentationCommentIsAtTheEndOfBlock {
|
||||
|
||||
public void foo1() {
|
||||
foo2();
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package com.google.checkstyle.test.chapter4formatting.rule4861blockcommentstyle;
|
||||
|
||||
public class CommentsIndentationInEmptyBlockInput {
|
||||
public class InputCommentsIndentationInEmptyBlock {
|
||||
|
||||
private void foo1() {
|
||||
int a = 5, b = 3, v = 6;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package com.google.checkstyle.test.chapter4formatting.rule4861blockcommentstyle;
|
||||
|
||||
public class CommentsIndentationInSwitchBlockInput {
|
||||
public class InputCommentsIndentationInSwitchBlock {
|
||||
|
||||
private static void fooSwitch() {
|
||||
switch("") {
|
||||
|
|
@ -4,7 +4,7 @@ package com.google.checkstyle.test.chapter4formatting.rule4861blockcommentstyle;
|
|||
import java.util.Arrays;
|
||||
|
||||
// some
|
||||
public class CommentsIndentationSurroundingCodeInput
|
||||
public class InputCommentsIndentationSurroundingCode
|
||||
{
|
||||
private void foo1() {
|
||||
if (true) {
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package com.google.checkstyle.test.chapter4formatting.rule487modifiers;
|
||||
|
||||
strictfp abstract class ModifierOrderInput //warn
|
||||
strictfp abstract class InputModifierOrder //warn
|
||||
{
|
||||
transient private String dontSaveMe; //warn
|
||||
|
||||
Loading…
Reference in New Issue