summaryrefslogtreecommitdiff
path: root/coverage/xmlreport.py
diff options
context:
space:
mode:
Diffstat (limited to 'coverage/xmlreport.py')
-rw-r--r--coverage/xmlreport.py20
1 files changed, 11 insertions, 9 deletions
diff --git a/coverage/xmlreport.py b/coverage/xmlreport.py
index 694415fd..b5a33ddc 100644
--- a/coverage/xmlreport.py
+++ b/coverage/xmlreport.py
@@ -18,11 +18,7 @@ from coverage.report import Reporter
os = isolate_module(os)
-DTD_URL = (
- 'https://raw.githubusercontent.com/cobertura/web/'
- 'f0366e5e2cf18f111cbd61fc34ef720a6584ba02'
- '/htdocs/xml/coverage-03.dtd'
-)
+DTD_URL = 'https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd'
def rate(hit, num):
@@ -114,12 +110,18 @@ class XmlReporter(Reporter):
bnum_tot += bnum
bhits_tot += bhits
+ xcoverage.setAttribute("lines-valid", str(lnum_tot))
+ xcoverage.setAttribute("lines-covered", str(lhits_tot))
xcoverage.setAttribute("line-rate", rate(lhits_tot, lnum_tot))
if self.has_arcs:
- branch_rate = rate(bhits_tot, bnum_tot)
+ xcoverage.setAttribute("branches-valid", str(bnum_tot))
+ xcoverage.setAttribute("branches-covered", str(bhits_tot))
+ xcoverage.setAttribute("branch-rate", rate(bhits_tot, bnum_tot))
else:
- branch_rate = "0"
- xcoverage.setAttribute("branch-rate", branch_rate)
+ xcoverage.setAttribute("branches-covered", "0")
+ xcoverage.setAttribute("branches-valid", "0")
+ xcoverage.setAttribute("branch-rate", "0")
+ xcoverage.setAttribute("complexity", "0")
# Use the DOM to write the output file.
out = self.xml_out.toprettyxml()
@@ -148,7 +150,7 @@ class XmlReporter(Reporter):
else:
rel_name = fr.relative_filename()
- dirname = os.path.dirname(rel_name) or "."
+ dirname = os.path.dirname(rel_name) or u"."
dirname = "/".join(dirname.split("/")[:self.config.xml_package_depth])
package_name = dirname.replace("/", ".")