simplecov-cobertura 3.0.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4e823da3eaf503a2ba1f94202b474e87e1461864d60df99fbef33f55b877d2
-  data.tar.gz: 21969345160bc14566b87f3d457f89bb0b27b9f9cc4607cd5a1b7bd658d7b176
+  metadata.gz: d9b68c5aa76db30753de21b0db6f942c58e0ccc41c7f77d73881215faf7bbf31
+  data.tar.gz: 19b8626568d444dc368bd9a4fad5747c78c0cb4583c0d44d074994e671d4ceab
 SHA512:
-  metadata.gz: b857a2943394c10dfe3afaf3cfc2bc9c9e809e7aec136503e9ec75f8815008c9f519e7bd6b7f34901905ce92c35bc1b953ca601f74392ff1941fa3b983c5e833
-  data.tar.gz: 278a3e88e3429d000688a334dc83202af4d084601ceee911d3a8a4e17e1a53ae4eab370b39f2722ffdb28947e2f01bb7e4724adf0ee7c2cb98949b2770c4f12f
+  metadata.gz: 9cd6c9bf87b3da4df600bd3c3754ed66581802eb5d46b691119f605af7707f23a14af37fba5a67f524bf36380540f259ca2f3479ee0d651d5fd8cd0c6e0f3ffd
+  data.tar.gz: 4308ed2698f5bd7c3afc7c319a6a231aa1ea501f312282fd73f9650062d34d7492e26e8cb86d127a779f11c2fbb89a80c06dc6638e063e3c7bdf219a2356f6f8

data/.github/workflows/build.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2, 3.3, 3.4]
+        ruby-version: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2, 3.3, 3.4, 4.0]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/lib/simplecov-cobertura/version.rb

@@ -1,7 +1,7 @@
 module SimpleCov
   module Formatter
     class CoberturaFormatter
-      VERSION = '3.0.0'
+      VERSION = '3.1.2'
     end
   end
 end

data/lib/simplecov-cobertura.rb

@@ -1,6 +1,8 @@
+require 'stringio'
 require 'rexml/document'
 require 'rexml/element'
 require 'pathname'
+require 'simplecov'
 
 require_relative 'simplecov-cobertura/version'
 
@@ -33,8 +35,11 @@ module SimpleCov
       private
 
         def result_to_xml(result)
-          doc = REXML::Document.new set_xml_head
+          doc = REXML::Document.new
           doc.context[:attribute_quote] = :quote
+          doc << REXML::XMLDecl.new('1.0')
+          doc << REXML::DocType.new('coverage', "SYSTEM \"#{DTD_URL}\"")
+          doc << REXML::Comment.new("Generated by simplecov-cobertura version #{VERSION} (https://github.com/jessebs/simplecov-cobertura)")
           doc.add_element REXML::Element.new('coverage')
           coverage = doc.root
 
@@ -66,14 +71,21 @@ module SimpleCov
               class_.add_element(REXML::Element.new('methods'))
               class_.add_element(lines = REXML::Element.new('lines'))
 
-              branched_lines = file.branches.map(&:start_line)
-              branched_lines_covered = file.covered_branches.map(&:start_line)
+              branches_by_line = {}
+              if SimpleCov.branch_coverage?
+                file.branches.each do |branch|
+                  line_no = branch.start_line
+                  branches_by_line[line_no] ||= { total: 0, covered: 0 }
+                  branches_by_line[line_no][:total] += 1
+                  branches_by_line[line_no][:covered] += 1 if branch.covered?
+                end
+              end
 
               file.lines.each do |file_line|
                 if file_line.covered? || file_line.missed?
                   lines.add_element(line = REXML::Element.new('line'))
                   set_line_attributes(line, file_line)
-                  set_branch_attributes(line, file_line, branched_lines, branched_lines_covered) if SimpleCov.branch_coverage?
+                  set_branch_attributes(line, file_line, branches_by_line) if SimpleCov.branch_coverage?
                 end
               end
             end
@@ -130,23 +142,19 @@ module SimpleCov
           line.attributes['hits'] = file_line.coverage.to_s
         end
 
