simplecov-cobertura 2.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c2d0c9eebf10fae25ce491aa5b33fd744cb72c8bd3b9645706e8b6f35495e88
-  data.tar.gz: 8890ee7ca2a87b49a4f37ee049bbb6d9375f5ead377bc2e3e32ee793883f56a4
+  metadata.gz: af6021ce1207169b5c8d5bbb7aba68a6a02df4c88a248b7fca763f817cfe0600
+  data.tar.gz: e9ded405dcfbb983a77153fd13a376addcdbb77d8e34a44b68c2ecb61f6af9c5
 SHA512:
-  metadata.gz: ce64fbbd3eb2986a45d90800573739d5f558162a8a66223007926a799e0ba082c4393a7eae1974fe8f40c7b1a22b1f3bebe3adb696805a29a2206c7c5a0b6a21
-  data.tar.gz: ed1e556b151833e2db0eeb4a2e8a0539946f80af3a3a85429e708a119065def438032eb660437367f1bd34c91eb1d75d7636ca3958844ca83249ef433080eb6d
+  metadata.gz: e6678dab612071560ecde49409ed10285778dc6c73445766e80283828548c5a142631dc44ee7be5a1da637f8d3fa7ee8d077e226528574b1978b9742f21c1571
+  data.tar.gz: af788e30f13b615b2016359a49b6d1ab34931ac74732ca25beefb4c0cac0ddff8f5bb378a3b92ed4ed699a0c404d5590982f50f32084186b861c2bde528f7e26

data/.github/workflows/build.yml

