Fix integration tests - missing pmd-core:jar:tests (#136)

Merge pull request #136 from adangel:fix-integration-tests

Author: adangel

History.md

@@ -24,6 +24,7 @@ projects. You might need to add `<tag>master</tag>` for some projects.
 * [#131](https://github.com/pmd/pmd-regression-tester/pull/131): Refactor GitHub Actions Workflows
 * [#132](https://github.com/pmd/pmd-regression-tester/pull/132): Fix manual integration test - Update expected_patch_config_3.xml: no more plsql exclusion
 * [#133](https://github.com/pmd/pmd-regression-tester/pull/133): \[ci] Make build a reuseable workflow
+* [#136](https://github.com/pmd/pmd-regression-tester/pull/136): Fix integration tests - missing pmd-core:jar:tests
 
 ## External Contributions
 

lib/pmdtester/builders/pmd_report_builder.rb

@@ -250,15 +250,26 @@ def find_pmd_dist_target
 
     def build_pmd_with_maven
       logger.info "#{@pmd_branch_name}: Building PMD #{@pmd_version}..."
-      package_cmd = './mvnw clean package ' \
-                    "-s #{ResourceLocator.resource('maven-settings.xml')} " \
-                    '-Pfor-dokka-maven-plugin ' \
-                    '-Dmaven.test.skip=true ' \
-                    '-Dmaven.javadoc.skip=true ' \
-                    '-Dmaven.source.skip=true ' \
-                    '-Dcheckstyle.skip=true ' \
-                    '-Dpmd.skip=true ' \
-                    '-T1C -B'
+
+      if Semver.compare(@pmd_version, '7.14.0') >= 0
+        # build command since PMD migrated to central portal
+        package_cmd = './mvnw clean package ' \
+                      '-PfastSkip ' \
+                      '-DskipTests ' \
+                      '-T1C -B'
+      else
+        # build command for older PMD versions
+        package_cmd = './mvnw clean package ' \
+                      "-s #{ResourceLocator.resource('maven-settings.xml')} " \
+                      '-Pfor-dokka-maven-plugin ' \
+                      '-Dmaven.test.skip=true ' \
+                      '-Dmaven.javadoc.skip=true ' \
+                      '-Dmaven.source.skip=true ' \
+                      '-Dcheckstyle.skip=true ' \
+                      '-Dpmd.skip=true ' \
+                      '-T1C -B'
+      end
+
       logger.debug "#{@pmd_branch_name}: maven command: #{package_cmd}"
       Cmd.execute_successfully(package_cmd)
     end

test/test_pmd_report_builder.rb

@@ -105,7 +105,7 @@ def test_build_normal
 
     # PMD binary does not exist yet this time...
     record_expectations(sha1_head: 'sha1abc', sha1_base: 'sha1abc', zip_file_exists: false)
-    stub_pmd_build_maven(binary_name: "pmd-bin-#{@pmd_version}.zip")
+    stub_pmd_build_maven(binary_name: "pmd-bin-#{@pmd_version}.zip") # file is pmd-bin-...
     PmdTester::Cmd.stubs(:execute_successfully).with(
       "unzip -qo pmd-dist/target/pmd-bin-#{@pmd_version}.zip " \
       '-d pmd-dist/target/exploded'
@@ -129,7 +129,32 @@ def test_build_normal_pmd7
 
     # PMD binary does not exist yet this time...
     record_expectations(sha1_head: 'sha1abc', sha1_base: 'sha1abc', zip_file_exists: false)
-    stub_pmd_build_maven(binary_name: "pmd-dist-#{@pmd_version}-bin.zip")
+    stub_pmd_build_maven(binary_name: "pmd-dist-#{@pmd_version}-bin.zip") # file is pmd-dist-...
+    PmdTester::Cmd.stubs(:execute_successfully).with(
+      "unzip -qo pmd-dist/target/pmd-dist-#{@pmd_version}-bin.zip " \
+      '-d pmd-dist/target/exploded'
+    ).once
+    PmdTester::Cmd.stubs(:execute_successfully).with(
+      "mv pmd-dist/target/exploded/pmd-bin-#{@pmd_version} " \
+      "#{Dir.getwd}/target/pmd-bin-#{@pmd_version}-main-sha1abc"
+    ).once
+    record_expectations_after_build
+
+    PmdTester::PmdReportBuilder
+      .new(projects, options, options.base_config, options.base_branch)
+      .build
+  end
+
+  def test_build_normal_pmd7_new_build
+    @pmd_version = '7.14.0'
+    projects = []
+    argv = %w[-r target/repositories/pmd -b main -p pmd_releases/7.14.0
+              -c config/design.xml -l test/resources/pmd_report_builder/project-test.xml]
+    options = PmdTester::Options.new(argv)
+
+    # PMD binary does not exist yet this time...
+    record_expectations(sha1_head: 'sha1abc', sha1_base: 'sha1abc', zip_file_exists: false)
+    stub_pmd_build_maven_new_pmd7_build()
     PmdTester::Cmd.stubs(:execute_successfully).with(
       "unzip -qo pmd-dist/target/pmd-dist-#{@pmd_version}-bin.zip " \
       '-d pmd-dist/target/exploded'
@@ -357,4 +382,19 @@ def stub_pmd_build_maven(binary_name:)
       end
     end.once
   end
+
+  def stub_pmd_build_maven_new_pmd7_build()
+    PmdTester::Cmd.stubs(:execute_successfully).with do |cmd|
+      if cmd == './mvnw clean package ' \
+                '-PfastSkip ' \
+                '-DskipTests ' \
+                '-T1C -B'
+        FileUtils.mkdir_p 'pmd-dist/target'
+        FileUtils.touch "pmd-dist/target/pmd-dist-#{@pmd_version}-bin.zip"
+        true
+      else
+        false
+      end
+    end.once
+  end
 end