-        def set_branch_attributes(line, file_line, branched_lines, branched_lines_covered)
-          if branched_lines.include? file_line.number
-            pct_coverage, branches_covered = branched_lines_covered.include?(file_line.number) ? [100, '1/1'] : [0, '0/1']
+        def set_branch_attributes(line, file_line, branches_by_line)
+          branch_info = branches_by_line[file_line.number]
+          if branch_info
+            total = branch_info[:total]
+            covered = branch_info[:covered]
+            pct_coverage = total > 0 ? (covered * 100 / total) : 0
             line.attributes['branch'] = 'true'
-            line.attributes['condition-coverage'] = "#{pct_coverage}% (#{branches_covered})"
+            line.attributes['condition-coverage'] = "#{pct_coverage}% (#{covered}/#{total})"
           else
             line.attributes['branch'] = 'false'
           end
         end
 
-        def set_xml_head(lines=[])
-          lines << "<?xml version=\"1.0\"?>"
-          lines << "<!DOCTYPE coverage SYSTEM \"#{DTD_URL}\">"
-          lines << "<!-- Generated by simplecov-cobertura version #{VERSION} (https://github.com/jessebs/simplecov-cobertura) -->"
-          lines.join("\n")
-        end
-
       # Roughly mirrors private method SimpleCov::Formatter::HTMLFormatter#output_coverage
       def output_message(result, output_path)
         output = "Coverage report generated for #{result.command_name} to #{output_path}."
@@ -160,7 +168,7 @@ module SimpleCov
         end
 
         def extract_rate(percent)
-          (percent / 100).round(2).to_s
+          (percent / 100).round(4).to_s
         end
 
         def project_root

data/test/simplecov-cobertura_test.rb

@@ -17,7 +17,13 @@ class CoberturaFormatterTest < Test::Unit::TestCase
             [:if, 3, 5, 4, 5, 26] =>
           {[:then, 4, 5, 16, 5, 20] => 1, [:else, 5, 5, 23, 5, 26] => 0},
             [:if, 6, 7, 4, 11, 7] =>
-          {[:then, 7, 8, 6, 8, 10] => 0, [:else, 8, 10, 6, 10, 9] => 1}
+          {[:then, 7, 8, 6, 8, 10] => 0, [:else, 8, 10, 6, 10, 9] => 1},
+            [:if, 9, 12, 4, 12, 15] =>
+          {[:then, 10, 12, 6, 12, 10] => 1, [:else, 11, 12, 13, 12, 15] => 0},
+            [:if, 12, 13, 4, 13, 20] =>
+          {[:then, 13, 13, 6, 13, 15] => 1, [:else, 14, 13, 18, 13, 20] => 0},
+            [:if, 15, 15, 4, 15, 25] =>
+          {[:then, 16, 15, 6, 15, 20] => 0, [:else, 17, 15, 23, 15, 25] => 0}
         }
       }
     })
@@ -65,12 +71,12 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     doc = Nokogiri::XML::Document.parse(xml)
 
     coverage = doc.xpath '/coverage'
-    assert_equal '0.86', coverage.attribute('line-rate').value
-    assert_equal '0.5', coverage.attribute('branch-rate').value
+    assert_equal '0.8571', coverage.attribute('line-rate').value
+    assert_equal '0.4167', coverage.attribute('branch-rate').value
     assert_equal '6', coverage.attribute('lines-covered').value
     assert_equal '7', coverage.attribute('lines-valid').value
-    assert_equal '3', coverage.attribute('branches-covered').value
-    assert_equal '6', coverage.attribute('branches-valid').value
+    assert_equal '5', coverage.attribute('branches-covered').value
+    assert_equal '12', coverage.attribute('branches-valid').value
     assert_equal '0', coverage.attribute('complexity').value
     assert_equal '0', coverage.attribute('version').value
     assert_not_empty coverage.attribute('timestamp').value
@@ -83,8 +89,8 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     assert_equal 1, packages.length
     package = packages.first
     assert_equal 'simplecov-cobertura', package.attribute('name').value
-    assert_equal '0.86', package.attribute('line-rate').value
-    assert_equal '0.5', package.attribute('branch-rate').value
+    assert_equal '0.8571', package.attribute('line-rate').value
+    assert_equal '0.4167', package.attribute('branch-rate').value
     assert_equal '0', package.attribute('complexity').value
 
     classes = doc.xpath '/coverage/packages/package/classes/class'
