Merge pull request #105 from adangel:fix-report-doc-filter

Fix ruleset filter by language

Author: adangel

History.md

@@ -6,6 +6,8 @@
 
 ## Fixed Issues
 
+* [#104](https://github.com/pmd/pmd-regression-tester/issues/104): Baseline filtering is not working anymore
+
 ## External Contributions
 
 # 1.4.0 / 2022-03-24

lib/pmdtester/parsers/pmd_report_document.rb

@@ -89,11 +89,10 @@ def finish_text!
     def match_filter_set?(violation)
       return true if @filter_set.nil?
 
-      ruleset_attr = violation.ruleset_name.delete(' ').downcase! << '.xml'
-      return true if @filter_set.include?(ruleset_attr)
-
-      rule_ref = "#{violation.language}/#{ruleset_attr}/#{violation.rule_name}"
+      ruleset_filter = violation.language << '/' << violation.ruleset_name.delete(' ').downcase! << '.xml'
+      return true if @filter_set.include?(ruleset_filter)
 
+      rule_ref = "#{ruleset_filter}/#{violation.rule_name}"
       @filter_set.include?(rule_ref)
     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 = "2022-03-24"
+  s.date = "2022-04-12"
   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_document.rb

@@ -19,7 +19,7 @@ def test_document
   end
 
   def test_filter_set
-    filter_set = Set['documentation.xml']
+    filter_set = Set['java/documentation.xml']
     doc = PmdReportDocument.new('base', 'SHOULD_BE_REPLACED', filter_set)
     parser = Nokogiri::XML::SAX::Parser.new(doc)
     parser.parse(File.open('test/resources/pmd_report_document/test_document.xml'))