8000 Fix package level function coverage in cobertura. by Spacetown · Pull Request #605 · gcovr/gcovr · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix package level function coverage in cobertura. #605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 8, 2022
Merged

Fix package level function coverage in cobertura. #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88828ff
Fix package level function coverage.
Spacetown Apr 7, 2022
01c105c
Update test data.
Spacetown Apr 7, 2022
d5633a3
Update CHANGELOG.rst
Spacetown Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ Next Release

Known bugs:

- Cobertura XML output: package-level function coverage statistics are incorrect.
(:issue:`600`)
- Aggregated branch coverage does not properly respect excluded/noncode lines.
(:issue:`600`)
- Decision coverage analysis can resurrect excluded coverage. (:issue:`600`)
Expand All @@ -29,6 +27,7 @@ Bug fixes and small improvements:
- Properly close <a> element in detailed HTML report. (:issue:`602`)
- Use `≥` sign instead of `>=` in HTML legend. (:issue:`603`)
- Using :option:`--add-tracefile` will now correctly merge branch coverage. (:issue:`600`)
- Fix package-level function coverage statistics in Cobertura XML reports. (:issue:`605`)

Documentation:

Expand Down
2 changes: 1 addition & 1 deletion gcovr/tests/dot/reference/clang-10/coverage.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
<coverage line-rate="0.7619047619047619" function-rate="0.7777777777777778" branch-rate="0.5" lines-covered="32" lines-valid="42" functions-covered="7" functions-valid="9" branches-covered="4" branches-valid="8" complexity="0.0" timestamp="1630936712" version="gcovr 5.0"><sources><source>.</source></sources><packages><package name=".subdir.A" line-rate="0.6666666666666666" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="file1_cpp" filename=".subdir/A/file1.cpp" line-rate="0.8" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/><line number="8" hits="1" branch="false"/></lines></class><class name="file2_cpp" filename=".subdir/A/file2.cpp" line-rate="0.5714285714285714" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/><line number="8" hits="0" branch="false"/><line number="10" hits="0" branch="false"/><line number="11" hits="0" branch="false"/></lines></class><class name="file3_cpp" filename=".subdir/A/file3.cpp" line-rate="0.5714285714285714" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/><line number="8" hits="0" branch="false"/><line number="10" hits="0" branch="false"/><line number="11" hits="0" branch="false"/></lines></class><class name="file4_cpp" filename=".subdir/A/file4.cpp" line-rate="0.8" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="1" branch="false"/><line number="6" hits="0" branch="false"/><line number="8" hits="1" branch="false"/></lines></class></classes></package><package name=".subdir.A.C" line-rate="0.8" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="file5_cpp" filename=".subdir/A/C/file5.cpp" line-rate="0.8" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/><line number="8" hits="1" branch="false"/></lines></class></classes></package><package name=".subdir.A.C.D" line-rate="0.8" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="file6_cpp" filename=".subdir/A/C/D/file6.cpp" line-rate="0.8" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/><line number="8" hits="1" branch="false"/></lines></class></classes></package><package name=".subdir.B" line-rate="1.0" function-rate="1.0" branch-rate="0.0" complexity="0.0"><classes><class name="main_cpp" filename=".subdir/B/main.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="11" hits="1" branch="false"/><line number="12" hits="1" branch="false"/><line number="13" hits="1" branch="false"/><line number="14" hits="1" branch="false"/><line number="15" hits="1" branch="false"/><line number="16" hits="1" branch="false"/><line number="17" hits="1" branch="false"/><line number="19" hits="1" branch="false"/></lines></class></classes></package></packages></coverage>
<coverage line-rate="0.7619047619047619" function-rate="0.7777777777777778" branch-rate="0.5" lines-covered="32" lines-valid="42" functions-covered="7" functions-valid="9" branches-covered="4" branches-valid="8" complexity="0.0" timestamp="1649359829" version="gcovr 5.1"><sources><source>.</source></sources><packages><package name=".subdir.A" line-rate="0.6666666666666666" function-rate="0.6666666666666666" branch-rate="0.5" complexity="0.0"><classes><class name="file1_cpp" filename=".subdir/A/file1.cpp" line-rate="0.8" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/><line number="8" hits="1" branch="false"/></lines></class><class name="file2_cpp" filename=".subdir/A/file2.cpp" line-rate="0.5714285714285714" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/><line number="8" hits="0" branch="false"/><line number="10" hits="0" branch="false"/><line number="11" hits="0" branch="false"/></lines></class><class name="file3_cpp" filename=".subdir/A/file3.cpp" line-rate="0.5714285714285714" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/><line number="8" hits="0" branch="false"/><line number="10" hits="0" branch="false"/><line number="11" hits="0" branch="false"/></lines></class><class name="file4_cpp" filename=".subdir/A/file4.cpp" line-rate="0.8" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="1" branch="false"/><line number="6" hits="0" branch="false"/><line number="8" hits="1" branch="false"/></lines></class></classes></package><package name=".subdir.A.C" line-rate="0.8" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="file5_cpp" filename=".subdir/A/C/file5.cpp" line-rate="0.8" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/><line number="8" hits="1" branch="false"/></lines></class></classes></package><package name=".subdir.A.C.D" line-rate="0.8" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="file6_cpp" filename=".subdir/A/C/D/file6.cpp" line-rate="0.8" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/><line number="8" hits="1" branch="false"/></lines></class></classes></package><package name=".subdir.B" line-rate="1.0" function-rate="1.0" branch-rate="0.0" complexity="0.0"><classes><class name="main_cpp" filename=".subdir/B/main.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="11" hits="1" branch="false"/><line number="12" hits="1" branch="false"/><line number="13" hits="1" branch="false"/><line number="14" hits="1" branch="false"/><line number="15" hits="1" branch="false"/><line number="16" hits="1" branch="false"/><line number="17" hits="1" branch="false"/><line number="19" hits="1" branch="false"/></lines></class></classes></package></packages></coverage>
2 changes: 1 addition & 1 deletion gcovr/tests/dot/reference/gcc-5/coverage.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
<coverage line-rate="0.7435897435897436" function-rate="0.7777777777777778" branch-rate="0.5" lines-covered="29" lines-valid="39" functions-covered="7" functions-valid="9" branches-covered="6" branches-valid="12" complexity="0.0" timestamp="1645647249" version="gcovr 5.0"><sources><source>.</source></sources><packages><package name=".subdir.A" line-rate="0.6363636363636364" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="file1_cpp" filename=".subdir/A/file1.cpp" line-rate="0.75" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/></lines></class><class name="file2_cpp" filename=".subdir/A/file2.cpp" line-rate="0.5714285714285714" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/><line number="8" hits="0" branch="false"/><line number="10" hits="0" branch="false"/><line number="11" hits="0" branch="false"/></lines></class><class name="file3_cpp" filename=".subdir/A/file3.cpp" line-rate="0.5714285714285714" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/><line number="8" hits="0" branch="false"/><line number="10" hits="0" branch="false"/><line number="11" hits="0" branch="false"/></lines></class><class name="file4_cpp" filename=".subdir/A/file4.cpp" line-rate="0.75" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="1" branch="false"/><line number="6" hits="0" branch="false"/></lines></class></classes></package><package name=".subdir.A.C" line-rate="0.75" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="file5_cpp" filename=".subdir/A/C/file5.cpp" line-rate="0.75" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/></lines></class></classes></package><package name=".subdir.A.C.D" line-rate="0.75" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="file6_cpp" filename=".subdir/A/C/D/file6.cpp" line-rate="0.75" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/></lines></class></classes></package><package name=".subdir.B" line-rate="1.0" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="main_cpp" filename=".subdir/B/main.cpp" line-rate="1.0" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="11" hits="1" branch="false"/><line number="12" hits="1" branch="false"/><line number="13" hits="1" branch="false"/><line number="14" hits="1" branch="false"/><line number="15" hits="1" branch="false"/><line number="16" hits="1" branch="false"/><line number="17" hits="1" branch="false"/><line number="19" hits="1" branch="false"/><line number="20" hits="3" branch="true" condition-coverage="50% (2/4)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line></lines></class></classes></package></packages></coverage>
<coverage line-rate="0.7435897435897436" function-rate="0.7777777777777778" branch-rate="0.5" lines-covered="29" lines-valid="39" functions-covered="7" functions-valid="9" branches-covered="6" branches-valid="12" complexity="0.0" timestamp="1649357737" version="gcovr 5.1"><sources><source>.</source></sources><packages><package name=".subdir.A" line-rate="0.6363636363636364" function-rate="0.6666666666666666" branch-rate="0.5" complexity="0.0"><classes><class name="file1_cpp" filename=".subdir/A/file1.cpp" line-rate="0.75" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/></lines></class><class name="file2_cpp" filename=".subdir/A/file2.cpp" line-rate="0.5714285714285714" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/><line number="8" hits="0" branch="false"/><line number="10" hits="0" branch="false"/><line number="11" hits="0" branch="false"/></lines></class><class name="file3_cpp" filename=".subdir/A/file3.cpp" line-rate="0.5714285714285714" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/><line number="8" hits="0" branch="false"/><line number="10" hits="0" branch="false"/><line number="11" hits="0" branch="false"/></lines></class><class name="file4_cpp" filename=".subdir/A/file4.cpp" line-rate="0.75" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="1" branch="false"/><line number="6" hits="0" branch="false"/></lines></class></classes></package><package name=".subdir.A.C" line-rate="0.75" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="file5_cpp" filename=".subdir/A/C/file5.cpp" line-rate="0.75" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/></lines></class></classes></package><package name=".subdir.A.C.D" line-rate="0.75" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="file6_cpp" filename=".subdir/A/C/D/file6.cpp" line-rate="0.75" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="4" hits="0" branch="false"/><line number="6" hits="1" branch="false"/></lines></class></classes></package><package name=".subdir.B" line-rate="1.0" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="main_cpp" filename=".subdir/B/main.cpp" line-rate="1.0" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="11" hits="1" branch="false"/><line number="12" hits="1" branch="false"/><line number="13" hits="1" branch="false"/><line number="14" hits="1" branch="false"/><line number="15" hits="1" branch="false"/><line number="16" hits="1" branch="false"/><line number="17" hits="1" branch="false"/><line number="19" hits="1" branch="false"/><line number="20" hits="3" branch="true" condition-coverage="50% (2/4)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line></lines></class></classes></package></packages></coverage>
Loading
0