mirror of
https://github.com/jlengrand/error-prone-support.git
synced 2026-03-10 08:11:25 +00:00
Sync Checkstyle integration test (#1064)
Summary of changes: - Minimize `checkstyle-init.patch`. - Test against version 10.14.0 rather than 10.13.0.
This commit is contained in:
committed by
GitHub
parent
c214733517
commit
e9263d9d07
File diff suppressed because it is too large
Load Diff
@@ -13,12 +13,16 @@ src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNoArgument
|
|||||||
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCatchParameterNameTest.java:[166,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `enum` is not a valid identifier)
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCatchParameterNameTest.java:[166,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `enum` is not a valid identifier)
|
||||||
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCatchParameterNameTest.java:[193,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `interface` is not a valid identifier)
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCatchParameterNameTest.java:[193,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `interface` is not a valid identifier)
|
||||||
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsAvoidNullTest.java:[39,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that a method named `equals` is already defined in this class or a supertype)
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsAvoidNullTest.java:[39,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that a method named `equals` is already defined in this class or a supertype)
|
||||||
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalInstantiationTest.java:[91,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `interface` is not a valid identifier)
|
||||||
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLambdaBodyLengthTest.java:[39,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLambdaBodyLengthTest.java:[39,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocTypeTest.java:[39,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `class` is not a valid identifier)
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocTypeTest.java:[39,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `class` is not a valid identifier)
|
||||||
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingOverrideTest.java:[39,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `class` is not a valid identifier)
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingOverrideTest.java:[39,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `class` is not a valid identifier)
|
||||||
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingOverrideTest.java:[67,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `interface` is not a valid identifier)
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingOverrideTest.java:[67,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `interface` is not a valid identifier)
|
||||||
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMultipleStringLiteralsTest.java:[41,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNeedBracesTest.java:[40,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `do` is not a valid identifier)
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNeedBracesTest.java:[40,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `do` is not a valid identifier)
|
||||||
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOuterTypeNumberTest.java:[39,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOuterTypeNumberTest.java:[39,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNumberTest.java:[39,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSimplifyBooleanExpressionTest.java:[90,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `interface` is not a valid identifier)
|
||||||
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTest.java:[41,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTest.java:[41,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonInTryWithResourcesTest.java:[41,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonInTryWithResourcesTest.java:[41,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java:[595,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that a method named `toString` is already defined in this class or a supertype)
|
src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java:[595,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that a method named `toString` is already defined in this class or a supertype)
|
||||||
@@ -48,10 +52,8 @@ src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastChec
|
|||||||
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheckTest.java:[36,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheckTest.java:[36,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheckTest.java:[38,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheckTest.java:[38,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java:[105,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java:[105,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java:[36,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
|
||||||
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckTest.java:[48,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckTest.java:[48,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java:[37,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java:[37,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java:[57,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `native` is not a valid identifier)
|
|
||||||
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheckTest.java:[37,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheckTest.java:[37,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheckTest.java:[36,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheckTest.java:[36,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckTest.java:[36,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckTest.java:[36,8] [JUnitMethodDeclaration] This method's name should not redundantly start with `test` (but note that `default` is not a valid identifier)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -362,6 +362,12 @@
|
@@ -366,6 +366,12 @@
|
||||||
<version>1.3.0</version>
|
<version>1.4.1</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
+ <dependency>
|
+ <dependency>
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>nl.jqno.equalsverifier</groupId>
|
<groupId>nl.jqno.equalsverifier</groupId>
|
||||||
<artifactId>equalsverifier</artifactId>
|
<artifactId>equalsverifier</artifactId>
|
||||||
@@ -2412,6 +2418,8 @@
|
@@ -2422,6 +2428,8 @@
|
||||||
<arg>
|
<arg>
|
||||||
-Xplugin:ErrorProne ${error-prone.configuration-args}
|
-Xplugin:ErrorProne ${error-prone.configuration-args}
|
||||||
</arg>
|
</arg>
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
</compilerArgs>
|
</compilerArgs>
|
||||||
<annotationProcessorPaths>
|
<annotationProcessorPaths>
|
||||||
<path>
|
<path>
|
||||||
@@ -2424,6 +2432,11 @@
|
@@ -2434,6 +2442,11 @@
|
||||||
<artifactId>error-prone-contrib</artifactId>
|
<artifactId>error-prone-contrib</artifactId>
|
||||||
<version>${error-prone-support.version}</version>
|
<version>${error-prone-support.version}</version>
|
||||||
</path>
|
</path>
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
</annotationProcessorPaths>
|
</annotationProcessorPaths>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
@@ -2468,9 +2481,10 @@
|
@@ -2476,9 +2489,10 @@
|
||||||
<arg>-XDcompilePolicy=simple</arg>
|
<arg>-XDcompilePolicy=simple</arg>
|
||||||
<arg>
|
<arg>
|
||||||
-Xplugin:ErrorProne \
|
-Xplugin:ErrorProne \
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
</compilerArgs>
|
</compilerArgs>
|
||||||
<annotationProcessorPaths>
|
<annotationProcessorPaths>
|
||||||
<path>
|
<path>
|
||||||
@@ -2483,6 +2497,11 @@
|
@@ -2491,6 +2505,11 @@
|
||||||
<artifactId>error-prone-contrib</artifactId>
|
<artifactId>error-prone-contrib</artifactId>
|
||||||
<version>${error-prone-support.version}</version>
|
<version>${error-prone-support.version}</version>
|
||||||
</path>
|
</path>
|
||||||
@@ -69,17 +69,6 @@
|
|||||||
public static DetailNode parseJavadocAsDetailNode(DetailAST blockComment) {
|
public static DetailNode parseJavadocAsDetailNode(DetailAST blockComment) {
|
||||||
final JavadocDetailNodeParser parser = new JavadocDetailNodeParser();
|
final JavadocDetailNodeParser parser = new JavadocDetailNodeParser();
|
||||||
final ParseStatus status = parser.parseJavadocAsDetailNode(blockComment);
|
final ParseStatus status = parser.parseJavadocAsDetailNode(blockComment);
|
||||||
--- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java
|
|
||||||
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java
|
|
||||||
@@ -626,6 +626,8 @@ public final class Main {
|
|
||||||
+ "reported to standard out in plain format. Checkstyle requires a configuration "
|
|
||||||
+ "XML file that configures the checks to apply.",
|
|
||||||
mixinStandardHelpOptions = true)
|
|
||||||
+ // XXX: Don't reorder arguments to `picocli.CommandLine.Option#names`.
|
|
||||||
+ @SuppressWarnings("LexicographicalAnnotationAttributeListing")
|
|
||||||
private static final class CliOptions {
|
|
||||||
|
|
||||||
/** Width of CLI help option. */
|
|
||||||
--- a/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java
|
--- a/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java
|
||||||
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java
|
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java
|
||||||
@@ -139,6 +139,9 @@ public class SarifLogger extends AbstractAutomaticBean implements AuditListener
|
@@ -139,6 +139,9 @@ public class SarifLogger extends AbstractAutomaticBean implements AuditListener
|
||||||
@@ -92,19 +81,6 @@
|
|||||||
final String rendered = report
|
final String rendered = report
|
||||||
.replace(VERSION_PLACEHOLDER, String.valueOf(version))
|
.replace(VERSION_PLACEHOLDER, String.valueOf(version))
|
||||||
.replace(RESULTS_PLACEHOLDER, String.join(",\n", results));
|
.replace(RESULTS_PLACEHOLDER, String.join(",\n", results));
|
||||||
--- a/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java
|
|
||||||
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java
|
|
||||||
@@ -564,6 +564,10 @@ public final class SiteUtil {
|
|
||||||
* @return a set of properties for the given class.
|
|
||||||
*/
|
|
||||||
public static Set<String> getPropertiesForDocumentation(Class<?> clss, Object instance) {
|
|
||||||
+ // XXX: File PR to replace `.collect(toSet())` with `.collect(toCollection(HashSet::new))`.
|
|
||||||
+ // XXX: Update `CollectorMutability` to recognize cases such as this one, where the created
|
|
||||||
+ // collection is clearly modified.
|
|
||||||
+ @SuppressWarnings("CollectorMutability")
|
|
||||||
final Set<String> properties =
|
|
||||||
getProperties(clss).stream()
|
|
||||||
.filter(prop -> {
|
|
||||||
--- a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java
|
--- a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java
|
||||||
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java
|
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java
|
||||||
@@ -93,6 +93,8 @@ import de.thetaphi.forbiddenapis.SuppressForbidden;
|
@@ -93,6 +93,8 @@ import de.thetaphi.forbiddenapis.SuppressForbidden;
|
||||||
@@ -147,21 +123,9 @@
|
|||||||
final Object test = new PackageObjectFactory(Collections.singleton(null), classLoader,
|
final Object test = new PackageObjectFactory(Collections.singleton(null), classLoader,
|
||||||
TRY_IN_ALL_REGISTERED_PACKAGES);
|
TRY_IN_ALL_REGISTERED_PACKAGES);
|
||||||
assertWithMessage("Exception is expected but got " + test).fail();
|
assertWithMessage("Exception is expected but got " + test).fail();
|
||||||
--- a/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java
|
|
||||||
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java
|
|
||||||
@@ -429,6 +429,9 @@ public class PropertyCacheFileTest extends AbstractPathTestSupport {
|
|
||||||
* mock toByteArray to throw exception.
|
|
||||||
*/
|
|
||||||
@Test
|
|
||||||
+ // XXX: Drop suppression once
|
|
||||||
+ // https://github.com/checkstyle/checkstyle/pull/14362 is resolved.
|
|
||||||
+ @SuppressWarnings("InputStreamReadAllBytes")
|
|
||||||
public void testNonExistentResource() throws IOException {
|
|
||||||
final Configuration config = new DefaultConfiguration("myName");
|
|
||||||
final String filePath = File.createTempFile("junit", null, temporaryFolder).getPath();
|
|
||||||
--- a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java
|
--- a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java
|
||||||
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java
|
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java
|
||||||
@@ -81,6 +81,8 @@ import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
|
@@ -80,6 +80,8 @@ import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
|
||||||
* @noinspectionreason ClassWithTooManyDependencies - complex tests require a
|
* @noinspectionreason ClassWithTooManyDependencies - complex tests require a
|
||||||
* large number of imports
|
* large number of imports
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ repos_root="${integration_test_root}/.repos"
|
|||||||
test_name="$(basename "${0}" .sh)"
|
test_name="$(basename "${0}" .sh)"
|
||||||
project=checkstyle
|
project=checkstyle
|
||||||
repository=https://github.com/checkstyle/checkstyle.git
|
repository=https://github.com/checkstyle/checkstyle.git
|
||||||
revision=checkstyle-10.13.0
|
revision=checkstyle-10.14.0
|
||||||
|
|
||||||
if [ "${#}" -gt 2 ] || ([ "${#}" = 2 ] && [ "${1:---sync}" != '--sync' ]); then
|
if [ "${#}" -gt 2 ] || ([ "${#}" = 2 ] && [ "${1:---sync}" != '--sync' ]); then
|
||||||
echo "Usage: ${0} [--sync] [<report_directory>]"
|
echo "Usage: ${0} [--sync] [<report_directory>]"
|
||||||
|
|||||||
Reference in New Issue
Block a user