Skip to content

Commit e96b978

Browse files
jgebaljgebal
committed
Added object type to name in coverage reports.
Fixed issue with reporting non-block coverage as block coverage. Resolves utPLSQL#1086
1 parent 89d546a commit e96b978

6 files changed

Lines changed: 15 additions & 12 deletions

File tree

‎source/core/coverage/ut_coverage.pkb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ create or replace package body ut_coverage is
9393
and s.type = f.object_type
9494
and s.owner = f.object_owner';
9595
else
96-
l_full_name := q'[lower(s.owner||'.'||s.name)]';
96+
l_full_name := q'[lower(s.type||' '||s.owner||'.'||s.name)]';
9797
l_filters := case
9898
when a_coverage_options.include_objects is not empty then '
9999
and (s.owner, s.name) in (

‎source/core/coverage/ut_coverage_helper_block.pkb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ create or replace package body ut_coverage_helper_block is
6565
group by ccb.line, ccb.block
6666
)
6767
group by line
68+
having count(block) > 1
6869
order by line]'
6970
bulk collect into l_coverage_rows
7071
using

‎test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ create or replace package body test_coverage_standalone is
55
l_block_cov clob;
66
l_file_path varchar2(250);
77
begin
8-
l_file_path := 'ut3_develop.'||a_object_name;
8+
l_file_path := 'package body ut3_develop.'||a_object_name;
99
--Arrange
1010
if ut3_tester_helper.coverage_helper.block_coverage_available then
1111
l_block_cov := '<line number="4" hits="5" branch="true" condition-coverage="67% (2/3)"/>';

‎test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ null,
4141
begin
4242
--Arrange
4343
l_expected := q'[{"source_files":[
44-
{ "name": "ut3_develop.]'||ut3_tester_helper.coverage_helper.covered_package_name||q'[",
44+
{ "name": "package body ut3_develop.]'||ut3_tester_helper.coverage_helper.covered_package_name||q'[",
4545
"coverage": [
4646
0,
4747
0,

‎test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ create or replace package body test_extended_coverage is
1515
l_actual clob;
1616
begin
1717
--Arrange
18-
l_expected := '%<file path="ut3_develop.'||ut3_tester_helper.coverage_helper.covered_package_name||'">' ||
18+
l_expected := '%<file path="package body ut3_develop.'||ut3_tester_helper.coverage_helper.covered_package_name||'">' ||
1919
get_block_coverage_line||
2020
'%<lineToCover lineNumber="6" covered="false"/>%';
2121
--Act
@@ -38,7 +38,7 @@ create or replace package body test_extended_coverage is
3838
l_actual clob;
3939
begin
4040
--Arrange
41-
l_expected := '%<file path="ut3_develop.'||ut3_tester_helper.coverage_helper.covered_package_name||'">' ||
41+
l_expected := '%<file path="package body ut3_develop.'||ut3_tester_helper.coverage_helper.covered_package_name||'">' ||
4242
get_block_coverage_line ||
4343
'%<lineToCover lineNumber="6" covered="false"/>%';
4444
--Act
@@ -54,7 +54,7 @@ create or replace package body test_extended_coverage is
5454
);
5555
--Assert
5656
ut.expect(l_actual).to_be_like(l_expected);
57-
ut.expect(l_actual).to_be_like('%<file path="ut3_develop.%">%<file path="ut3_develop.%">%');
57+
ut.expect(l_actual).to_be_like('%<file path="package body ut3_develop.%">%<file path="package body ut3_develop.%">%');
5858
end;
5959

6060
procedure coverage_for_file is

‎test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ create or replace package body test_proftab_coverage is
55
l_actual clob;
66
begin
77
--Arrange
8-
l_expected := coverage_helper.substitute_covered_package('%<file path="ut3_develop.{p}">%');
8+
l_expected := coverage_helper.substitute_covered_package('%<file path="package body ut3_develop.{p}">%');
99
--Act
1010
l_actual :=
1111
ut3_tester_helper.coverage_helper.run_tests_as_job(
@@ -28,7 +28,7 @@ create or replace package body test_proftab_coverage is
2828
l_actual clob;
2929
begin
3030
--Arrange
31-
l_expected := coverage_helper.substitute_covered_package('%<file path="ut3_develop.{p}">%');
31+
l_expected := coverage_helper.substitute_covered_package('%<file path="package body ut3_develop.{p}">%');
3232
--Act
3333
l_actual :=
3434
ut3_tester_helper.coverage_helper.run_tests_as_job(
@@ -51,7 +51,7 @@ create or replace package body test_proftab_coverage is
5151
l_actual clob;
5252
begin
5353
--Arrange
54-
l_expected := '<file path="ut3_develop.%">';
54+
l_expected := '<file path="package body ut3_develop.%">';
5555
l_expected := '%'||l_expected||'%'||l_expected||'%';
5656
--Act
5757
l_actual :=
@@ -96,7 +96,9 @@ create or replace package body test_proftab_coverage is
9696
l_actual clob;
9797
l_expected clob;
9898
begin
99-
l_expected := '%<file path="ut3_develop.duplicate_name"><lineToCover lineNumber="6" covered="false"/>';
99+
l_expected :=
100+
'%<file path="package body ut3_develop.duplicate_name">%<lineToCover lineNumber="4" covered="true"/>' ||
101+
'%<file path="trigger ut3_develop.duplicate_name">%<lineToCover lineNumber="3" covered="true"/>%';
100102
--Act
101103
l_actual :=
102104
ut3_tester_helper.coverage_helper.run_tests_as_job(
@@ -164,11 +166,11 @@ create or replace package body test_proftab_coverage is
164166
<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
165167
<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="%">
166168
<sources>
167-
<source>ut3_develop.{p}</source>
169+
<source>package body ut3_develop.{p}</source>
168170
</sources>
169171
<packages>
170172
<package name="{P}" line-rate="0.0" branch-rate="0.0" complexity="0.0">
171-
<class name="{P}" filename="ut3_develop.{p}" line-rate="0.0" branch-rate="0.0" complexity="0.0">
173+
<class name="{P}" filename="package body ut3_develop.{p}" line-rate="0.0" branch-rate="0.0" complexity="0.0">
172174
<lines>
173175
<line number="1" hits="0" branch="false"/>
174176
<line number="2" hits="0" branch="false"/>

0 commit comments

Comments
 (0)