Sort out where the different project-list.xml files belong

adangel · adangel · commit fee3305c7524 · 2021-06-17T19:24:12.000+02:00
diff --git a/test/integration_test_pmd_report_builder.rb b/test/integration_test_pmd_report_builder.rb
@@ -11,7 +11,8 @@ def setup
 
   def test_build
     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
+              -c test/resources/integration_test_pmd_report_builder/pmd7-config.xml
+              -l test/resources/integration_test_pmd_report_builder/project-test.xml
               --error-recovery --debug]
     options = PmdTester::Options.new(argv)
     projects = ProjectsParser.new.parse(options.project_list)
diff --git a/test/integration_test_runner.rb b/test/integration_test_runner.rb
@@ -9,7 +9,7 @@ def setup
 
   def test_local_mode
     argv = '-r target/repositories/pmd -b pmd_releases/6.7.0 -bc config/design.xml' \
-              ' -p master -pc config/design.xml -l test/resources/project-test.xml'
+              ' -p master -pc config/design.xml -l test/resources/integration_test_runner/project-test.xml'
 
     system("bundle exec bin/pmdtester #{argv}")
 
diff --git a/test/resources/integration_test_pmd_report_builder/pmd7-config.xml b/test/resources/integration_test_pmd_report_builder/pmd7-config.xml
diff --git a/test/resources/integration_test_pmd_report_builder/project-test.xml b/test/resources/integration_test_pmd_report_builder/project-test.xml
diff --git a/test/resources/integration_test_runner/project-test.xml b/test/resources/integration_test_runner/project-test.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<projectlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:noNamespaceSchemaLocation="projectlist_1_1_0.xsd">
+  <description>Standard Projects</description>
+
+  <project>
+    <name>checkstyle</name>
+    <type>git</type>
+    <connection>https://github.com/checkstyle/checkstyle</connection>
+    <tag>checkstyle-8.10</tag>
+    <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
+  exit
+fi
+
+set -e
+
+mvn clean test-compile -B
+mvn dependency:build-classpath -DincludeScope=test -Dmdep.outputFile=classpath.txt -B
+]]></build-command>
+    <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>
+    <connection>https://github.com/pmd/pmd</connection>
+  </project>
+</projectlist>
diff --git a/test/resources/options/project-test.xml b/test/resources/options/project-test.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<projectlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:noNamespaceSchemaLocation="projectlist_1_1_0.xsd">
+  <description>Standard Projects</description>
+
+  <project>
+    <name>checkstyle</name>
+    <type>git</type>
+    <connection>https://github.com/checkstyle/checkstyle</connection>
+    <tag>checkstyle-8.10</tag>
+    <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
+  exit
+fi
+
+set -e
+
+mvn clean test-compile -B
+mvn dependency:build-classpath -DincludeScope=test -Dmdep.outputFile=classpath.txt -B
+]]></build-command>
+    <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>
+    <connection>https://github.com/pmd/pmd</connection>
+  </project>
+</projectlist>
diff --git a/test/resources/pmd_report_builder/project-test.xml b/test/resources/pmd_report_builder/project-test.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<projectlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:noNamespaceSchemaLocation="projectlist_1_1_0.xsd">
+  <description>Standard Projects</description>
+
+  <project>
+    <name>checkstyle</name>
+    <type>git</type>
+    <connection>https://github.com/checkstyle/checkstyle</connection>
+    <tag>checkstyle-8.10</tag>
+    <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
+  exit
+fi
+
+set -e
+
+mvn clean test-compile -B
+mvn dependency:build-classpath -DincludeScope=test -Dmdep.outputFile=classpath.txt -B
+]]></build-command>
+    <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>
+    <connection>https://github.com/pmd/pmd</connection>
+  </project>
+</projectlist>
diff --git a/test/resources/project_diff_report/project-list.xml b/test/resources/project_diff_report/project-list.xml
diff --git a/test/resources/projects_parser/project-list-invalid.xml b/test/resources/projects_parser/project-list-invalid.xml
diff --git a/test/resources/projects_parser/project-list.xml b/test/resources/projects_parser/project-list.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<projectlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:noNamespaceSchemaLocation="projectlist_1_1_0.xsd">
+  <description>Standard Projects</description>
+
+  <project>
+    <name>checkstyle</name>
+    <type>git</type>
+    <connection>https://github.com/checkstyle/checkstyle</connection>
+    <exclude-pattern>**/src/test/resources-noncompilable/**/*</exclude-pattern>
+    <exclude-pattern>**/src/test/resources/**/*</exclude-pattern>
+    <build-command>mvn test-compile -B</build-command>
+    <auxclasspath-command>echo -n "$(pwd)/target/classes:"</auxclasspath-command>
+  </project>
+
+  <project>
+    <name>openjdk10</name>
+    <type>hg</type>
+    <connection>http://hg.openjdk.java.net/jdk10/jdk10/jdk</connection>
+    <webview-url>http://hg.openjdk.java.net/jdk10/jdk10/jdk/file/777356696811</webview-url>
+  </project>
+
+  <project>
+    <name>spring-framework</name>
+    <type>git</type>
+    <connection>https://github.com/spring-projects/spring-framework</connection>
+    <webview-url>https://github.com/spring-projects/spring-framework/tree/v5.0.6.RELEASE</webview-url>
+    <tag>v5.0.6.RELEASE</tag>
+  </project>
+
+</projectlist>
diff --git a/test/resources/runner/project-test.xml b/test/resources/runner/project-test.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<projectlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:noNamespaceSchemaLocation="projectlist_1_1_0.xsd">
+  <description>Standard Projects</description>
+
+  <project>
+    <name>checkstyle</name>
+    <type>git</type>
+    <connection>https://github.com/checkstyle/checkstyle</connection>
+    <tag>checkstyle-8.10</tag>
+    <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
+  exit
+fi
+
+set -e
+
+mvn clean test-compile -B
+mvn dependency:build-classpath -DincludeScope=test -Dmdep.outputFile=classpath.txt -B
+]]></build-command>
+    <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>
+    <connection>https://github.com/pmd/pmd</connection>
+  </project>
+</projectlist>
diff --git a/test/resources/summary_report_builder/project-list.xml b/test/resources/summary_report_builder/project-list.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<projectlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:noNamespaceSchemaLocation="projectlist_1_1_0.xsd">
+  <description>Standard Projects</description>
+
+  <project>
+    <name>checkstyle</name>
+    <type>git</type>
+    <connection>https://github.com/checkstyle/checkstyle</connection>
+    <exclude-pattern>**/src/test/resources-noncompilable/**/*</exclude-pattern>
+    <exclude-pattern>**/src/test/resources/**/*</exclude-pattern>
+    <build-command>mvn test-compile -B</build-command>
+    <auxclasspath-command>echo -n "$(pwd)/target/classes:"</auxclasspath-command>
+  </project>
+
+  <project>
+    <name>openjdk10</name>
+    <type>hg</type>
+    <connection>http://hg.openjdk.java.net/jdk10/jdk10/jdk</connection>
+    <webview-url>http://hg.openjdk.java.net/jdk10/jdk10/jdk/file/777356696811</webview-url>
+  </project>
+
+  <project>
+    <name>spring-framework</name>
+    <type>git</type>
+    <connection>https://github.com/spring-projects/spring-framework</connection>
+    <webview-url>https://github.com/spring-projects/spring-framework/tree/v5.0.6.RELEASE</webview-url>
+    <tag>v5.0.6.RELEASE</tag>
+  </project>
+
+</projectlist>
diff --git a/test/test_options.rb b/test/test_options.rb
@@ -87,7 +87,7 @@ def parse_and_assert_error_messages(argv, expect)
 
   def test_local_miss_base_name
     argv = %w[-r target/repositories/pmd -bc config/design.xml
-              -p pmd_releases/6.1.0 -pc config/design.xml -l test/resources/project-test.xml]
+              -p pmd_releases/6.1.0 -pc config/design.xml -l test/resources/options/project-test.xml]
     expect = 'base branch name is required in local mode.'
     parse_and_assert_error_messages(argv, expect)
   end
