Skip to content

Commit e8fdcee

Browse files
libPhipplatk
libPhipp
authored and
latk
committed
Resolves 164. Adding Cobertura's coverage-04.dtd attributes to the coverage-element and adjusting test references.
1 parent 055d2ce commit e8fdcee

File tree

17 files changed

+71
-59
lines changed

17 files changed

+71
-59
lines changed

‎gcovr/tests/bad++char/reference/coverage.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.5" line-rate="0.875">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.5" branches-covered="3" branches-valid="6" complexity="0.0" line-rate="0.875" lines-covered="7" lines-valid="8" timestamp="" version="">
55
<sources>
6-
<source>
7-
.
8-
</source>
6+
<source>.</source>
97
</sources>
108
<packages>
119
<package branch-rate="0.5" complexity="0.0" line-rate="0.875" name="">
1210
<classes>
1311
<class branch-rate="0.5" complexity="0.0" filename="main.cpp" line-rate="0.875" name="main_cpp">
12+
<methods/>
1413
<lines>
1514
<line branch="false" hits="1" number="4"/>
1615
<line branch="true" condition-coverage="50% (1/2)" hits="1" number="5">

‎gcovr/tests/cmake_oos/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.5" line-rate="0.875" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.5" branches-covered="3" branches-valid="6" complexity="0.0" line-rate="0.875" lines-covered="7" lines-valid="8" timestamp="" version="">
55
<sources>
66
<source>.</source>
77
</sources>

‎gcovr/tests/dot/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.5" line-rate="0.74358974359" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.5" branches-covered="6" branches-valid="12" complexity="0.0" line-rate="0.74358974359" lines-covered="29" lines-valid="39" timestamp="" version="">
55
<sources>
66
<source>.</source>
77
</sources>

‎gcovr/tests/excl-branch/reference/coverage.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.8" line-rate="0.8888888888888888" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.8" branches-covered="8" branches-valid="10" complexity="0.0" line-rate="0.888888888889" lines-covered="16" lines-valid="18" timestamp="" version="">
55
<sources>
66
<source>.</source>
77
</sources>
88
<packages>
9-
<package branch-rate="0.8" complexity="0.0" line-rate="0.8888888888888888" name="">
9+
<package branch-rate="0.8" complexity="0.0" line-rate="0.888888888889" name="">
1010
<classes>
11-
<class branch-rate="0.8" complexity="0.0" filename="main.cpp" line-rate="0.8888888888888888" name="main_cpp">
11+
<class branch-rate="0.8" complexity="0.0" filename="main.cpp" line-rate="0.888888888889" name="main_cpp">
1212
<methods/>
1313
<lines>
1414
<line branch="false" hits="1" number="7"/>

‎gcovr/tests/excl-line/reference/coverage.xml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.5" line-rate="0.857143">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.5" branches-covered="3" branches-valid="6" complexity="0.0" line-rate="0.857142857143" lines-covered="6" lines-valid="7" timestamp="" version="">
55
<sources>
6-
<source>
7-
.
8-
</source>
6+
<source>.</source>
97
</sources>
108
<packages>
11-
<package branch-rate="0.5" complexity="0.0" line-rate="0.857143" name="">
9+
<package branch-rate="0.5" complexity="0.0" line-rate="0.857142857143" name="">
1210
<classes>
13-
<class branch-rate="0.5" complexity="0.0" filename="main.cpp" line-rate="0.857143" name="main_cpp">
11+
<class branch-rate="0.5" complexity="0.0" filename="main.cpp" line-rate="0.857142857143" name="main_cpp">
1412
<methods/>
1513
<lines>
1614
<line branch="false" hits="1" number="4"/>

‎gcovr/tests/filter-test/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.5" line-rate="0.875" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.5" branches-covered="3" branches-valid="6" complexity="0.0" line-rate="0.875" lines-covered="7" lines-valid="8" timestamp="" version="">
55
<sources>
66
<source>.</source>
77
</sources>

‎gcovr/tests/filter-test2/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.5" line-rate="0.875" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.5" branches-covered="3" branches-valid="6" complexity="0.0" line-rate="0.875" lines-covered="7" lines-valid="8" timestamp="" version="">
55
<sources>
66
<source>.</source>
77
</sources>

