From 94f9754acb5cc92a32bf36d2a789325fed384325 Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Fri, 28 Aug 2015 17:55:57 +0200 Subject: [PATCH] Issue #1555: Decrease visibility of fields and methods in test code Fixes some `WeakerAccess` inspection violations. Description: >This inspection reports all fields, methods or classes, found in the specified inspection scope, that may have their access modifier narrowed down. --- .../google/checkstyle/test/base/BaseCheckTestSupport.java | 2 +- .../tools/checkstyle/api/LocalizedMessageTest.java | 2 +- .../checkstyle/checks/indentation/IndentationCheckTest.java | 4 ++-- .../checkstyle/checks/javadoc/JavadocParseTreeTest.java | 4 ++-- .../tools/checkstyle/checks/javadoc/ParseTreeBuilder.java | 2 +- .../tools/checkstyle/comments/AllBlockCommentsTest.java | 2 +- .../checkstyle/comments/AllSinglelineCommentsTest.java | 2 +- .../tools/checkstyle/comments/CompareTreesWithComments.java | 2 +- .../checkstyle/filters/SuppressWarningsFilterTest.java | 6 +++--- .../filters/SuppressWithNearbyCommentFilterTest.java | 6 +++--- .../checkstyle/filters/SuppressionCommentFilterTest.java | 6 +++--- .../tools/checkstyle/filters/SuppressionsLoaderTest.java | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/it/java/com/google/checkstyle/test/base/BaseCheckTestSupport.java b/src/it/java/com/google/checkstyle/test/base/BaseCheckTestSupport.java index eb4f4544e..2486b4f58 100644 --- a/src/it/java/com/google/checkstyle/test/base/BaseCheckTestSupport.java +++ b/src/it/java/com/google/checkstyle/test/base/BaseCheckTestSupport.java @@ -32,7 +32,7 @@ import com.puppycrawl.tools.checkstyle.api.Configuration; public abstract class BaseCheckTestSupport { /** A brief logger that only display info about errors */ - protected static class BriefLogger + static class BriefLogger extends DefaultLogger { public BriefLogger(OutputStream out) throws UnsupportedEncodingException diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessageTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessageTest.java index 509c333b3..4f42279a4 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessageTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/LocalizedMessageTest.java @@ -103,7 +103,7 @@ public class LocalizedMessageTest { classloader, true); } - public static URL getMockUrl(final URLConnection connection) throws IOException { + private static URL getMockUrl(final URLConnection connection) throws IOException { final URLStreamHandler handler = new URLStreamHandler() { @Override protected URLConnection openConnection(final URL arg0) { diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java index a3266ac1b..cdea0f1d8 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java @@ -66,8 +66,8 @@ public class IndentationCheckTest extends BaseCheckTestSupport { private static final Pattern NONSTRICT_LEVEL_COMMENT_REGEX = Pattern.compile("//indent:\\d+ exp:>=(\\d+)( warn)?"); - protected static Integer[] getLinesWithWarnAndCheckComments(String aFileName, - final int tabWidth) + private static Integer[] getLinesWithWarnAndCheckComments(String aFileName, + final int tabWidth) throws IOException { List result = new ArrayList<>(); try (BufferedReader br = new BufferedReader(new FileReader(aFileName))) { diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParseTreeTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParseTreeTest.java index 3e560f61b..ecefbd6a6 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParseTreeTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParseTreeTest.java @@ -45,7 +45,7 @@ public class JavadocParseTreeTest { private JavadocParser parser; private final BaseErrorListener errorListener = new FailOnErrorListener(); - public ParseTree parseJavadoc(String aBlockComment) + private ParseTree parseJavadoc(String aBlockComment) throws IOException { final Charset utf8Charset = Charset.forName("UTF-8"); final InputStream in = new ByteArrayInputStream(aBlockComment.getBytes(utf8Charset)); @@ -64,7 +64,7 @@ public class JavadocParseTreeTest { return parser.javadoc(); } - public static String getFileContent(File filename) + private static String getFileContent(File filename) throws IOException { return Files.toString(filename, Charsets.UTF_8); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/ParseTreeBuilder.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/ParseTreeBuilder.java index c5e5f58f6..b26a635ee 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/ParseTreeBuilder.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/ParseTreeBuilder.java @@ -49,7 +49,7 @@ import com.puppycrawl.tools.checkstyle.grammars.javadoc.JavadocParser.TrTagClose import com.puppycrawl.tools.checkstyle.grammars.javadoc.JavadocParser.TrTagOpenContext; //@formatter:off -public final class ParseTreeBuilder { +final class ParseTreeBuilder { private static final String LINE_SEPARATOR = System.getProperty("line.separator"); private ParseTreeBuilder() { diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllBlockCommentsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllBlockCommentsTest.java index eb8577420..1d88f3748 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllBlockCommentsTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllBlockCommentsTest.java @@ -35,7 +35,7 @@ import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; public class AllBlockCommentsTest extends BaseCheckTestSupport { - protected static final Set ALL_COMMENTS = Sets.newLinkedHashSet(); + private static final Set ALL_COMMENTS = Sets.newLinkedHashSet(); private static final String LINE_SEPARATOR = System.getProperty("line.separator"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllSinglelineCommentsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllSinglelineCommentsTest.java index a491cfb88..ba6c25cab 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllSinglelineCommentsTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllSinglelineCommentsTest.java @@ -34,7 +34,7 @@ import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; public class AllSinglelineCommentsTest extends BaseCheckTestSupport { - protected static final Set ALL_COMMENTS = Sets.newLinkedHashSet(); + private static final Set ALL_COMMENTS = Sets.newLinkedHashSet(); private static final String LINE_SEPARATOR = System.getProperty("line.separator"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/comments/CompareTreesWithComments.java b/src/test/java/com/puppycrawl/tools/checkstyle/comments/CompareTreesWithComments.java index c2a977e87..ecc656e8b 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/comments/CompareTreesWithComments.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/comments/CompareTreesWithComments.java @@ -6,7 +6,7 @@ import org.junit.Assert; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; -public class CompareTreesWithComments extends Check { +class CompareTreesWithComments extends Check { static DetailAST expectedTree; @Override diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java index 72d744091..da6376268 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java @@ -74,12 +74,12 @@ public class SuppressWarningsFilterTest verifySuppressed(filterConfig, suppressed); } - public static DefaultConfiguration createFilterConfig(Class classObj) { + private static DefaultConfiguration createFilterConfig(Class classObj) { return new DefaultConfiguration(classObj.getName()); } - protected void verifySuppressed(Configuration aFilterConfig, - String... aSuppressed) throws Exception { + private void verifySuppressed(Configuration aFilterConfig, + String... aSuppressed) throws Exception { verify(createChecker(aFilterConfig), getPath("filters/InputSuppressWarningsFilter.java"), removeSuppressed(ALL_MESSAGES, aSuppressed)); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java index c27a67b64..07a8febca 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java @@ -191,12 +191,12 @@ public class SuppressWithNearbyCommentFilterTest EqualsVerifier.forClass(SuppressWithNearbyCommentFilter.Tag.class).usingGetClass().verify(); } - public static DefaultConfiguration createFilterConfig(Class classObj) { + private static DefaultConfiguration createFilterConfig(Class classObj) { return new DefaultConfiguration(classObj.getName()); } - protected void verifySuppressed(Configuration filterConfig, - String... suppressed) + private void verifySuppressed(Configuration filterConfig, + String... suppressed) throws Exception { verify(createChecker(filterConfig), getPath("filters/InputSuppressWithNearbyCommentFilter.java"), diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java index 6dc9b4d74..02c3e347b 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java @@ -191,12 +191,12 @@ public class SuppressionCommentFilterTest verifySuppressed(filterConfig, suppressed); } - public static DefaultConfiguration createFilterConfig(Class aClass) { + private static DefaultConfiguration createFilterConfig(Class aClass) { return new DefaultConfiguration(aClass.getName()); } - protected void verifySuppressed(Configuration aFilterConfig, - String... aSuppressed) + private void verifySuppressed(Configuration aFilterConfig, + String... aSuppressed) throws Exception { verify(createChecker(aFilterConfig), getPath("filters/InputSuppressionCommentFilter.java"), diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java index 3916d01e2..fabb71d69 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java @@ -56,7 +56,7 @@ import com.puppycrawl.tools.checkstyle.api.FilterSet; public class SuppressionsLoaderTest extends BaseCheckTestSupport { @Rule - public final ExpectedException thrown = ExpectedException.none(); + private final ExpectedException thrown = ExpectedException.none(); @Test public void testNoSuppressions()