diff --git a/test/test_pmd_report_builder.rb b/test/test_pmd_report_builder.rb
@@ -27,7 +27,7 @@ def teardown
   def test_build_skip
     projects = []
     argv = %w[-r target/repositories/pmd -b master -p pmd_releases/6.1.0
-              -c config/design.xml -l test/resources/project-test.xml]
+              -c config/design.xml -l test/resources/pmd_report_builder/project-test.xml]
     options = PmdTester::Options.new(argv)
 
     record_expectations('sha1abc', 'sha1abc', true)
@@ -45,7 +45,7 @@ def test_build_skip
   def test_build_skip_ci
     projects = []
     argv = %w[-r target/repositories/pmd -b master -p pmd_releases/6.1.0
-              -c config/design.xml -l test/resources/project-test.xml]
+              -c config/design.xml -l test/resources/pmd_report_builder/project-test.xml]
     options = PmdTester::Options.new(argv)
 
     FileUtils.mkdir_p 'target/repositories/pmd/pmd-dist/target'
@@ -66,7 +66,7 @@ def test_build_skip_ci
   def test_build_normal
     projects = []
     argv = %w[-r target/repositories/pmd -b master -p pmd_releases/6.1.0
-              -c config/design.xml -l test/resources/project-test.xml]
+              -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...
diff --git a/test/test_project_diff_report.rb b/test/test_project_diff_report.rb
@@ -25,7 +25,7 @@ def setup
 
   def test_diff_report_builder
     # Project name: spring-framework