‎gcovr/tests/linked/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.428571428571" line-rate="0.674418604651" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.428571428571" branches-covered="6" branches-valid="14" complexity="0.0" line-rate="0.674418604651" lines-covered="29" lines-valid="43" timestamp="" version="">
55
<sources>
66
<source>.</source>
77
</sources>

‎gcovr/tests/nested/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.428571428571" line-rate="0.674418604651" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.428571428571" branches-covered="6" branches-valid="14" complexity="0.0" line-rate="0.674418604651" lines-covered="29" lines-valid="43" timestamp="" version="">
55
<sources>
66
<source>subdir</source>
77
</sources>

‎gcovr/tests/nested2/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.428571428571" line-rate="0.674418604651" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.428571428571" branches-covered="6" branches-valid="14" complexity="0.0" line-rate="0.674418604651" lines-covered="29" lines-valid="43" timestamp="" version="">
55
<sources>
66
<source>subdir</source>
77
</sources>

‎gcovr/tests/nested3/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.428571428571" line-rate="0.674418604651" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.428571428571" branches-covered="6" branches-valid="14" complexity="0.0" line-rate="0.674418604651" lines-covered="29" lines-valid="43" timestamp="" version="">
55
<sources>
66
<source>subdir</source>
77
</sources>

‎gcovr/tests/oos/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.5" line-rate="0.9" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.5" branches-covered="3" branches-valid="6" complexity="0.0" line-rate="0.9" lines-covered="9" lines-valid="10" timestamp="" version="">
55
<sources>
66
<source>.</source>
77
</sources>

‎gcovr/tests/oos2/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.5" line-rate="0.9" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.5" branches-covered="3" branches-valid="6" complexity="0.0" line-rate="0.9" lines-covered="9" lines-valid="10" timestamp="" version="">
55
<sources>
66
<source>.</source>
77
</sources>

‎gcovr/tests/shared_lib/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.5" line-rate="0.8" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.5" branches-covered="4" branches-valid="8" complexity="0.0" line-rate="0.8" lines-covered="8" lines-valid="10" timestamp="" version="">
55
<sources>
66
<source>.</source>
77
</sources>

‎gcovr/tests/simple1/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.5" line-rate="0.8" timestamp="1471799597" version="gcovr 3.3">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.5" branches-covered="4" branches-valid="8" complexity="0.0" line-rate="0.8" lines-covered="8" lines-valid="10" timestamp="" version="">
55
<sources>
66
<source>.</source>
77
</sources>

‎gcovr/tests/wspace/reference/coverage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="" ?>
1+
<?xml version="1.0" ?>
22
<!DOCTYPE coverage
3-
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'>
4-
<coverage branch-rate="0.5" line-rate="0.8" timestamp="" version="">
3+
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
4+
<coverage branch-rate="0.5" branches-covered="4" branches-valid="8" complexity="0.0" line-rate="0.8" lines-covered="8" lines-valid="10" timestamp="" version="">
55
<sources>
66
<source>src code</source>
77
</sources>

‎scripts/gcovr

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1847,7 +1847,7 @@ def print_xml_report(covdata):
18471847
impl = xml.dom.minidom.getDOMImplementation()
18481848
docType = impl.createDocumentType(
18491849
"coverage", None,
1850-
"http://cobertura.sourceforge.net/xml/coverage-03.dtd"
1850+
"http://cobertura.sourceforge.net/xml/coverage-04.dtd"
18511851
)
18521852
doc = impl.createDocument(None, "coverage", docType)
18531853
root = doc.documentElement
@@ -1859,6 +1859,21 @@ def print_xml_report(covdata):
18591859
"branch-rate", branchTotal == 0 and '0.0' or
18601860
str(float(branchCovered) / branchTotal)
18611861
)
1862+
root.setAttribute(
1863+
"lines-covered", str(lineCovered)
1864+
)
1865+
root.setAttribute(
1866+
"lines-valid", str(lineTotal)
1867+
)
1868+
root.setAttribute(
1869+
"branches-covered", str(branchCovered)
1870+
)
1871+
root.setAttribute(
1872+
"branches-valid", str(branchTotal)
1873+
)
1874+
root.setAttribute(
1875+
"complexity", "0.0"
1876+
)
18621877
root.setAttribute(
18631878
"timestamp", str(int(time.time()))
18641879
)

0 commit comments

Comments
 (0)