The XML report was missing an attribute Cobertura needed. Fixes #65 and #81.

2 files changed, 29 insertions, 10 deletions

diff --git a/coverage/results.py b/coverage/results.py
index e6e39429..85071fe3 100644
--- a/coverage/results.py
+++ b/coverage/results.py
@@ -94,7 +94,7 @@ class Analysis(object):
         return sorted(unpredicted)
 
     def branch_lines(self):
-        """Returns lines that have more than one exit."""
+        """Returns a list of line numbers that have more than one exit."""
         exit_counts = self.parser.exit_counts()
         return [l1 for l1,count in exit_counts.items() if count > 1]
 
@@ -119,6 +119,25 @@ class Analysis(object):
                 mba[l1].append(l2)
         return mba
 
+    def branch_stats(self):
+        """Get stats about branches.
+
+        Returns a dict mapping line numbers to a tuple:
+        (total_exits, taken_exits).
+        """
+
+        exit_counts = self.parser.exit_counts()
+        missing_arcs = self.missing_branch_arcs()
+        stats = {}
+        for lnum in self.branch_lines():
+            exits = exit_counts[lnum]
+            try:
+                missing = len(missing_arcs[lnum])
+            except KeyError:
+                missing = 0
+            stats[lnum] = (exits, exits - missing)
+        return stats
+
 
 class Numbers(object):
     """The numerical results of measuring coverage.
diff --git a/coverage/xmlreport.py b/coverage/xmlreport.py
index 7a6e5147..51405be6 100644
--- a/coverage/xmlreport.py
+++ b/coverage/xmlreport.py
@@ -9,7 +9,7 @@ from coverage.report import Reporter
 
 def rate(hit, num):
     """Return the fraction of `hit`/`num`."""
-    return hit / (num or 1.0)
+    return float(hit) / (num or 1.0)
 
 
 class XmlReporter(Reporter):
@@ -105,7 +105,7 @@ class XmlReporter(Reporter):
         xclass.setAttribute("filename", cu.name + ext)
         xclass.setAttribute("complexity", "0.0")
 
-        branch_lines = analysis.branch_lines()
+        branch_stats = analysis.branch_stats()
 
         # For each statement, create an XML 'line' element.
         for line in analysis.statements:
@@ -117,20 +117,20 @@ class XmlReporter(Reporter):
             xline.setAttribute("hits", str(int(not line in analysis.missing)))
 
             if self.arcs:
-                if line in branch_lines:
+                if line in branch_stats:
+                    total, taken = branch_stats[line]
                     xline.setAttribute("branch", "true")
+                    xline.setAttribute("condition-coverage",
+                        "%d%% (%d/%d)" % (100*taken/total, taken, total)
+                        )
             xlines.appendChild(xline)
 
         class_lines = 1.0 * len(analysis.statements)
         class_hits = class_lines - len(analysis.missing)
 
         if self.arcs:
-            # We assume here that every branch line has 2 exits, which is
-            # usually true.  In theory, though, we could have a branch line
-            # with more exits..
-            class_branches = 2.0 * len(branch_lines)
-            missed_branch_targets = analysis.missing_branch_arcs().values()
-            missing_branches = sum([len(b) for b in missed_branch_targets])
+            class_branches = sum([t for t,k in branch_stats.values()])
+            missing_branches = sum([t-k for t,k in branch_stats.values()])
             class_branch_hits = class_branches - missing_branches
         else:
             class_branches = 0.0