Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Added object type to name in coverage reports.
Fixed issue with reporting non-block coverage as block coverage.
Resolves #1086
  • Loading branch information
jgebal committed Jul 20, 2020
commit e96b9780257ee0bcf73404db1440a2248d9169e4
2 changes: 1 addition & 1 deletion source/core/coverage/ut_coverage.pkb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ create or replace package body ut_coverage is
and s.type = f.object_type
and s.owner = f.object_owner';
else
l_full_name := q'[lower(s.owner||'.'||s.name)]';
l_full_name := q'[lower(s.type||' '||s.owner||'.'||s.name)]';
l_filters := case
when a_coverage_options.include_objects is not empty then '
and (s.owner, s.name) in (
Expand Down
1 change: 1 addition & 0 deletions source/core/coverage/ut_coverage_helper_block.pkb
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ create or replace package body ut_coverage_helper_block is
group by ccb.line, ccb.block
)
group by line
having count(block) > 1
order by line]'
bulk collect into l_coverage_rows
using
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ create or replace package body test_coverage_standalone is
l_block_cov clob;
l_file_path varchar2(250);
begin
l_file_path := 'ut3_develop.'||a_object_name;
l_file_path := 'package body ut3_develop.'||a_object_name;
--Arrange
if ut3_tester_helper.coverage_helper.block_coverage_available then
l_block_cov := '<line number="4" hits="5" branch="true" condition-coverage="67% (2/3)"/>';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ null,
begin
--Arrange
l_expected := q'[{"source_files":[
{ "name": "ut3_develop.]'||ut3_tester_helper.coverage_helper.covered_package_name||q'[",
{ "name": "package body ut3_develop.]'||ut3_tester_helper.coverage_helper.covered_package_name||q'[",
"coverage": [
0,
0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ create or replace package body test_extended_coverage is
l_actual clob;
begin
--Arrange
l_expected := '%<file path="ut3_develop.'||ut3_tester_helper.coverage_helper.covered_package_name||'">' ||
l_expected := '%<file path="package body ut3_develop.'||ut3_tester_helper.coverage_helper.covered_package_name||'">' ||
get_block_coverage_line||
'%<lineToCover lineNumber="6" covered="false"/>%';
--Act
Expand All @@ -38,7 +38,7 @@ create or replace package body test_extended_coverage is
l_actual clob;
begin
--Arrange
l_expected := '%<file path="ut3_develop.'||ut3_tester_helper.coverage_helper.covered_package_name||'">' ||
l_expected := '%<file path="package body ut3_develop.'||ut3_tester_helper.coverage_helper.covered_package_name||'">' ||
get_block_coverage_line ||
'%<lineToCover lineNumber="6" covered="false"/>%';
--Act
Expand All @@ -54,7 +54,7 @@ create or replace package body test_extended_coverage is
);
--Assert
ut.expect(l_actual).to_be_like(l_expected);
ut.expect(l_actual).to_be_like('%<file path="ut3_develop.%">%<file path="ut3_develop.%">%');
ut.expect(l_actual).to_be_like('%<file path="package body ut3_develop.%">%<file path="package body ut3_develop.%">%');
end;

procedure coverage_for_file is
Expand Down
14 changes: 8 additions & 6 deletions test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ create or replace package body test_proftab_coverage is
l_actual clob;
begin
--Arrange
l_expected := coverage_helper.substitute_covered_package('%<file path="ut3_develop.{p}">%');
l_expected := coverage_helper.substitute_covered_package('%<file path="package body ut3_develop.{p}">%');
--Act
l_actual :=
ut3_tester_helper.coverage_helper.run_tests_as_job(
Expand All @@ -28,7 +28,7 @@ create or replace package body test_proftab_coverage is
l_actual clob;
begin
--Arrange
l_expected := coverage_helper.substitute_covered_package('%<file path="ut3_develop.{p}">%');
l_expected := coverage_helper.substitute_covered_package('%<file path="package body ut3_develop.{p}">%');
--Act
l_actual :=
ut3_tester_helper.coverage_helper.run_tests_as_job(
Expand All @@ -51,7 +51,7 @@ create or replace package body test_proftab_coverage is
l_actual clob;
begin
--Arrange
l_expected := '<file path="ut3_develop.%">';
l_expected := '<file path="package body ut3_develop.%">';
l_expected := '%'||l_expected||'%'||l_expected||'%';
--Act
l_actual :=
Expand Down Expand Up @@ -96,7 +96,9 @@ create or replace package body test_proftab_coverage is
l_actual clob;
l_expected clob;
begin
l_expected := '%<file path="ut3_develop.duplicate_name"><lineToCover lineNumber="6" covered="false"/>';
l_expected :=
'%<file path="package body ut3_develop.duplicate_name">%<lineToCover lineNumber="4" covered="true"/>' ||
'%<file path="trigger ut3_develop.duplicate_name">%<lineToCover lineNumber="3" covered="true"/>%';
--Act
l_actual :=
ut3_tester_helper.coverage_helper.run_tests_as_job(
Expand Down Expand Up @@ -164,11 +166,11 @@ create or replace package body test_proftab_coverage is
<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
<coverage line-rate="0" branch-rate="0.0" lines-covered="0" lines-valid="9" branches-covered="0" branches-valid="0" complexity="0" version="1" timestamp="%">
<sources>
<source>ut3_develop.{p}</source>
<source>package body ut3_develop.{p}</source>
</sources>
<packages>
<package name="{P}" line-rate="0.0" branch-rate="0.0" complexity="0.0">
<class name="{P}" filename="ut3_develop.{p}" line-rate="0.0" branch-rate="0.0" complexity="0.0">
<class name="{P}" filename="package body ut3_develop.{p}" line-rate="0.0" branch-rate="0.0" complexity="0.0">
<lines>
<line number="1" hits="0" branch="false"/>
<line number="2" hits="0" branch="false"/>
Expand Down