@@ -7,7 +7,7 @@
 
 name: Build
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   test:
@@ -15,14 +15,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.5, 2.6, 2.7, 3.0]
+        ruby-version: [ 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:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: Run tests
-        run: bundle exec rake
+        run: bundle exec rake

data/.gitignore

@@ -15,3 +15,4 @@ mkmf.log
 
 *.iml
 .idea
+.ruby-*

data/README.md

@@ -1,10 +1,12 @@
-# simplecov-cobertura 
-[![Build](https://github.com/dashingrocket/simplecov-cobertura/actions/workflows/build.yml/badge.svg)](https://github.com/dashingrocket/simplecov-cobertura/actions/workflows/build.yml)   [![Gem Version](https://badge.fury.io/rb/simplecov-cobertura.svg)](http://badge.fury.io/rb/simplecov-cobertura)  [![Downloads](http://ruby-gem-downloads-badge.herokuapp.com/simplecov-cobertura?type=total)](https://rubygems.org/gems/simplecov-cobertura)
+# simplecov-cobertura
 
+[![Build](https://github.com/jessebs/simplecov-cobertura/actions/workflows/build.yml/badge.svg)](https://github.com/jessebs/simplecov-cobertura/actions/workflows/build.yml)   [![Gem Version](https://badge.fury.io/rb/simplecov-cobertura.svg)](http://badge.fury.io/rb/simplecov-cobertura)
 
-Produces [Cobertura](http://cobertura.sourceforge.net/) formatted XML from [SimpleCov](https://github.com/colszowka/simplecov).
+Produces [Cobertura](http://cobertura.sourceforge.net/) formatted XML
+from [SimpleCov](https://github.com/colszowka/simplecov).
 
-Output can be consumed by the [Jenkins Cobertura Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Cobertura+Plugin) for easy 
+Output can be consumed by the [Jenkins Cobertura Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Cobertura+Plugin)
+for easy
 coverage visualization.
 
 ## Installation
@@ -32,22 +34,22 @@ SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 ```
 
 ## Continuous Integration
+
 Tested in a CI environment against the following Ruby versions:
-* 3.0
-* 2.7
-* 2.6
-* 2.5
+
+* 3.2 - 4.0
 
 ## Contributing
 
-1. Fork it ( https://github.com/dashingrocket/simplecov-cobertura/fork )
+1. Fork it ( https://github.com/jessebs/simplecov-cobertura/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
 ## License
-Copyright 2021 Dashing Rocket, Ltd.
+
+Copyright 2014-2026 Jesse Bowes
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/simplecov-cobertura/version.rb

@@ -1,7 +1,7 @@
 module SimpleCov
   module Formatter
     class CoberturaFormatter
-      VERSION = '2.1.0'
+      VERSION = '4.0.0'
     end
   end
 end

data/lib/simplecov-cobertura.rb

@@ -1,8 +1,8 @@
-require 'simplecov'
-
+require 'stringio'
 require 'rexml/document'
 require 'rexml/element'
 require 'pathname'
+require 'simplecov'
 
 require_relative 'simplecov-cobertura/version'
 
@@ -27,149 +27,172 @@ module SimpleCov
 
         xml_str = string_io.string
         File.write(result_path, xml_str)
-        puts "Coverage report generated for #{result.command_name} to #{result_path}. #{coverage_output(result)}"
+        puts output_message(result, result_path)
+
         xml_str
       end
 
       private
 
-        def result_to_xml(result)
-          doc = REXML::Document.new set_xml_head
-          doc.context[:attribute_quote] = :quote
-          doc.add_element REXML::Element.new('coverage')
-          coverage = doc.root
+      def result_to_xml(result)
+        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
 
-          set_coverage_attributes(coverage, result)
+        set_coverage_attributes(coverage, result)
 
-          coverage.add_element(sources = REXML::Element.new('sources'))
-          sources.add_element(source = REXML::Element.new('source'))
-          source.text = SimpleCov.root
+        coverage.add_element(sources = REXML::Element.new('sources'))
+        sources.add_element(source = REXML::Element.new('source'))
+        source.text = SimpleCov.root
 
-          coverage.add_element(packages = REXML::Element.new('packages'))
+        coverage.add_element(packages = REXML::Element.new('packages'))
 
-          if result.groups.empty?
-            groups = {File.basename(SimpleCov.root) => result.files}
-          else
-            groups = result.groups
-          end
+        if result.groups.empty?
+          groups = { File.basename(SimpleCov.root) => result.files }
+        else
+          groups = result.groups
+        end
 
-          groups.each do |name, files|
-            next if files.empty?
-            packages.add_element(package = REXML::Element.new('package'))
-            set_package_attributes(package, name, files)
+        groups.each do |name, files|
+          next if files.empty?
+          packages.add_element(package = REXML::Element.new('package'))
+          set_package_attributes(package, name, files)
 
-            package.add_element(classes = REXML::Element.new('classes'))
+          package.add_element(classes = REXML::Element.new('classes'))
 
-            files.each do |file|
-              classes.add_element(class_ = REXML::Element.new('class'))
-              set_class_attributes(class_, file)
+          files.each do |file|
+            classes.add_element(class_ = REXML::Element.new('class'))
+            set_class_attributes(class_, file)
 
-              class_.add_element(REXML::Element.new('methods'))
-              class_.add_element(lines = REXML::Element.new('lines'))
+            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?
+              build_branches_by_line(file, branches_by_line)
+            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?
-                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, branches_by_line) if SimpleCov.branch_coverage?
               end
             end
           end
-
-          doc
         end
 
-        def set_coverage_attributes(coverage, result)
-          ls = result.coverage_statistics[:line]
-          bs = result.coverage_statistics[:branch]
-
-          coverage.attributes['line-rate'] = extract_rate(ls.percent)
-          coverage.attributes['lines-covered'] = ls.covered.to_s.to_s
-          coverage.attributes['lines-valid'] = ls.total.to_s.to_s
-          if SimpleCov.branch_coverage?
-            coverage.attributes['branches-covered'] = bs.covered.to_s
-            coverage.attributes['branches-valid'] = bs.total.to_s
-            coverage.attributes['branch-rate'] = extract_rate(bs.percent)
-          end
-          coverage.attributes['complexity'] = '0'
-          coverage.attributes['version'] = '0'
-          coverage.attributes['timestamp'] = Time.now.to_i.to_s
+        doc
+      end
+
+      def set_coverage_attributes(coverage, result)
+        ls = result.coverage_statistics[:line]
+        bs = result.coverage_statistics[:branch]
+
+        coverage.attributes['line-rate'] = extract_rate(ls.percent)
+        coverage.attributes['lines-covered'] = ls.covered.to_s.to_s
+        coverage.attributes['lines-valid'] = ls.total.to_s.to_s
+        if SimpleCov.branch_coverage?
+          coverage.attributes['branches-covered'] = bs.covered.to_s
+          coverage.attributes['branches-valid'] = bs.total.to_s
+          coverage.attributes['branch-rate'] = extract_rate(bs.percent)
         end
+        coverage.attributes['complexity'] = '0'
+        coverage.attributes['version'] = '0'
+        coverage.attributes['timestamp'] = Time.now.to_i.to_s
+      end
 
-        def set_package_attributes(package, name, result)
-          ls = result.coverage_statistics[:line]
-          bs = result.coverage_statistics[:branch]
+      def set_package_attributes(package, name, result)
+        ls = result.coverage_statistics[:line]
+        bs = result.coverage_statistics[:branch]
 
-          package.attributes['name'] = name
-          package.attributes['line-rate'] = extract_rate(ls.percent)
-          if SimpleCov.branch_coverage?
-            package.attributes['branch-rate'] = extract_rate(bs.percent)
-          end
-          package.attributes['complexity'] = '0'
+        package.attributes['name'] = name
+        package.attributes['line-rate'] = extract_rate(ls.percent)
+        if SimpleCov.branch_coverage?
+          package.attributes['branch-rate'] = extract_rate(bs.percent)
         end
+        package.attributes['complexity'] = '0'
+      end
 
-        def set_class_attributes(class_, file)
-          ls = file.coverage_statistics[:line]
-          bs = file.coverage_statistics[:branch]
+      def set_class_attributes(class_, file)
+        ls = file.coverage_statistics[:line]
+        bs = file.coverage_statistics[:branch]
 
-          filename = file.filename
-          class_.attributes['name'] = File.basename(filename, '.*')
-          class_.attributes['filename'] = resolve_filename(filename)
-          class_.attributes['line-rate'] = extract_rate(ls.percent)
-          if SimpleCov.branch_coverage?
-            class_.attributes['branch-rate'] = extract_rate(bs.percent)
-          end
-          class_.attributes['complexity'] = '0'
+        filename = file.filename
+        class_.attributes['name'] = resolve_filename(filename)
+        class_.attributes['filename'] = resolve_filename(filename)
+        class_.attributes['line-rate'] = extract_rate(ls.percent)
+        if SimpleCov.branch_coverage?
+          class_.attributes['branch-rate'] = extract_rate(bs.percent)
         end
+        class_.attributes['complexity'] = '0'
+      end
 
-        def set_line_attributes(line, file_line)
-          line.attributes['number'] = file_line.line_number.to_s
-          line.attributes['hits'] = file_line.coverage.to_s
+      def set_line_attributes(line, file_line)
+        line.attributes['number'] = file_line.line_number.to_s
+        line.attributes['hits'] = file_line.coverage.to_s
+      end
+
+      def set_branch_attributes(line, file_line, branches_by_line)
+        branch_info = branches_by_line[file_line.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}% (#{covered}/#{total})"
+        else
+          line.attributes['branch'] = 'false'
         end
+      end
+
+      def build_branches_by_line(file, branches_by_line)
+        file.coverage_data.fetch("branches", {}).each do |condition, branches|
+          line = condition_start_line(condition)
+          next unless line
 
-        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']
-            line.attributes['branch'] = 'true'
-            line.attributes['condition-coverage'] = "#{pct_coverage}% (#{branches_covered})"
-          else
-            line.attributes['branch'] = 'false'
+          info = branches_by_line[line] ||= { total: 0, covered: 0 }
+          branches.each_value do |hit_count|
+            info[:total] += 1
+            info[:covered] += 1 if hit_count.to_i > 0
           end
         end
+      rescue StandardError => e
+        warn "simplecov-cobertura: couldn't extract per-line branch detail " \
+               "(#{e.class}: #{e.message}); lines will report branch=\"false\""
+        branches_by_line.clear
+      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/dashingrocket/simplecov-cobertura) -->"
-          lines.join("\n")
-        end
+      def condition_start_line(condition)
+        return condition[2] if condition.is_a?(Array)
+        return nil unless condition.is_a?(String)
 
-        def coverage_output(result)
-          ls = result.coverage_statistics[:line]
-          bs = result.coverage_statistics[:branch]
+        condition.scan(/-?\d+/)[1]&.to_i # [id, start_line, ...]
+      end
 
-          if SimpleCov.branch_coverage?
-            "%d / %d LOC (%.2f%%) covered; %d / %d BC (%.2f%%) covered" % [ls.covered, ls.total, ls.percent, bs.covered, bs.total, bs.percent]
-          else
-            "%d / %d LOC (%.2f%%) covered" % [ls.covered, ls.total, ls.percent]
-          end
-        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}."
+        output += "\nLine Coverage: #{result.covered_percent.round(2)}% (#{result.covered_lines} / #{result.total_lines})"
+        output += "\nBranch Coverage: #{result.coverage_statistics[:branch].percent.round(2)}% (#{result.covered_branches} / #{result.total_branches})" if SimpleCov.branch_coverage?
+        output
+      end
 
-        def resolve_filename(filename)
-          Pathname.new(filename).relative_path_from(project_root).to_s
-        end
+      def resolve_filename(filename)
+        Pathname.new(filename).relative_path_from(project_root).to_s
+      end
 
-        def extract_rate(percent)
-          (percent / 100).round(2).to_s
-        end
+      def extract_rate(percent)
+        (percent / 100).round(4).to_s
+      end
 
-        def project_root
-          @project_root ||= Pathname.new(SimpleCov.root)
-        end
+      def project_root
+        @project_root ||= Pathname.new(SimpleCov.root)
+      end
     end
   end
 end

data/simplecov-cobertura.gemspec

@@ -5,25 +5,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'simplecov-cobertura/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'simplecov-cobertura'
-  spec.version       = SimpleCov::Formatter::CoberturaFormatter::VERSION
-  spec.authors       = ['Jesse Bowes']
-  spec.email         = ['jbowes@dashingrocket.com']
-  spec.summary       = 'SimpleCov Cobertura Formatter'
-  spec.description   = 'Produces Cobertura XML formatted output from SimpleCov'
-  spec.homepage      = 'https://github.com/dashingrocket/simplecov-cobertura'
-  spec.license       = 'Apache-2.0'
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.name = 'simplecov-cobertura'
+  spec.version = SimpleCov::Formatter::CoberturaFormatter::VERSION
+  spec.authors = ['Jesse Bowes']
+  spec.email = ['jessebowes@acm.org']
+  spec.summary = 'SimpleCov Cobertura Formatter'
+  spec.description = 'Produces Cobertura XML formatted output from SimpleCov'
+  spec.homepage = 'https://github.com/jessebs/simplecov-cobertura'
+  spec.license = 'Apache-2.0'
+  spec.required_ruby_version = '>= 3.2'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'test-unit', '~> 3.2'
   spec.add_development_dependency 'nokogiri', '~> 1.0'
   spec.add_development_dependency 'rake', '~> 13.0'
 
-  spec.add_dependency 'simplecov', '~> 0.19'
+  spec.add_dependency 'simplecov', '~> 1.0'
   spec.add_dependency 'rexml'
 end

data/test/fixtures/sample/lib/sample.rb

@@ -0,0 +1,28 @@
+class Sample
+  def greet(name)
+    if name.nil?
+      "Hello, stranger!"
+    else
+      "Hello, #{name}!"
+    end
+  end
+
+  def absolute(n)
+    if n < 0
+      -n
+    else
+      n
+    end
+  end
+
+  def unused_method
+    x = 1
+    y = 2
+    z = x + y
+    if z > 0
+      "positive"
+    else
+      "non-positive"
+    end
+  end
+end

data/test/fixtures/sample/test/simplecov_setup.rb

@@ -0,0 +1,17 @@
+$LOAD_PATH.unshift(File.join(ENV.fetch('GEM_ROOT'), 'lib'))
+
+require 'simplecov'
+require 'simplecov-cobertura'
+
+SimpleCov.command_name ENV.fetch('COMMAND_NAME', 'Unit Tests')
+SimpleCov.start do
+  enable_coverage :branch
+  use_merging true
+  merge_timeout 3600 # generous so slow CI can't expire run A's result
+  root ENV.fetch('PROJECT_ROOT')
+  coverage_dir 'coverage'
+  formatter SimpleCov::Formatter::CoberturaFormatter
+end
+
+require File.join(ENV.fetch('PROJECT_ROOT'), 'lib', 'sample')
+require 'test/unit'

data/test/fixtures/sample/test/test_merged_a.rb

@@ -0,0 +1,11 @@
+require_relative 'simplecov_setup'
+
+class MergedATest < Test::Unit::TestCase
+  def test_greet_with_name
+    assert_equal 'Hello, World!', Sample.new.greet('World') # greet: else branch
+  end
+
+  def test_absolute_positive
+    assert_equal 5, Sample.new.absolute(5) # absolute: else branch
+  end
+end

data/test/fixtures/sample/test/test_merged_b.rb

@@ -0,0 +1,7 @@
+require_relative 'simplecov_setup'
+
+class MergedBTest < Test::Unit::TestCase
+  def test_greet_without_name
+    assert_equal 'Hello, stranger!', Sample.new.greet(nil) # greet: then branch
+  end
+end

data/test/fixtures/sample/test/test_sample.rb

@@ -0,0 +1,12 @@
+require_relative 'simplecov_setup'
+
+class SampleTest < Test::Unit::TestCase
+  def test_greet_with_name
+    assert_equal "Hello, World!", Sample.new.greet("World")
+  end
+
+  def test_absolute_positive
+    # Only exercises the else branch (n >= 0), never the then branch (n < 0)
+    assert_equal 5, Sample.new.absolute(5)
+  end
+end

data/test/integration_test.rb

@@ -0,0 +1,175 @@
+require 'test/unit'
+require 'tmpdir'
+require 'open3'
+require 'nokogiri'
+require 'fileutils'
+
+class IntegrationTest < Test::Unit::TestCase
+  FIXTURES_DIR = File.join(__dir__, 'fixtures')
+  GEM_ROOT = File.expand_path('..', __dir__)
+
+  def setup
+    @tmpdir = Dir.mktmpdir('simplecov-cobertura-integration')
+  end
+
+  def teardown
+    FileUtils.remove_entry(@tmpdir) if @tmpdir && Dir.exist?(@tmpdir)
+  end
+
+  def test_clean_load_require_and_assign_formatter
+    # In a fresh subprocess, require simplecov-cobertura and assign the formatter.
+    # This catches missing requires (e.g. simplecov, stringio).
+    code = <<~RUBY
+      require 'simplecov-cobertura'
+      SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
+    RUBY
+    stdout, stderr, status = Open3.capture3('ruby', '-e', code)
+    assert status.success?, "Clean-load subprocess failed.\nstdout: #{stdout}\nstderr: #{stderr}"
+  end
+
+  def test_real_coverage_run_produces_valid_cobertura_xml
+    install_fixture('sample')
+
+    # Run the sample test in a subprocess.
+    stdout, stderr, status = run_fixture_test('test/test_sample.rb')
+    assert status.success?, "Sample test subprocess failed.\nstdout: #{stdout}\nstderr: #{stderr}"
+
+    # --- Assert on the generated coverage.xml ---
+    coverage_xml_path = File.join(@tmpdir, 'coverage', 'coverage.xml')
+    assert File.exist?(coverage_xml_path), "coverage.xml was not generated"
+    xml_content = File.read(coverage_xml_path)
+    assert !xml_content.empty?, "coverage.xml is empty"
+
+    doc = Nokogiri::XML(xml_content) { |config| config.strict }
+    assert doc.errors.empty?, "XML parse errors: #{doc.errors.join(', ')}"
+
+    # Root element
+    coverage = doc.at_xpath('/coverage')
+    assert_not_nil coverage, "Missing /coverage root element"
+
+    # Line coverage attributes — partial, not 100% and not 0%
+    line_rate = coverage['line-rate'].to_f
+    assert line_rate > 0.0, "line-rate should be > 0, got #{line_rate}"
+    assert line_rate < 1.0, "line-rate should be < 1.0 (partial coverage), got #{line_rate}"
+
+    lines_covered = coverage['lines-covered'].to_i
+    lines_valid = coverage['lines-valid'].to_i
+    assert lines_covered > 0, "lines-covered should be > 0"
+    assert lines_valid > lines_covered, "lines-valid (#{lines_valid}) should be > lines-covered (#{lines_covered})"
+
+    # Branch coverage attributes — partial
+    branch_rate = coverage['branch-rate'].to_f
+    assert branch_rate > 0.0, "branch-rate should be > 0, got #{branch_rate}"
+    assert branch_rate < 1.0, "branch-rate should be < 1.0 (partial coverage), got #{branch_rate}"
+
+    branches_covered = coverage['branches-covered'].to_i
+    branches_valid = coverage['branches-valid'].to_i
+    assert branches_covered > 0, "branches-covered should be > 0"
+    assert branches_valid > branches_covered, "branches-valid (#{branches_valid}) should be > branches-covered (#{branches_covered})"
+
+    # The sample library file appears as a class with the expected relative filename
+    classes = doc.xpath('//class')
+    filenames = classes.map { |c| c['filename'] }
+    assert filenames.any? { |f| f.include?('lib/sample.rb') },
+           "Expected a class with filename containing 'lib/sample.rb', got: #{filenames}"
+
+    # Line-level <line> elements exist with hits and branch attributes
+    lines = doc.xpath('//line')
+    assert lines.length > 0, "Expected <line> elements in the output"
+    lines.each do |line|
+      assert_not_nil line['number'], "Line element missing 'number' attribute"
+      assert_not_nil line['hits'], "Line element missing 'hits' attribute"
+      assert_not_nil line['branch'], "Line element missing 'branch' attribute"
+    end
+
+    # At least one line should have branch='true' (from the if/else)
+    branch_lines = lines.select { |l| l['branch'] == 'true' }
+    assert branch_lines.length > 0, "Expected at least one line with branch='true'"
+
+    # Validate condition-coverage on branch lines
+    branch_lines.each do |bl|
+      cc = bl['condition-coverage']
+      assert_not_nil cc, "Branch line missing 'condition-coverage' attribute"
+      assert_match(/\d+% \(\d+\/\d+\)/, cc, "condition-coverage format unexpected: #{cc}")
+    end
+  end
+
+  def test_condition_coverage_values_are_accurate
+    install_fixture('sample')
+
+    stdout, stderr, status = run_fixture_test('test/test_sample.rb')
+    assert status.success?, "Sample test subprocess failed.\nstdout: #{stdout}\nstderr: #{stderr}"
+
+    coverage_xml_path = File.join(@tmpdir, 'coverage', 'coverage.xml')
+    assert File.exist?(coverage_xml_path), "coverage.xml was not generated"
+    doc = Nokogiri::XML(File.read(coverage_xml_path)) { |config| config.strict }
+
+    # Find the branch line for the if statement in sample.rb's absolute method
+    sample_class = doc.xpath('//class').find { |c| c['filename'].include?('sample.rb') }
+    assert_not_nil sample_class, "Expected sample.rb class in output"
+
+    branch_lines = sample_class.xpath('.//line[@branch="true"]')
+    assert branch_lines.length > 0, "Expected branch lines in sample.rb"
+
+    # Each if/else has 2 total branches. greet and absolute each have 1/2 covered,
+    # unused_method has 0/2 covered. Verify exact values by line number.
+    condition_coverages = branch_lines.map { |bl| [bl['number'].to_i, bl['condition-coverage']] }.to_h
+
+    # greet: line 3 — only else branch taken => 50% (1/2)
+    assert_equal '50% (1/2)', condition_coverages[3], "greet condition-coverage mismatch"
+    # absolute: line 11 — only else branch taken => 50% (1/2)
+    assert_equal '50% (1/2)', condition_coverages[11], "absolute condition-coverage mismatch"
+    # unused_method: line 22 — neither branch taken => 0% (0/2)
+    assert_equal '0% (0/2)', condition_coverages[22], "unused_method condition-coverage mismatch"
+  end
+
+  def test_merged_results_exercise_string_condition_keys
+    install_fixture('sample')
+
+    stdout, stderr, status = run_fixture_test('test/test_merged_a.rb',
+                                              'COMMAND_NAME' => 'Run A')
+    assert status.success?, "Run A failed.\nstdout: #{stdout}\nstderr: #{stderr}"
+
+    # Tripwire: confirm the stored resultset actually contains stringified
+    # condition keys. If a future simplecov changes its serialization, this
+    # assertion fails and tells you this test no longer covers the string path.
+    resultset = File.read(File.join(@tmpdir, 'coverage', '.resultset.json'))
+    assert_match(/\[:if, \d+, \d+/, resultset,
+                 'Expected stringified branch condition keys in .resultset.json')
+
+    stdout, stderr, status = run_fixture_test('test/test_merged_b.rb',
+                                              'COMMAND_NAME' => 'Run B')
+    assert status.success?, "Run B failed.\nstdout: #{stdout}\nstderr: #{stderr}"
+
+    doc = Nokogiri::XML(File.read(File.join(@tmpdir, 'coverage', 'coverage.xml'))) { |c| c.strict }
+    sample_class = doc.xpath('//class').find { |c| c['filename'].include?('sample.rb') }
+    assert_not_nil sample_class
+
+    cc = sample_class.xpath('.//line[@branch="true"]')
+                     .map { |l| [l['number'].to_i, l['condition-coverage']] }
+                     .to_h
+
+    # greet (line 3): else in Run A + then in Run B => merged 2/2.
+    # Proves string keys were parsed AND hit counts summed across runs.
+    assert_equal '100% (2/2)', cc[3], 'greet should be fully covered after merge'
+    # absolute (line 11): only Run A touched it => still 1/2.
+    assert_equal '50% (1/2)', cc[11]
+    # unused_method (line 22): never called in either run => 0/2.
+    assert_equal '0% (0/2)', cc[22]
+  end
+
+  private
+
+  def install_fixture(name)
+    FileUtils.cp_r(File.join(FIXTURES_DIR, name, '.'), @tmpdir)
+  end
+
+  def run_fixture_test(test_path, extra_env = {})
+    Open3.capture3(
+      { 'GEM_ROOT' => GEM_ROOT, 'PROJECT_ROOT' => @tmpdir }.merge(extra_env),
+      'ruby', File.join(@tmpdir, test_path),
+      chdir: @tmpdir
+    )
+  end
+
+end

data/test/simplecov-cobertura_test.rb

@@ -1,4 +1,6 @@
 require 'test/unit'
+require 'fileutils'
+require 'tmpdir'
 require 'nokogiri'
 require 'open-uri'
 require 'simplecov'
@@ -6,26 +8,35 @@ require 'simplecov-cobertura'
 
 class CoberturaFormatterTest < Test::Unit::TestCase
   def setup
+    @tmpdir = Dir.mktmpdir('simplecov-cobertura-test')
     SimpleCov.enable_coverage :branch
-    SimpleCov.coverage_dir "tmp"
+    SimpleCov.coverage_dir @tmpdir
+    @no_filter = SimpleCov::Result::FilterConfig.new(filters: [], cover_filters: [], groups: {})
     @result = SimpleCov::Result.new({
-      "#{__FILE__}" => {
-        "lines" => [1, 1, 1, nil, 1, nil, 1, 0, nil, 1, nil, nil, nil],
-        "branches" => {
-          [:if, 0, 3, 4, 3, 21] =>
-          {[:then, 1, 3, 4, 3, 10] => 0, [:else, 2, 3, 4, 3, 21] => 1},
-            [: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}
-        }
-      }
-    })
+                                      "#{__FILE__}" => {
+                                        "lines" => [1, 1, 1, nil, 1, nil, 1, 0, nil, 1, nil, nil, nil],
+                                        "branches" => {
+                                          [:if, 0, 3, 4, 3, 21] =>
+                                            { [:then, 1, 3, 4, 3, 10] => 0, [:else, 2, 3, 4, 3, 21] => 1 },
+                                          [: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 },
+                                          [: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 }
+                                        }
+                                      }
+                                    }, filter_config: @no_filter)
     @formatter = SimpleCov::Formatter::CoberturaFormatter.new
   end
 
   def teardown
     SimpleCov.groups.clear
+    FileUtils.remove_entry(@tmpdir) if @tmpdir && Dir.exist?(@tmpdir)
   end
 
   def test_format_save_file
@@ -45,28 +56,32 @@ class CoberturaFormatterTest < Test::Unit::TestCase
   def test_terminal_output
     output, _ = capture_output { @formatter.format(@result) }
     result_path = File.join(SimpleCov.coverage_path, SimpleCov::Formatter::CoberturaFormatter::RESULT_FILE_NAME)
-    output_regex = /Coverage report generated for #{@result.command_name} to #{result_path}. (.*) covered./
+    output_regex = /Coverage report generated for #{@result.command_name} to #{result_path}.\nLine Coverage: (.*)\nBranch Coverage: (.*)/
     assert_match(output_regex, output)
   end
 
-  def test_format_dtd_validates
-    xml = @formatter.format(@result)
-    options = Nokogiri::XML::ParseOptions::DTDLOAD
-    doc = Nokogiri::XML::Document.parse(xml, nil, nil, options)
-    assert_empty doc.external_subset.validate(doc)
-  end
+  # Rather than support HTTPS the HTTP client was removed from libxml2 / xmllint:
+  # https://gitlab.gnome.org/GNOME/libxml2/-/issues/160
+  # I am not sure what this means for Nokogiri or this issue, but it certainly means something will change soon.
+  # Disable this test until it becomes clear what the new behavior should be.
+  # def test_format_dtd_validates
+  #   xml = @formatter.format(@result)
+  #   options = Nokogiri::XML::ParseOptions::DTDLOAD
+  #   doc = Nokogiri::XML::Document.parse(xml, nil, nil, options)
+  #   assert_empty doc.external_subset.validate(doc)
+  # end
 
   def test_no_groups
     xml = @formatter.format(@result)
     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
@@ -79,17 +94,17 @@ 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'
     assert_equal 1, classes.length
     clazz = classes.first
-    assert_equal 'simplecov-cobertura_test', clazz.attribute('name').value
+    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'
@@ -100,23 +115,38 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     assert_equal '1', first_line.attribute('hits').value
     last_line = lines.last
     assert_equal '10', last_line.attribute('number').value
-    assert_equal 'true', last_line.attribute('branch').value
+    assert_equal 'false', last_line.attribute('branch').value
     assert_equal '1', last_line.attribute('hits').value
+
+    # Verify condition-coverage accurately reflects branch counts per condition 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: condition [:if, 0, 3, ...] with 2 branches (then=>0, else=>1) => 50% (1/2)
+    assert_include condition_coverages, ['3', '50% (1/2)']
+    # Line 5: condition [:if, 3, 5, ...] with 2 branches (then=>1, else=>0) => 50% (1/2)
+    assert_include condition_coverages, ['5', '50% (1/2)']
+    # Line 7: condition [:if, 6, 7, ...] with 2 branches (then=>0, else=>1) => 50% (1/2)
+    assert_include condition_coverages, ['7', '50% (1/2)']
+    # Lines 12, 13, 15 have nil line coverage so they don't get <line> elements,
+    # but their conditions are still correctly grouped by condition start line.
+    assert_equal 3, branched_lines.length
   end
 
   def test_groups
-    SimpleCov.add_group('test_group', 'test/')
+    SimpleCov.group('test_group', 'test/')
+    group_filter = SimpleCov::Result::FilterConfig.new(filters: [], cover_filters: [], groups: SimpleCov.groups)
+    result = SimpleCov::Result.new(@result.original_result, filter_config: group_filter)
 
-    xml = @formatter.format(@result)
+    xml = @formatter.format(result)
     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
@@ -129,17 +159,17 @@ 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'
     assert_equal 1, classes.length
     clazz = classes.first
-    assert_equal 'simplecov-cobertura_test', clazz.attribute('name').value
+    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'
@@ -150,24 +180,34 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     assert_equal '1', first_line.attribute('hits').value
     last_line = lines.last
     assert_equal '10', last_line.attribute('number').value
-    assert_equal 'true', last_line.attribute('branch').value
+    assert_equal 'false', last_line.attribute('branch').value
     assert_equal '1', last_line.attribute('hits').value
   end
 
   def test_supports_root_project_path
     old_root = SimpleCov.root
-    SimpleCov.root("/tmp")
-    expected_base = old_root[1..-1] # Remove leading "/"
-
-    xml = @formatter.format(@result)
+    @alt_root = Dir.mktmpdir('simplecov-cobertura-root')
+    SimpleCov.root(@alt_root)
+    expected_prefix = Pathname.new(old_root).relative_path_from(Pathname.new(@alt_root)).to_s
+    result = SimpleCov::Result.new(@result.original_result, filter_config: @no_filter)
+    xml = @formatter.format(result)
     doc = Nokogiri::XML::Document.parse(xml)
 
     classes = doc.xpath '/coverage/packages/package/classes/class'
     assert_equal 1, classes.length
     clazz = classes.first
-    assert_equal 'simplecov-cobertura_test', clazz.attribute('name').value
-    assert_equal "../#{expected_base}/test/simplecov-cobertura_test.rb", clazz.attribute('filename').value
+    assert_equal "#{expected_prefix}/test/simplecov-cobertura_test.rb", clazz.attribute('name').value
+    assert_equal "#{expected_prefix}/test/simplecov-cobertura_test.rb", clazz.attribute('filename').value
   ensure
     SimpleCov.root(old_root)
+    FileUtils.remove_entry(@alt_root) if @alt_root && Dir.exist?(@alt_root)
+  end
+
+  def test_condition_start_line_handles_both_key_forms
+    formatter = SimpleCov::Formatter::CoberturaFormatter.new
+    assert_equal 3, formatter.send(:condition_start_line, [:if, 0, 3, 4, 5, 10])
+    assert_equal 3, formatter.send(:condition_start_line, '[:if, 0, 3, 4, 5, 10]')
+    assert_equal 7, formatter.send(:condition_start_line, '[:case, 12, 7, 0, 9, 3]')
+    assert_nil formatter.send(:condition_start_line, 42)
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-cobertura
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Jesse Bowes
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -58,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +81,7 @@ dependencies:
         version: '0'
 description: Produces Cobertura XML formatted output from SimpleCov
 email:
-- jbowes@dashingrocket.com
+- jessebowes@acm.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,13 +95,17 @@ files:
 - lib/simplecov-cobertura.rb
 - lib/simplecov-cobertura/version.rb
 - simplecov-cobertura.gemspec
-- test/coverage/coverage.xml
+- test/fixtures/sample/lib/sample.rb
+- test/fixtures/sample/test/simplecov_setup.rb
+- test/fixtures/sample/test/test_merged_a.rb
+- test/fixtures/sample/test/test_merged_b.rb
+- test/fixtures/sample/test/test_sample.rb
+- test/integration_test.rb
 - test/simplecov-cobertura_test.rb
-homepage: https://github.com/dashingrocket/simplecov-cobertura
+homepage: https://github.com/jessebs/simplecov-cobertura
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,17 +113,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: SimpleCov Cobertura Formatter
 test_files:
-- test/coverage/coverage.xml
+- test/fixtures/sample/lib/sample.rb
+- test/fixtures/sample/test/simplecov_setup.rb
+- test/fixtures/sample/test/test_merged_a.rb
+- test/fixtures/sample/test/test_merged_b.rb
+- test/fixtures/sample/test/test_sample.rb
+- test/integration_test.rb
 - test/simplecov-cobertura_test.rb

data/test/coverage/coverage.xml

@@ -1,21 +0,0 @@
-<?xml version='1.0'?> 
-<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<!-- Generated by simplecov-cobertura version 1.4.3-dev (https://github.com/dashingrocket/simplecov-cobertura) -->
-<coverage line-rate="1.0" branch-rate="0" lines-covered="2" lines-valid="2" branches-covered="0" branches-valid="0" complexity="0" version="0" timestamp="1636204971">
-  <sources>
-    <source>/Users/st0012/projects/simplecov-cobertura/test</source>
-  </sources>
-  <packages>
-    <package name="test" line-rate="1.0" branch-rate="0" complexity="0">
-      <classes>
-        <class name="simplecov-cobertura_test" filename="simplecov-cobertura_test.rb" line-rate="1.0" branch-rate="0" complexity="0">
-          <methods/>
-          <lines>
-            <line number="1" branch="false" hits="1"/>
-            <line number="2" branch="false" hits="2"/>
-          </lines>
-        </class>
-      </classes>
-    </package>
-  </packages>
-</coverage>