Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a112e36

Browse files
jgebaljgebal
committed
Added support for block coverage in sonar and cobertura reporters.
Cleanup of object names.
1 parent e2e1437 commit a112e36

21 files changed

Lines changed: 81 additions & 65 deletions

‎source/core/coverage/ut_coverage.pkb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,18 +176,18 @@ create or replace package body ut_coverage is
176176

177177
if a_coverage_options.coverage_type = gc_block_coverage then
178178
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
179-
return ut_coverage_block.get_coverage_data_block(a_coverage_options => a_coverage_options);
179+
return ut_coverage_block.get_coverage_data(a_coverage_options => a_coverage_options);
180180
$else
181181
return null;
182182
$end
183183
elsif a_coverage_options.coverage_type = gc_extended_coverage then
184184
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
185-
return ut_coverage_extended.get_extended_coverage(a_coverage_options => a_coverage_options);
185+
return ut_coverage_extended.get_coverage_data(a_coverage_options => a_coverage_options);
186186
$else
187187
return null;
188188
$end
189189
else
190-
return ut_coverage_proftab.get_coverage_data_profiler(a_coverage_options => a_coverage_options);
190+
return ut_coverage_profiler.get_coverage_data(a_coverage_options => a_coverage_options);
191191
end if;
192192
end get_coverage_data;
193193

‎source/core/coverage/ut_coverage_block.pkb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ create or replace package body ut_coverage_block is
2323
* Public functions
2424
*/
2525

