Fix usage of --fail-on-violation with PMD 7

Author: adangel

lib/pmdtester/builders/pmd_report_builder.rb

@@ -91,7 +91,7 @@ def get_last_commit_message
 
     def generate_pmd_report(project)
       error_recovery_options = @error_recovery ? 'PMD_JAVA_OPTS="-Dpmd.error_recovery -ea" ' : ''
-      fail_on_violation = should_use_long_cli_options? ? '--fail-on-violation false' : '-failOnViolation false'
+      fail_on_violation = create_failonviolation_option
       auxclasspath_option = create_auxclasspath_option(project)
       pmd_cmd = "#{error_recovery_options}" \
                 "#{determine_run_path} -d #{project.local_source_path} -f xml " \
@@ -208,6 +208,16 @@ def create_auxclasspath_option(project)
       auxclasspath_option
     end
 
+    def create_failonviolation_option
+      if pmd7?
+        '--no-fail-on-violation'
+      elsif should_use_long_cli_options?
+        '--fail-on-violation false'
+      else
+        '-failOnViolation false'
+      end
+    end
+
     def pmd7?
       Semver.compare(@pmd_version, '7.0.0-SNAPSHOT') >= 0
     end

pmdtester.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.metadata = { "bug_tracker_uri" => "https://github.com/pmd/pmd-regression-tester/issues", "homepage_uri" => "https://pmd.github.io", "source_code_uri" => "https://github.com/pmd/pmd-regression-tester" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andreas Dangel".freeze, "Binguo Bao".freeze, "Cl\u00E9ment Fournier".freeze]
-  s.date = "2023-05-26"
+  s.date = "2023-05-27"
   s.description = "A regression testing tool ensure that new problems and unexpected behaviors will not be introduced to PMD project after fixing an issue , and new rules can work as expected.".freeze
   s.email = ["[email protected]".freeze, "[email protected]".freeze, "[email protected]".freeze]
   s.executables = ["pmdtester".freeze]

test/test_pmd_report_builder.rb

@@ -204,7 +204,7 @@ def test_build_pmd7
     record_expectations(sha1_head: sha1, sha1_base: sha1, zip_file_exists: true)
     record_expectations_after_build
     record_expectations_project_build(sha1: sha1, error: true, long_cli_options: true,
-                                      no_progress_bar: true, base_cmd: 'pmd check')
+                                      no_progress_bar: true, pmd7: true)
 
     pmd_cli_cmd = prepare_pmd_dist_dir(version: @pmd_version, sha1: sha1)
     begin
@@ -241,8 +241,23 @@ def test_build_failing
 
   private
 
+  def determine_cli_cmd_and_options(pmd7:, long_cli_options:)
+    if pmd7
+      base_cmd = 'pmd check'
+      fail_on_violation = '--no-fail-on-violation'
+      auxclasspath_option = '--aux-classpath extra:dirs'
+    else
+      base_cmd = 'run.sh pmd'
+      fail_on_violation = long_cli_options ? '--fail-on-violation false' : '-failOnViolation false'
+      auxclasspath_option = long_cli_options ? '--aux-classpath extra:dirs' : '-auxclasspath extra:dirs'
+    end
+    [base_cmd, fail_on_violation, auxclasspath_option]
+  end
+
   def record_expectations_project_build(sha1:, error: false, long_cli_options: false,
-                                        no_progress_bar: false, exit_status: 0, base_cmd: 'run.sh pmd')
+                                        no_progress_bar: false, exit_status: 0, pmd7: false)
+    base_cmd, fail_on_violation, auxclasspath_option = determine_cli_cmd_and_options(pmd7: pmd7,
+                                                                                     long_cli_options: long_cli_options)
     PmdTester::ProjectBuilder.any_instance.stubs(:clone_projects).once
     PmdTester::ProjectBuilder.any_instance.stubs(:build_projects).once
     PmdTester::SimpleProgressLogger.any_instance.stubs(:start).once
@@ -257,8 +272,7 @@ def record_expectations_project_build(sha1:, error: false, long_cli_options: fal
                         '-d target/repositories/checkstyle -f xml ' \
                         '-R target/reports/master/checkstyle/config.xml ' \
                         '-r target/reports/master/checkstyle/pmd_report.xml ' \
-                        "#{long_cli_options ? '--fail-on-violation false' : '-failOnViolation false'} -t 1 " \
-                        "#{long_cli_options ? '--aux-classpath extra:dirs' : '-auxclasspath extra:dirs'}" \
+                        "#{fail_on_violation} -t 1 #{auxclasspath_option}" \
                         "#{no_progress_bar ? ' --no-progress' : ''}",
                         'target/reports/master/checkstyle').once
                   .returns(process_status)