Skip to content

Commit 9355abd

Browse files
committed
Fix xml parser tests
1 parent b2d6a9a commit 9355abd

File tree

3 files changed

+5
-730
lines changed

3 files changed

+5
-730
lines changed

lib/pmdtester/parsers/pmd_report_document.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def finish_text!
8585
def match_filter_set?(violation)
8686
return true if @filter_set.nil?
8787

88-
ruleset_attr = violation.attrs['ruleset'].delete(' ').downcase + '.xml'
88+
ruleset_attr = violation.ruleset_name.delete(' ').downcase! << '.xml'
8989
return true if @filter_set.include?(ruleset_attr)
9090

9191
rule_ref = "#{ruleset_attr}/#{violation.rule_name}"

lib/pmdtester/pmd_violation.rb

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class PmdViolation
2727
# </xs:simpleContent>
2828
# </xs:complexType>
2929

30-
attr_reader :fname, :info_url, :line, :old_line, :old_message, :rule_name, :ruleset_file
30+
attr_reader :fname, :info_url, :line, :old_line, :old_message, :rule_name, :ruleset_name
3131
attr_accessor :message
3232

3333
def initialize(attrs, branch, fname)
@@ -39,11 +39,7 @@ def initialize(attrs, branch, fname)
3939
@line = attrs['beginline'].to_i
4040
@rule_name = attrs['rule']
4141

42-
rset = attrs['ruleset']
43-
rset.delete!(' ')
44-
rset.downcase!
45-
rset << '.xml'
46-
@ruleset_file = rset
42+
@ruleset_name = attrs['ruleset'].freeze
4743

4844
@changed = false
4945
@old_message = nil
@@ -56,8 +52,8 @@ def line_move?(other)
5652

5753
def try_merge?(other)
5854
if branch != BASE && branch != other.branch && rule_name == other.rule_name &&
59-
!changed? && # not already changed
60-
(line == other.line || line_move?(other))
55+
!changed? && # not already changed
56+
(line == other.line || line_move?(other))
6157
@changed = true
6258
@old_message = other.message
6359
@old_line = other.line

0 commit comments

Comments
 (0)