Issue #2541: Clean up input files to not use forbidden APIs

This commit is contained in:
Roman Ivanov 2015-11-11 06:38:41 -08:00
parent edb810c10e
commit 6c49a05cb6
49 changed files with 102 additions and 65 deletions

View File

@ -888,13 +888,13 @@
<bundledSignature>jdk-system-out</bundledSignature>
</bundledSignatures>
<excludes>
<!-- system-out is ok there, that is CLI -->
<exclude>**/Main.class</exclude>
<!-- generated classes, unfortunately use problematic api -->
<exclude>**/GeneratedJavaLexer.class</exclude>
<exclude>**/JavadocParser.class</exclude>
<exclude>**/Main.class</exclude>
<!-- Tests related -->
<exclude>**/Input*</exclude>
<exclude>**/CompareTreesWithComments.class</exclude>
<exclude>**/ConfigurationBuilder.class</exclude>
</excludes>
</configuration>
<executions>

View File

@ -50,24 +50,16 @@ public class ConfigurationBuilder extends BaseCheckTestSupport {
private final Pattern warnPattern = CommonUtils
.createPattern(".*[ ]*//[ ]*warn[ ]*|/[*]warn[*]/");
public ConfigurationBuilder(File aRoot) {
public ConfigurationBuilder(File aRoot) throws CheckstyleException {
root = aRoot;
configuration = getConfigurationFromXML(XML_NAME, System.getProperties());
listFiles(files, root, "java");
}
private static Configuration getConfigurationFromXML(String aConfigName,
Properties aProps) {
try {
return ConfigurationLoader.loadConfiguration(aConfigName,
new PropertiesExpander(aProps));
}
catch (final CheckstyleException e) {
System.out.println("Error loading configuration file");
e.printStackTrace(System.out);
System.exit(1);
return null;
}
Properties aProps) throws CheckstyleException {
return ConfigurationLoader.loadConfiguration(aConfigName,
new PropertiesExpander(aProps));
}
Configuration getConfiguration() {

View File

@ -32,6 +32,7 @@ import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.utils.CommonUtils;
public class IndentationConfigurationBuilder extends ConfigurationBuilder {
@ -55,7 +56,7 @@ public class IndentationConfigurationBuilder extends ConfigurationBuilder {
private static final Pattern NON_STRICT_LEVEL_COMMENT_REGEX =
Pattern.compile("//indent:\\d+ exp:>=(\\d+)( warn)?");
public IndentationConfigurationBuilder(File aRoot) {
public IndentationConfigurationBuilder(File aRoot) throws CheckstyleException {
super(aRoot);
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck;
@ -35,7 +36,7 @@ public class OuterTypeFilenameTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck;
@ -35,7 +36,7 @@ public class FileTabCharacterTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
public class IllegalTokenTextTest extends BaseCheckTestSupport {
@ -33,7 +34,7 @@ public class IllegalTokenTextTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.AvoidEscapedUnicodeCharactersCheck;
@ -34,7 +35,7 @@ public class AvoidEscapedUnicodeCharactersTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck;
@ -34,7 +35,7 @@ public class LineLengthTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
public class AvoidStarImportTest extends BaseCheckTestSupport {
@ -33,7 +34,7 @@ public class AvoidStarImportTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck;
import com.puppycrawl.tools.checkstyle.checks.whitespace.NoLineWrapCheck;
@ -36,7 +37,7 @@ public class NoLineWrapTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck;
@ -44,7 +45,7 @@ public class CustomImportOrderTest extends BaseCheckTestSupport {
private final Class<CustomImportOrderCheck> clazz = CustomImportOrderCheck.class;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck;
@ -35,7 +36,7 @@ public class OneTopLevelClassTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.coding.OverloadMethodsDeclarationOrderCheck;
@ -34,7 +35,7 @@ public class OverloadMethodsDeclarationOrderTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyLineSeparatorCheck;
@ -34,7 +35,7 @@ public class EmptyLineSeparatorTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck;
@ -34,7 +35,7 @@ public class NeedBracesTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -28,6 +28,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck;
@ -36,7 +37,7 @@ public class LeftCurlyTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -31,6 +31,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck;
import com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyOption;
@ -39,7 +40,7 @@ public class RightCurlyTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck;
@ -34,7 +35,7 @@ public class EmptyBlockTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.blocks.EmptyCatchBlockCheck;
@ -34,7 +35,7 @@ public class EmptyCatchBlockTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck;
@ -34,7 +35,7 @@ public class OneStatementPerLineTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck;
@ -34,7 +35,7 @@ public class LineLengthTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck;
@ -34,7 +35,7 @@ public class MethodParamPadTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck;
import com.puppycrawl.tools.checkstyle.checks.whitespace.WrapOption;
@ -36,7 +37,7 @@ public class OperatorWrapTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck;
@ -34,7 +35,7 @@ public class SeparatorWrapTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyLineSeparatorCheck;
@ -34,7 +35,7 @@ public class EmptyLineSeparatorTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
public class GenericWhitespaceTest extends BaseCheckTestSupport {
@ -33,7 +34,7 @@ public class GenericWhitespaceTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
public class WhitespaceAroundTest extends BaseCheckTestSupport {
@ -34,7 +35,7 @@ public class WhitespaceAroundTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck;
@ -34,7 +35,7 @@ public class MultipleVariableDeclarationsTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.coding.VariableDeclarationUsageDistanceCheck;
@ -34,7 +35,7 @@ public class VariableDeclarationUsageDistanceTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck;
@ -34,7 +35,7 @@ public class ArrayTypeStyleTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -28,6 +28,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.google.checkstyle.test.base.IndentationConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
public class IndentationTest extends BaseCheckTestSupport {
@ -35,7 +36,7 @@ public class IndentationTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new IndentationConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck;
@ -34,7 +35,7 @@ public class FallThroughTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.coding.MissingSwitchDefaultCheck;
@ -34,7 +35,7 @@ public class MissingSwitchDefaultTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck;
@ -34,7 +35,7 @@ public class AnnotationLocationTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck;
@ -34,7 +35,7 @@ public class CommentsIndentationTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck;
@ -34,7 +35,7 @@ public class ModifierOrderTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
public class UpperEllTest extends BaseCheckTestSupport {
@ -33,7 +34,7 @@ public class UpperEllTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
public class TypeNameTest extends BaseCheckTestSupport {
@ -33,7 +34,7 @@ public class TypeNameTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
public class MethodNameTest extends BaseCheckTestSupport {
@ -33,7 +34,7 @@ public class MethodNameTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck;
@ -37,7 +38,7 @@ public class AbbreviationAsWordInNameTest extends BaseCheckTestSupport {
private final Class<AbbreviationAsWordInNameCheck> clazz = AbbreviationAsWordInNameCheck.class;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
checkConfig = builder.getCheckConfig("AbbreviationAsWordInName");
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck;
@ -34,7 +35,7 @@ public class EmptyBlockTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.coding.NoFinalizerCheck;
@ -34,7 +35,7 @@ public class NoFinalizerTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck;
@ -35,7 +36,7 @@ public class SingleLineJavadocTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck;
@ -35,7 +36,7 @@ public class JavadocParagraphTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck;
@ -35,7 +36,7 @@ public class AtclauseOrderTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck;
@ -34,7 +35,7 @@ public class NonEmptyAtclauseDescriptionTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -27,6 +27,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck;
@ -35,7 +36,7 @@ public class SummaryJavadocTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -26,6 +26,7 @@ import org.junit.Test;
import com.google.checkstyle.test.base.BaseCheckTestSupport;
import com.google.checkstyle.test.base.ConfigurationBuilder;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import com.puppycrawl.tools.checkstyle.api.Configuration;
import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck;
@ -34,7 +35,7 @@ public class JavadocMethodTest extends BaseCheckTestSupport {
private static ConfigurationBuilder builder;
@BeforeClass
public static void setConfigurationBuilder() {
public static void setConfigurationBuilder() throws CheckstyleException {
builder = new ConfigurationBuilder(new File("src/it/"));
}

View File

@ -50,7 +50,9 @@ class CompareTreesWithComments extends Check {
@Override
public void beginTree(DetailAST rootAST) {
Assert.assertTrue(isAstEquals(expectedTree, rootAST));
if (!isAstEquals(expectedTree, rootAST)) {
Assert.assertEquals(expectedTree, rootAST);
}
}
private static boolean isAstEquals(DetailAST expected, DetailAST actual) {
@ -64,9 +66,6 @@ class CompareTreesWithComments extends Check {
else {
result = isAstEqualsSafe(expected, actual);
}
if (!result) {
System.out.println("Expected: " + expected + " | Actual: " + actual);
}
return result;
}