@@ -92,8 +98,8 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     clazz = classes.first
     assert_equal 'test/simplecov-cobertura_test.rb', clazz.attribute('name').value
     assert_equal 'test/simplecov-cobertura_test.rb', clazz.attribute('filename').value
-    assert_equal '0.86', clazz.attribute('line-rate').value
-    assert_equal '0.5', clazz.attribute('branch-rate').value
+    assert_equal '0.8571', clazz.attribute('line-rate').value
+    assert_equal '0.4167', clazz.attribute('branch-rate').value
     assert_equal '0', clazz.attribute('complexity').value
 
     lines = doc.xpath '/coverage/packages/package/classes/class/lines/line'
@@ -106,6 +112,18 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     assert_equal '10', last_line.attribute('number').value
     assert_equal 'true', last_line.attribute('branch').value
     assert_equal '1', last_line.attribute('hits').value
+
+    # Verify condition-coverage accurately reflects branch counts per line
+    branched_lines = lines.select { |l| l.attribute('branch').value == 'true' }
+    condition_coverages = branched_lines.map { |l| [l.attribute('number').value, l.attribute('condition-coverage').value] }
+    # Line 3: 2 branches (then=>0, else=>1) => 50% (1/2)
+    assert_include condition_coverages, ['3', '50% (1/2)']
+    # Line 5: 2 branches (then=>1, else=>0) => 50% (1/2)
+    assert_include condition_coverages, ['5', '50% (1/2)']
+    # Line 8: 1 branch (then=>0) => 0% (0/1)
+    assert_include condition_coverages, ['8', '0% (0/1)']
+    # Line 10: 1 branch (else=>1) => 100% (1/1)
+    assert_include condition_coverages, ['10', '100% (1/1)']
   end
 
   def test_groups
@@ -115,12 +133,12 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     doc = Nokogiri::XML::Document.parse(xml)
 
     coverage = doc.xpath '/coverage'
-    assert_equal '0.86', coverage.attribute('line-rate').value
-    assert_equal '0.5', coverage.attribute('branch-rate').value
+    assert_equal '0.8571', coverage.attribute('line-rate').value
+    assert_equal '0.4167', coverage.attribute('branch-rate').value
     assert_equal '6', coverage.attribute('lines-covered').value
     assert_equal '7', coverage.attribute('lines-valid').value
-    assert_equal '3', coverage.attribute('branches-covered').value
-    assert_equal '6', coverage.attribute('branches-valid').value
+    assert_equal '5', coverage.attribute('branches-covered').value
+    assert_equal '12', coverage.attribute('branches-valid').value
     assert_equal '0', coverage.attribute('complexity').value
     assert_equal '0', coverage.attribute('version').value
     assert_not_empty coverage.attribute('timestamp').value
@@ -133,8 +151,8 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     assert_equal 1, packages.length
     package = packages.first
     assert_equal 'test_group', package.attribute('name').value
-    assert_equal '0.86', package.attribute('line-rate').value
-    assert_equal '0.5', package.attribute('branch-rate').value
+    assert_equal '0.8571', package.attribute('line-rate').value
+    assert_equal '0.4167', package.attribute('branch-rate').value
     assert_equal '0', package.attribute('complexity').value
 
     classes = doc.xpath '/coverage/packages/package/classes/class'
@@ -142,8 +160,8 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     clazz = classes.first
     assert_equal 'test/simplecov-cobertura_test.rb', clazz.attribute('name').value
     assert_equal 'test/simplecov-cobertura_test.rb', clazz.attribute('filename').value
-    assert_equal '0.86', clazz.attribute('line-rate').value
-    assert_equal '0.5', clazz.attribute('branch-rate').value
+    assert_equal '0.8571', clazz.attribute('line-rate').value
+    assert_equal '0.4167', clazz.attribute('branch-rate').value
     assert_equal '0', clazz.attribute('complexity').value
 
     lines = doc.xpath '/coverage/packages/package/classes/class/lines/line'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-cobertura
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Jesse Bowes
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: SimpleCov Cobertura Formatter
 test_files: