Fix integration tests

And also update the test to use pmd/7.0.x and error recovery

Author: adangel

test/integration_test_pmd_report_builder.rb

@@ -10,12 +10,16 @@ def setup
   end
 
   def test_build
-    logger.level = Logger::INFO
-    projects = ProjectsParser.new.parse('test/resources/project-test.xml')
-    builder = PmdReportBuilder.new('config/design.xml', projects,
-                                   'target/repositories/pmd', 'pmd_releases/6.7.0')
+    argv = %w[-r target/repositories/pmd -b master -p origin/pmd/7.0.x
+              -c test/resources/pmd7-config.xml -l test/resources/project-test.xml
+              --error-recovery --debug]
+    options = PmdTester::Options.new(argv)
+    projects = ProjectsParser.new.parse(options.project_list)
+
+    builder = PmdReportBuilder.new(projects, options, options.config, options.patch_branch)
     builder.build
 
     assert_equal(0, $CHILD_STATUS.exitstatus)
+    assert_path_exist('target/reports/origin_pmd_7.0.x/checkstyle/pmd_report.xml')
   end
 end

test/resources/pmd7-config.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<ruleset name="Java Rules for PMD7 integration test" 
+    xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+    <description>Java Rules for PMD7 integration test</description>
+
+    <rule ref="category/java/bestpractices.xml/MissingOverride"/>
+    <rule ref="category/java/bestpractices.xml/UnusedAssignment"/>
+</ruleset>

test/resources/project-test.xml

@@ -9,8 +9,8 @@ xsi:noNamespaceSchemaLocation="projectlist_1_1_0.xsd">
     <type>git</type>
     <connection>https://github.com/checkstyle/checkstyle</connection>
     <tag>checkstyle-8.0</tag>
-    <exclude-pattern>.*/src/test/resources-noncompilable/.*</exclude-pattern>
-    <exclude-pattern>.*/src/test/resources/.*</exclude-pattern>
+    <exclude-pattern>.*/target/test-classes/com/puppycrawl/tools/checkstyle/.*</exclude-pattern>
+    <exclude-pattern>.*/target/generated-sources/.*</exclude-pattern>
 
     <build-command><![CDATA[#!/usr/bin/env bash
 if test -e classpath.txt; then
@@ -23,6 +23,7 @@ mvn dependency:build-classpath -DincludeScope=test -Dmdep.outputFile=classpath.t
     <auxclasspath-command>echo -n "$(pwd)/target/classes:$(pwd)/target/test-classes:"; cat classpath.txt</auxclasspath-command>
   </project>
 
+  <!-- this project configuration is here, so that PMD's repo is cloned into target/repositories for integration tests -->
   <project>
     <name>pmd</name>
     <type>git</type>