26-
function get_coverage_data_block(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage is
26+
function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage is
2727
l_line_calls ut_coverage_helper.t_unit_line_calls;
2828
l_result ut_coverage.t_coverage;
2929
l_new_unit ut_coverage.t_unit_coverage;
@@ -41,7 +41,7 @@ create or replace package body ut_coverage_block is
4141
exit when l_source_objects_crsr%notfound;
4242

4343
--get coverage data
44-
l_line_calls := ut_block_coverage_helper.get_raw_coverage_data_block(l_source_object.owner, l_source_object.name);
44+
l_line_calls := ut_coverage_helper_block.get_raw_coverage_data(l_source_object.owner, l_source_object.name);
4545
--if there is coverage, we need to filter out the garbage (badly indicated data)
4646
if l_line_calls.count > 0 then
4747
--remove lines that should not be indicted as meaningful
@@ -154,7 +154,7 @@ create or replace package body ut_coverage_block is
154154
close l_source_objects_crsr;
155155

156156
return l_result;
157-
end get_coverage_data_block;
157+
end get_coverage_data;
158158

159159
end;
160160
/

‎source/core/coverage/ut_coverage_block.pks‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ create or replace package ut_coverage_block authid current_user is
1616
limitations under the License.
1717
*/
1818

19-
function get_coverage_data_block(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage;
19+
function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage;
2020

2121
end;
2222
/

‎source/core/coverage/ut_coverage_extended.pkb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ create or replace package body ut_coverage_extended is
2020
* Public functions
2121
*/
2222

23-
function get_extended_coverage(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage is
23+
function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage is
2424
l_result_block ut_coverage.t_coverage;
2525
l_result_profiler_enrich ut_coverage.t_coverage;
2626
l_object ut_coverage.t_full_name;
2727
l_line_no binary_integer;
2828
begin
2929
-- Get raw data for both reporters, order is important as tmp table will skip headers and dont populate
3030
-- tmp table for block again.
31-
l_result_profiler_enrich:= ut_coverage_proftab.get_coverage_data_profiler(a_coverage_options => a_coverage_options);
31+
l_result_profiler_enrich:= ut_coverage_profiler.get_coverage_data(a_coverage_options => a_coverage_options);
3232

33-
l_result_block := ut_coverage_block.get_coverage_data_block(a_coverage_options => a_coverage_options);
33+
l_result_block := ut_coverage_block.get_coverage_data(a_coverage_options => a_coverage_options);
3434

3535
-- Enrich profiler results with some of the block results
3636
l_object := l_result_profiler_enrich.objects.first;
@@ -58,7 +58,7 @@ create or replace package body ut_coverage_extended is
5858

5959
return l_result_profiler_enrich;
6060

61-
end get_extended_coverage;
61+
end get_coverage_data;
6262

6363
end;
6464
/

‎source/core/coverage/ut_coverage_extended.pks‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ create or replace package ut_coverage_extended authid current_user is
1616
limitations under the License.
1717
*/
1818

19-
function get_extended_coverage(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage;
19+
function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage;
2020

2121
end;
2222
/

‎source/core/coverage/ut_coverage_helper.pkb‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,20 @@ create or replace package body ut_coverage_helper is
7070
set_coverage_type(a_coverage_type);
7171
if get_coverage_type = ut_coverage.gc_block_coverage then
7272
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
73-
ut_block_coverage_helper.coverage_start(a_run_comment => a_run_comment ,a_coverage_id => g_coverage_id(ut_coverage.gc_block_coverage) );
73+
ut_coverage_helper_block.coverage_start(a_run_comment => a_run_comment ,a_coverage_id => g_coverage_id(ut_coverage.gc_block_coverage) );
7474
$else
7575
raise_application_error(ut_utils.gc_invalid_coverage_type,'Invalid coverage type requested. Please validate your Oracle install');
7676
$end
7777
elsif get_coverage_type = ut_coverage.gc_extended_coverage then
7878
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
79-
ut_block_coverage_helper.coverage_start(a_run_comment => a_run_comment ,a_coverage_id => g_coverage_id(ut_coverage.gc_block_coverage) );
80-
ut_proftab_helper.coverage_start(a_run_comment => a_run_comment, a_coverage_id => g_coverage_id(ut_coverage.gc_proftab_coverage));
79+
ut_coverage_helper_block.coverage_start(a_run_comment => a_run_comment ,a_coverage_id => g_coverage_id(ut_coverage.gc_block_coverage) );
80+
ut_coverage_helper_profiler.coverage_start(a_run_comment => a_run_comment, a_coverage_id => g_coverage_id(ut_coverage.gc_proftab_coverage));
8181
coverage_pause();
8282
$else
8383
raise_application_error(ut_utils.gc_invalid_coverage_type,'Invalid coverage type requested. Please validate your Oracle install');
8484
$end
8585
else
86-
ut_proftab_helper.coverage_start(a_run_comment => a_run_comment, a_coverage_id => g_coverage_id(ut_coverage.gc_proftab_coverage));
86+
ut_coverage_helper_profiler.coverage_start(a_run_comment => a_run_comment, a_coverage_id => g_coverage_id(ut_coverage.gc_proftab_coverage));
8787
coverage_pause();
8888
end if;
8989
g_is_started := true;
@@ -111,7 +111,7 @@ create or replace package body ut_coverage_helper is
111111
if get_coverage_type = ut_coverage.gc_block_coverage then
112112
null;
113113
else
114-
ut_proftab_helper.coverage_pause();
114+
ut_coverage_helper_profiler.coverage_pause();
115115
end if;
116116
end if;
117117
end;
@@ -121,7 +121,7 @@ create or replace package body ut_coverage_helper is
121121
if get_coverage_type = ut_coverage.gc_block_coverage then
122122
null;
123123
else
124-
ut_proftab_helper.coverage_resume();
124+
ut_coverage_helper_profiler.coverage_resume();
125125
end if;
126126
end;
127127

@@ -131,19 +131,19 @@ create or replace package body ut_coverage_helper is
131131
g_is_started := false;
132132
if get_coverage_type = ut_coverage.gc_block_coverage then
133133
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
134-
ut_block_coverage_helper.coverage_stop();
134+
ut_coverage_helper_block.coverage_stop();
135135
$else
136136
null;
137137
$end
138138
elsif get_coverage_type = ut_coverage.gc_extended_coverage then
139139
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
140-
ut_proftab_helper.coverage_stop();
141-
ut_block_coverage_helper.coverage_stop();
140+
ut_coverage_helper_profiler.coverage_stop();
141+
ut_coverage_helper_block.coverage_stop();
142142
$else
143143
null;
144144
$end
145145
else
146-
ut_proftab_helper.coverage_stop();
146+
ut_coverage_helper_profiler.coverage_stop();
147147
end if;
148148
end if;
149149
end;
@@ -154,19 +154,19 @@ create or replace package body ut_coverage_helper is
154154
g_is_started := false;
155155
if get_coverage_type = ut_coverage.gc_block_coverage then
156156
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
157-
ut_block_coverage_helper.coverage_stop();
157+
ut_coverage_helper_block.coverage_stop();
158158
$else
159159
null;
160160
$end
161161
elsif get_coverage_type = ut_coverage.gc_extended_coverage then
162162
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
163-
ut_proftab_helper.coverage_stop();
164-
ut_block_coverage_helper.coverage_stop();
163+
ut_coverage_helper_profiler.coverage_stop();
164+
ut_coverage_helper_block.coverage_stop();
165165
$else
166166
null;
167167
$end
168168
else
169-
ut_proftab_helper.coverage_stop();
169+
ut_coverage_helper_profiler.coverage_stop();
170170
end if;
171171
end;
172172

source/core/coverage/ut_block_coverage_helper.pkb renamed to source/core/coverage/ut_coverage_helper_block.pkb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
create or replace package body ut_block_coverage_helper is
1+
create or replace package body ut_coverage_helper_block is
22
/*
33
utPLSQL - Version 3
44
Copyright 2016 - 2017 utPLSQL Project
@@ -65,7 +65,7 @@ create or replace package body ut_block_coverage_helper is
6565
return l_coverage_rows;
6666
end;
6767

68-
function get_raw_coverage_data_block(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls is
68+
function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls is
6969
l_tmp_data t_block_rows;
7070
l_results ut_coverage_helper.t_unit_line_calls;
7171

source/core/coverage/ut_block_coverage_helper.pks renamed to source/core/coverage/ut_coverage_helper_block.pks

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
create or replace package ut_block_coverage_helper authid definer is
1+
create or replace package ut_coverage_helper_block authid definer is
22
/*
33
utPLSQL - Version 3
44
Copyright 2016 - 2017 utPLSQL Project
@@ -20,7 +20,7 @@ create or replace package ut_block_coverage_helper authid definer is
2020

2121
procedure coverage_stop;
2222

23-
function get_raw_coverage_data_block(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls;
23+
function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls;
2424

2525
end;
2626
/

source/core/coverage/ut_proftab_helper.pkb renamed to source/core/coverage/ut_coverage_helper_profiler.pkb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
create or replace package body ut_proftab_helper is
1+
create or replace package body ut_coverage_helper_profiler is
22
/*
33
utPLSQL - Version 3
44
Copyright 2016 - 2017 utPLSQL Project
@@ -77,7 +77,7 @@ create or replace package body ut_proftab_helper is
7777
RETURN l_coverage_rows;
7878
end;
7979

80-
function get_raw_coverage_data_profiler(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls is
80+
function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls is
8181
l_tmp_data t_proftab_rows;
8282
l_results ut_coverage_helper.t_unit_line_calls;
8383
begin

source/core/coverage/ut_proftab_helper.pks renamed to source/core/coverage/ut_coverage_helper_profiler.pks

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
create or replace package ut_proftab_helper authid definer is
1+
create or replace package ut_coverage_helper_profiler authid definer is
22
/*
33
utPLSQL - Version 3
44
Copyright 2016 - 2017 utPLSQL Project
@@ -24,7 +24,7 @@ create or replace package ut_proftab_helper authid definer is
2424

2525
procedure coverage_resume;
2626

27-
function get_raw_coverage_data_profiler(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls;
27+
function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls;
2828

2929
end;
3030
/

0 commit comments

Comments
 (0)