Update integration tests for pmd 7

Author: adangel

README.rdoc

@@ -136,10 +136,10 @@ The tool creates the following folders:
   bundle exec pmdtester ... # run this to directly execute pmdtester from source
 
   Run a single test class, e.g.:
-  bundle exec ruby -I test test/test_diff_report_builder.rb
+  bundle exec ruby -I test test/test_project_diff_report.rb
 
   Run a single test, e.g.:
-  bundle exec ruby -I test test/test_diff_report_builder.rb -n test_diff_report_builder
+  bundle exec ruby -I test test/test_project_diff_report.rb -n test_diff_report_builder
 
 === Releasing
 

lib/pmdtester/builders/pmd_report_builder.rb

@@ -70,6 +70,7 @@ def build_pmd(into_dir:)
                       ' -Dcheckstyle.skip=true' \
                       ' -Dpmd.skip=true' \
                       ' -T1C -B'
+        logger.debug "#{@pmd_branch_name}: maven command: #{package_cmd}"
         Cmd.execute_successfully(package_cmd)
       end
 

lib/pmdtester/cmd.rb

@@ -30,6 +30,7 @@ def self.execute_successfully(cmd)
       stdout, stderr, status = internal_execute(cmd)
 
       unless status.success?
+        logger.error "Command failed: #{cmd}"
         logger.error stdout
         logger.error stderr
         raise CmdException.new(cmd, stdout, stderr, status)

test/integration_test_runner.rb

@@ -69,22 +69,23 @@ def test_single_mode_with_html_flag_option
   end
 
   def test_online_mode
-    # This test depends on the file test_branch_2-baseline.zip being available at:
-    # https://pmd-code.org/pmd-regression-tester/test_branch_2-baseline.zip
-    base_branch = 'test_branch_2'
-    argv = "-r target/repositories/pmd -m online -b #{base_branch} -p pmd_releases/6.41.0 " \
+    # This test depends on the file pmd_releases_7.0.0-rc1-baseline.zip being available at:
+    # https://pmd-code.org/pmd-regression-tester/pmd_releases_7.0.0-rc1-baseline.zip
+    base_branch = 'pmd_releases/7.0.0-rc1'
+    patch_branch = 'pmd_releases/7.0.0-rc2'
+    argv = "-r target/repositories/pmd -m online -b #{base_branch} -p #{patch_branch} " \
         '--baseline-download-url https://pmd-code.org/pmd-regression-tester/' \
         ' --threads ' + Etc.nprocessors.to_s
 
     system("bundle exec bin/pmdtester #{argv}")
 
-    assert_path_exist("target/reports/#{base_branch}-baseline.zip")
-    assert_path_exist("target/reports/#{base_branch}/checkstyle/pmd_report.xml")
-    assert_path_exist("target/reports/#{base_branch}/spring-framework/pmd_report.xml")
-    assert_path_exist('target/reports/pmd_releases_6.41.0/checkstyle/pmd_report.xml')
-    assert_path_exist('target/reports/pmd_releases_6.41.0/checkstyle/config.xml')
-    assert_path_exist('target/reports/pmd_releases_6.41.0/spring-framework/pmd_report.xml')
-    assert_path_exist('target/reports/pmd_releases_6.41.0/spring-framework/config.xml')
+    assert_path_exist("target/reports/#{base_branch.tr('/', '_')}-baseline.zip")
+    assert_path_exist("target/reports/#{base_branch.tr('/', '_')}/checkstyle/pmd_report.xml")
+    assert_path_exist("target/reports/#{base_branch.tr('/', '_')}/spring-framework/pmd_report.xml")
+    assert_path_exist("target/reports/#{patch_branch.tr('/', '_')}/checkstyle/pmd_report.xml")
+    assert_path_exist("target/reports/#{patch_branch.tr('/', '_')}/checkstyle/config.xml")
+    assert_path_exist("target/reports/#{patch_branch.tr('/', '_')}/spring-framework/pmd_report.xml")
+    assert_path_exist("target/reports/#{patch_branch.tr('/', '_')}/spring-framework/config.xml")
     assert_path_exist('target/reports/diff/checkstyle/index.html')
     assert_path_exist('target/reports/diff/spring-framework/index.html')
     assert_path_exist('target/reports/diff/index.html')