-    project = PmdTester::ProjectsParser.new.parse('test/resources/project-list.xml')[2]
+    project = PmdTester::ProjectsParser.new.parse('test/resources/project_diff_report/project-list.xml')[2]
 
     actual_report_path = "target/reports/diff/#{project.name}"
 
@@ -39,7 +39,7 @@ def test_diff_report_builder
   end
 
   def test_report_diffs_empty
-    project = PmdTester::ProjectsParser.new.parse('test/resources/project-list.xml')[1]
+    project = PmdTester::ProjectsParser.new.parse('test/resources/project_diff_report/project-list.xml')[1]
     project.report_diff = PmdTester::ReportDiff.new(base_report: PmdTester::Report.empty,
                                                     patch_report: PmdTester::Report.empty)
 
diff --git a/test/test_projects_parser.rb b/test/test_projects_parser.rb
@@ -5,7 +5,7 @@
 # Unit test for PmdTester::ProjectsParser
 class TestProjectsParser < Test::Unit::TestCase
   def setup
-    @projects = PmdTester::ProjectsParser.new.parse('test/resources/project-list.xml')
+    @projects = PmdTester::ProjectsParser.new.parse('test/resources/projects_parser/project-list.xml')
     assert_equal(3, @projects.size)
   end
 
@@ -44,7 +44,7 @@ def test_project_parser_spring
   end
 
   def test_invalid_list
-    list_file = 'test/resources/project-list-invalid.xml'
+    list_file = 'test/resources/projects_parser/project-list-invalid.xml'
     begin
       PmdTester::ProjectsParser.new.parse(list_file)
     rescue PmdTester::ProjectsParserException => e
diff --git a/test/test_runner.rb b/test/test_runner.rb
@@ -16,7 +16,7 @@ def run_runner(argv)
   end
 
   def test_single_mode
-    project_list_path = 'test/resources/project-test.xml'
+    project_list_path = 'test/resources/runner/project-test.xml'
     target_project_list_path = 'target/reports/test_branch/project-list.xml'
     PmdReportBuilder.any_instance.stubs(:build)
                     .returns(PmdBranchDetail.new('test_branch')).once
@@ -25,20 +25,20 @@ def test_single_mode
     SummaryReportBuilder.any_instance.stubs(:write_all_projects).once
 
     argv = %w[-r target/repositories/pmd -p pmd_releases/6.1.0
-              -pc config/design.xml -l test/resources/project-test.xml -m single]
+              -pc config/design.xml -l test/resources/runner/project-test.xml -m single]
     summarized_results = run_runner(argv)
     assert_summarized_diffs(summarized_results)
   end
 
   def test_single_mode_no_html
-    project_list_path = 'test/resources/project-test.xml'
+    project_list_path = 'test/resources/runner/project-test.xml'
     target_project_list_path = 'target/reports/test_branch/project-list.xml'
     PmdReportBuilder.any_instance.stubs(:build)
                     .returns(PmdBranchDetail.new('test_branch')).once
     FileUtils.expects(:cp).with(project_list_path, target_project_list_path).once
 
     argv = %w[-r target/repositories/pmd -p pmd_releases/6.1.0
-              -pc config/design.xml -l test/resources/project-test.xml -m single
+              -pc config/design.xml -l test/resources/runner/project-test.xml -m single
               --html-flag]
     summarized_results = run_runner(argv)
     assert_summarized_diffs(summarized_results)
@@ -58,7 +58,7 @@ def test_single_mode_multithreading
     SummaryReportBuilder.any_instance.stubs(:write_all_projects).once
 
     argv = %w[-r target/repositories/pmd -p pmd_releases/6.1.0
-              -pc config/design.xml -l test/resources/project-test.xml -m single -t 4]
+              -pc config/design.xml -l test/resources/runner/project-test.xml -m single -t 4]
     summarized_results = run_runner(argv)
     assert_summarized_diffs(summarized_results)
   end
@@ -69,7 +69,7 @@ def test_local_mode
     SummaryReportBuilder.any_instance.stubs(:write_all_projects).once
 
     argv = %w[-r target/repositories/pmd -b master -bc config/design.xml -p pmd_releases/6.1.0
-              -pc config/design.xml -l test/resources/project-test.xml]
+              -pc config/design.xml -l test/resources/runner/project-test.xml]
     summarized_results = run_runner(argv)
     assert_summarized_diffs(summarized_results)
   end
@@ -87,7 +87,7 @@ def test_local_mode_multithreading
     SummaryReportBuilder.any_instance.stubs(:write_all_projects).once
 
     argv = %w[-r target/repositories/pmd -b master -bc config/design.xml -p pmd_releases/6.1.0
-              -pc config/design.xml -l test/resources/project-test.xml -t 5]
+              -pc config/design.xml -l test/resources/runner/project-test.xml -t 5]
     summarized_results = run_runner(argv)
     assert_summarized_diffs(summarized_results)
   end
diff --git a/test/test_summary_report_builder.rb b/test/test_summary_report_builder.rb
@@ -11,7 +11,7 @@ def setup
   end
 
   def test_summary_report_builder
-    projects = PmdTester::ProjectsParser.new.parse('test/resources/project-list.xml')
+    projects = PmdTester::ProjectsParser.new.parse('test/resources/summary_report_builder/project-list.xml')
 
     base_path = 'target/reports/base_branch'
     FileUtils.mkdir_p(base_path)
@@ -27,7 +27,7 @@ def test_summary_report_builder
   end
 
   def test_summary_report_builder_with_filter
-    projects = PmdTester::ProjectsParser.new.parse('test/resources/project-list.xml')
+    projects = PmdTester::ProjectsParser.new.parse('test/resources/summary_report_builder/project-list.xml')
 
     base_path = 'target/reports/base_branch'
     FileUtils.mkdir_p(base_path)
