Skip to content

12.2 Oracle Native Block Coverage #604

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
lwasylow merged 54 commits into from
Apr 16, 2018
Merged

12.2 Oracle Native Block Coverage #604

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
287590b
12.2 Stable :
lwasylow Mar 11, 2018
68768f8
12.2 Stable :
lwasylow Mar 13, 2018
76bf869
12.2 Stable :
lwasylow Mar 13, 2018
1f4f5f0
Tests 12.2 Coverage:
lwasylow Mar 14, 2018
90858eb
Added 12.2 coverage
lwasylow Mar 14, 2018
d77cf9a
Test 12.2 coverage
lwasylow Mar 14, 2018
4f83357
Added 12.2 Coverage
lwasylow Mar 14, 2018
ac40332
Added 12.2 Coverage
lwasylow Mar 14, 2018
5f74db9
Merge pull request #602 from lwasylow/12coveragestab2
lwasylow Mar 14, 2018
9d7f16c
Added conditional install of tests for 12.2 only - when block coverag…
jgebal Mar 15, 2018
20541b5
Refactoring coverage:
lwasylow Mar 18, 2018
ab7eb93
Coverage Refactoring:
lwasylow Mar 23, 2018
8dbb1a1
Merge pull request #614 from lwasylow/feature/12cblockcoverage
lwasylow Mar 25, 2018
e0b220d
Merge branch 'develop' into feature/12cblockcoverage
lwasylow Mar 25, 2018
2560f5b
Revert "Feature/12cblockcoverage"
lwasylow Mar 25, 2018
6fe32c5
Merge pull request #615 from utPLSQL/revert-614-feature/12cblockcoverage
lwasylow Mar 25, 2018
8235848
Refactor Coverage:
lwasylow Mar 25, 2018
78fdab5
Refactor Coverage:
lwasylow Mar 25, 2018
3a19341
Merge branch 'feature/12cblockcoverage' of github.com:lwasylow/utPLSQ…
lwasylow Mar 25, 2018
466e126
Update test local
lwasylow Mar 25, 2018
e968f76
Merge pull request #616 from lwasylow/feature/12cblockcoverage
lwasylow Mar 25, 2018
0f1d789
12.2 coverage
lwasylow Apr 3, 2018
faab0fe
Merge pull request #625 from lwasylow/feature/12cblockcoverage
lwasylow Apr 3, 2018
35e5e13
12.2 coverage
lwasylow Apr 3, 2018
1289e99
Merge branch 'feature/12cblockcoverage' of github.com:lwasylow/utPLSQ…
lwasylow Apr 3, 2018
d3ce10c
Merge pull request #626 from lwasylow/feature/12cblockcoverage
lwasylow Apr 3, 2018
c0ca9d3
Fixing error in package name
lwasylow Apr 3, 2018
f151a6e
Update test
lwasylow Apr 4, 2018
28f7653
Statement Coverage First Commit
lwasylow Apr 7, 2018
1f51049
Merge branch 'develop' of https://github.com/utPLSQL/utPLSQL into fea…
lwasylow Apr 7, 2018
9c87b06
Merge branch 'develop' of github.com:utPLSQL/utPLSQL into feature/12c…
lwasylow Apr 7, 2018
d8b8e87
Updated coverage with statement level information
lwasylow Apr 7, 2018
49b1b84
Move get_cov_sql function into common package to remove code duplication
lwasylow Apr 8, 2018
ab7eb24
Refactor Coverage to now enrich profile for partially covered lines u…
lwasylow Apr 8, 2018
36279fa
Update tests and fixed typo in original coverage reporter
lwasylow Apr 10, 2018
661ef74
Merge branch 'feature/12cblockcoverage' of https://github.com/utPLSQL…
lwasylow Apr 10, 2018
57f7a4f
Updated coverage
lwasylow Apr 11, 2018
3a2ff00
Merge branch 'develop' of https://github.com/utPLSQL/utPLSQL into fea…
lwasylow Apr 11, 2018
e6c2be2
Merge pull request #640 from lwasylow/feature/12cov_extended
lwasylow Apr 11, 2018
c9cb004
Fixes to conditional compilation
lwasylow Apr 11, 2018
a862b95
Fixes to new asso array during mock coverage id.
lwasylow Apr 11, 2018
57ee184
Merge pull request #641 from lwasylow/feature/12cblockcoverage
lwasylow Apr 11, 2018
4561795
Update test
lwasylow Apr 11, 2018
0556fbe
Update test
lwasylow Apr 11, 2018
b91e51d
Merge branch 'feature/12cblockcoverage' of github.com:utPLSQL/utPLSQL…
lwasylow Apr 11, 2018
d19f941
Update test/core/reporters/test_extended_coverage.pkb
lwasylow Apr 11, 2018
e2e1437
Updated html reporter to show a information about the partially cover…
lwasylow Apr 11, 2018
a112e36
Added support for block coverage in sonar and cobertura reporters.
jgebal Apr 14, 2018
f0e2653
Clean-up and removal of unnecessary reporters
lwasylow Apr 15, 2018
4458dff
Unify reporters
lwasylow Apr 15, 2018
2027421
Update test
lwasylow Apr 15, 2018
924eb9b
Update issue with part covered being zero.
lwasylow Apr 15, 2018
a111c6d
Update for test with timestamp
lwasylow Apr 15, 2018
2d6c7d3
Merge branch 'develop' into feature/12cblockcoverage
lwasylow Apr 16, 2018
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
Next Next commit
Added support for block coverage in sonar and cobertura reporters. 
Cleanup of object names.
  • Loading branch information
@jgebal
jgebal committed Apr 14, 2018
commit a112e36c50c2a838a43b2293ac0805e18a2e64a7
6 changes: 3 additions & 3 deletions source/core/coverage/ut_coverage.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,18 +176,18 @@ create or replace package body ut_coverage is

if a_coverage_options.coverage_type = gc_block_coverage then
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
return ut_coverage_block.get_coverage_data_block(a_coverage_options => a_coverage_options);
return ut_coverage_block.get_coverage_data(a_coverage_options => a_coverage_options);
$else
return null;
Copy link
Copy Markdown
Member

@Pazus Pazus Mar 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we create warning here?

Copy link
Copy Markdown
Member Author

@lwasylow lwasylow Mar 29, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its something we could consider. However if we want to warn then probably at the coverage_start function.
I could create a new type of error and raise an error at the start of the coverage something like:
Requested reporter is not available, please check you install and documentation.

that would stop running rest of test which is probably valid as when you request coverage you don't want to continue without it.

Another option would be to force user to switch to profiler instead however some information would have to be displayed not a really big fan of forcing solutions.

$end
elsif a_coverage_options.coverage_type = gc_extended_coverage then
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
return ut_coverage_extended.get_extended_coverage(a_coverage_options => a_coverage_options);
return ut_coverage_extended.get_coverage_data(a_coverage_options => a_coverage_options);
$else
return null;
$end
else
return ut_coverage_proftab.get_coverage_data_profiler(a_coverage_options => a_coverage_options);
return ut_coverage_profiler.get_coverage_data(a_coverage_options => a_coverage_options);
end if;
end get_coverage_data;

Expand Down
6 changes: 3 additions & 3 deletions source/core/coverage/ut_coverage_block.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ create or replace package body ut_coverage_block is
* Public functions
*/

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

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

return l_result;
end get_coverage_data_block;
end get_coverage_data;

end;
/
2 changes: 1 addition & 1 deletion source/core/coverage/ut_coverage_block.pks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ create or replace package ut_coverage_block authid current_user is
limitations under the License.
*/

function get_coverage_data_block(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage;
function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage;

end;
/
8 changes: 4 additions & 4 deletions source/core/coverage/ut_coverage_extended.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ create or replace package body ut_coverage_extended is
* Public functions
*/

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

l_result_block := ut_coverage_block.get_coverage_data_block(a_coverage_options => a_coverage_options);
l_result_block := ut_coverage_block.get_coverage_data(a_coverage_options => a_coverage_options);

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

return l_result_profiler_enrich;

end get_extended_coverage;
end get_coverage_data;

end;
/
2 changes: 1 addition & 1 deletion source/core/coverage/ut_coverage_extended.pks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ create or replace package ut_coverage_extended authid current_user is
limitations under the License.
*/

function get_extended_coverage(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage;
function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage;

end;
/
28 changes: 14 additions & 14 deletions source/core/coverage/ut_coverage_helper.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,20 @@ create or replace package body ut_coverage_helper is
set_coverage_type(a_coverage_type);
if get_coverage_type = ut_coverage.gc_block_coverage then
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
ut_block_coverage_helper.coverage_start(a_run_comment => a_run_comment ,a_coverage_id => g_coverage_id(ut_coverage.gc_block_coverage) );
ut_coverage_helper_block.coverage_start(a_run_comment => a_run_comment ,a_coverage_id => g_coverage_id(ut_coverage.gc_block_coverage) );
$else
raise_application_error(ut_utils.gc_invalid_coverage_type,'Invalid coverage type requested. Please validate your Oracle install');
$end
elsif get_coverage_type = ut_coverage.gc_extended_coverage then
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
ut_block_coverage_helper.coverage_start(a_run_comment => a_run_comment ,a_coverage_id => g_coverage_id(ut_coverage.gc_block_coverage) );
ut_proftab_helper.coverage_start(a_run_comment => a_run_comment, a_coverage_id => g_coverage_id(ut_coverage.gc_proftab_coverage));
ut_coverage_helper_block.coverage_start(a_run_comment => a_run_comment ,a_coverage_id => g_coverage_id(ut_coverage.gc_block_coverage) );
ut_coverage_helper_profiler.coverage_start(a_run_comment => a_run_comment, a_coverage_id => g_coverage_id(ut_coverage.gc_proftab_coverage));
coverage_pause();
$else
raise_application_error(ut_utils.gc_invalid_coverage_type,'Invalid coverage type requested. Please validate your Oracle install');
$end
else
ut_proftab_helper.coverage_start(a_run_comment => a_run_comment, a_coverage_id => g_coverage_id(ut_coverage.gc_proftab_coverage));
ut_coverage_helper_profiler.coverage_start(a_run_comment => a_run_comment, a_coverage_id => g_coverage_id(ut_coverage.gc_proftab_coverage));
coverage_pause();
end if;
g_is_started := true;
Expand Down Expand Up @@ -111,7 +111,7 @@ create or replace package body ut_coverage_helper is
if get_coverage_type = ut_coverage.gc_block_coverage then
null;
else
ut_proftab_helper.coverage_pause();
ut_coverage_helper_profiler.coverage_pause();
end if;
end if;
end;
Expand All @@ -121,7 +121,7 @@ create or replace package body ut_coverage_helper is
if get_coverage_type = ut_coverage.gc_block_coverage then
null;
else
ut_proftab_helper.coverage_resume();
ut_coverage_helper_profiler.coverage_resume();
end if;
end;

Expand All @@ -131,19 +131,19 @@ create or replace package body ut_coverage_helper is
g_is_started := false;
if get_coverage_type = ut_coverage.gc_block_coverage then
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
ut_block_coverage_helper.coverage_stop();
ut_coverage_helper_block.coverage_stop();
$else
null;
$end
elsif get_coverage_type = ut_coverage.gc_extended_coverage then
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
ut_proftab_helper.coverage_stop();
ut_block_coverage_helper.coverage_stop();
ut_coverage_helper_profiler.coverage_stop();
ut_coverage_helper_block.coverage_stop();
$else
null;
$end
else
ut_proftab_helper.coverage_stop();
ut_coverage_helper_profiler.coverage_stop();
end if;
end if;
end;
Expand All @@ -154,19 +154,19 @@ create or replace package body ut_coverage_helper is
g_is_started := false;
if get_coverage_type = ut_coverage.gc_block_coverage then
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
ut_block_coverage_helper.coverage_stop();
ut_coverage_helper_block.coverage_stop();
$else
null;
$end
elsif get_coverage_type = ut_coverage.gc_extended_coverage then
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
ut_proftab_helper.coverage_stop();
ut_block_coverage_helper.coverage_stop();
ut_coverage_helper_profiler.coverage_stop();
ut_coverage_helper_block.coverage_stop();
$else
null;
$end
else
ut_proftab_helper.coverage_stop();
ut_coverage_helper_profiler.coverage_stop();
end if;
end;

Expand Down
4 changes: 2 additions & 2 deletions ...ore/coverage/ut_block_coverage_helper.pkb → ...ore/coverage/ut_coverage_helper_block.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
create or replace package body ut_block_coverage_helper is
create or replace package body ut_coverage_helper_block is
/*
utPLSQL - Version 3
Copyright 2016 - 2017 utPLSQL Project
Expand Down Expand Up @@ -65,7 +65,7 @@ create or replace package body ut_block_coverage_helper is
return l_coverage_rows;
end;

function get_raw_coverage_data_block(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls is
function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls is
l_tmp_data t_block_rows;
l_results ut_coverage_helper.t_unit_line_calls;

Expand Down
4 changes: 2 additions & 2 deletions ...ore/coverage/ut_block_coverage_helper.pks → ...ore/coverage/ut_coverage_helper_block.pks
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
create or replace package ut_block_coverage_helper authid definer is
create or replace package ut_coverage_helper_block authid definer is
/*
utPLSQL - Version 3
Copyright 2016 - 2017 utPLSQL Project
Expand All @@ -20,7 +20,7 @@ create or replace package ut_block_coverage_helper authid definer is

procedure coverage_stop;

function get_raw_coverage_data_block(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls;
function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls;

end;
/
4 changes: 2 additions & 2 deletions source/core/coverage/ut_proftab_helper.pkb → .../coverage/ut_coverage_helper_profiler.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
create or replace package body ut_proftab_helper is
create or replace package body ut_coverage_helper_profiler is
/*
utPLSQL - Version 3
Copyright 2016 - 2017 utPLSQL Project
Expand Down Expand Up @@ -77,7 +77,7 @@ create or replace package body ut_proftab_helper is
RETURN l_coverage_rows;
end;

function get_raw_coverage_data_profiler(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls is
function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls is
l_tmp_data t_proftab_rows;
l_results ut_coverage_helper.t_unit_line_calls;
begin
Expand Down
4 changes: 2 additions & 2 deletions source/core/coverage/ut_proftab_helper.pks → .../coverage/ut_coverage_helper_profiler.pks
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
create or replace package ut_proftab_helper authid definer is
create or replace package ut_coverage_helper_profiler authid definer is
/*
utPLSQL - Version 3
Copyright 2016 - 2017 utPLSQL Project
Expand All @@ -24,7 +24,7 @@ create or replace package ut_proftab_helper authid definer is

procedure coverage_resume;

function get_raw_coverage_data_profiler(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls;
function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2) return ut_coverage_helper.t_unit_line_calls;

end;
/
8 changes: 4 additions & 4 deletions source/core/coverage/ut_coverage_proftab.pkb → ...ce/core/coverage/ut_coverage_profiler.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
create or replace package body ut_coverage_proftab is
create or replace package body ut_coverage_profiler is
/*
utPLSQL - Version 3
Copyright 2016 - 2017 utPLSQL Project
Expand All @@ -19,7 +19,7 @@ create or replace package body ut_coverage_proftab is
/**
* Public functions
*/
function get_coverage_data_profiler(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage is
function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage is
l_line_calls ut_coverage_helper.t_unit_line_calls;
l_result ut_coverage.t_coverage;
l_new_unit ut_coverage.t_unit_coverage;
Expand All @@ -37,7 +37,7 @@ create or replace package body ut_coverage_proftab is
exit when l_source_objects_crsr%notfound;

--get coverage data
l_line_calls := ut_proftab_helper.get_raw_coverage_data_profiler( l_source_object.owner, l_source_object.name);
l_line_calls := ut_coverage_helper_profiler.get_raw_coverage_data( l_source_object.owner, l_source_object.name);

--if there is coverage, we need to filter out the garbage (badly indicated data from dbms_profiler)
if l_line_calls.count > 0 then
Expand Down Expand Up @@ -93,7 +93,7 @@ create or replace package body ut_coverage_proftab is
close l_source_objects_crsr;

return l_result;
end get_coverage_data_profiler;
end get_coverage_data;

end;
/
4 changes: 2 additions & 2 deletions source/core/coverage/ut_coverage_proftab.pks → ...ce/core/coverage/ut_coverage_profiler.pks
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
create or replace package ut_coverage_proftab authid current_user is
create or replace package ut_coverage_profiler authid current_user is
/*
utPLSQL - Version 3
Copyright 2016 - 2017 utPLSQL Project
Expand All @@ -16,7 +16,7 @@ create or replace package ut_coverage_proftab authid current_user is
limitations under the License.
*/

function get_coverage_data_profiler(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage;
function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage;

end;
/
12 changes: 6 additions & 6 deletions source/install.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,20 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
--gathering coverage
@@install_component.sql 'core/coverage/ut_coverage_sources_tmp.sql'
@@install_component.sql 'core/coverage/ut_coverage_helper.pks'
@@install_above_12_1.sql 'core/coverage/ut_block_coverage_helper.pks'
@@install_above_12_1.sql 'core/coverage/ut_coverage_helper_block.pks'
@@install_above_12_1.sql 'core/coverage/ut_coverage_extended.pks'
@@install_component.sql 'core/coverage/ut_proftab_helper.pks'
@@install_component.sql 'core/coverage/ut_coverage_helper_profiler.pks'
@@install_component.sql 'core/coverage/ut_coverage.pks'
@@install_above_12_1.sql 'core/coverage/ut_coverage_block.pks'
@@install_component.sql 'core/coverage/ut_coverage_proftab.pks'
@@install_component.sql 'core/coverage/ut_coverage_profiler.pks'
@@install_component.sql 'core/coverage/ut_coverage_reporter_base.tps'
@@install_component.sql 'core/coverage/ut_coverage_helper.pkb'
@@install_above_12_1.sql 'core/coverage/ut_block_coverage_helper.pkb'
@@install_above_12_1.sql 'core/coverage/ut_coverage_helper_block.pkb'
@@install_above_12_1.sql 'core/coverage/ut_coverage_extended.pkb'
@@install_component.sql 'core/coverage/ut_proftab_helper.pkb'
@@install_component.sql 'core/coverage/ut_coverage_helper_profiler.pkb'
@@install_component.sql 'core/coverage/ut_coverage.pkb'
@@install_above_12_1.sql 'core/coverage/ut_coverage_block.pkb'
@@install_component.sql 'core/coverage/ut_coverage_proftab.pkb'
@@install_component.sql 'core/coverage/ut_coverage_profiler.pkb'
@@install_component.sql 'core/coverage/ut_coverage_reporter_base.tpb'

--core type bodies
Expand Down
12 changes: 11 additions & 1 deletion source/reporters/ut_coverage_cobertura_reporter.tpb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ create or replace type body ut_coverage_cobertura_reporter is
l_file_part varchar2(32767);
l_result clob;
l_line_no binary_integer;
l_pct integer;
begin
dbms_lob.createtemporary(l_result, true);
l_line_no := a_unit_coverage.lines.first;
Expand All @@ -46,7 +47,16 @@ create or replace type body ut_coverage_cobertura_reporter is
if a_unit_coverage.lines(l_line_no).executions = 0 then
l_file_part := '<line number="'||l_line_no||'" hits="0" branch="false"/>'||chr(10);
else
l_file_part := '<line number="'||l_line_no||'" hits="1" branch="false"/>'||chr(10);
l_file_part := '<line number="'||l_line_no||'" hits="'||a_unit_coverage.lines(l_line_no).executions||'"';
if a_unit_coverage.lines(l_line_no).covered_blocks < a_unit_coverage.lines(l_line_no).no_blocks then
l_file_part := l_file_part || ' branch="true"';
l_pct := (a_unit_coverage.lines(l_line_no).covered_blocks/a_unit_coverage.lines(l_line_no).no_blocks)*100;
l_file_part := l_file_part || ' condition-coverage="'||l_pct||'%';
l_file_part := l_file_part || ' ('||a_unit_coverage.lines(l_line_no).covered_blocks||'/'||a_unit_coverage.lines(l_line_no).no_blocks||')"';
else
l_file_part := l_file_part || ' branch="false"';
end if;
l_file_part := l_file_part ||'/>'||chr(10);
end if;
ut_utils.append_to_clob(l_result, l_file_part);
l_line_no := a_unit_coverage.lines.next(l_line_no);
Expand Down
7 changes: 6 additions & 1 deletion source/reporters/ut_coverage_sonar_reporter.tpb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@ create or replace type body ut_coverage_sonar_reporter is
if a_unit_coverage.lines(l_line_no).executions = 0 then
l_file_part := '<lineToCover lineNumber="'||l_line_no||'" covered="false"/>'||chr(10);
else
l_file_part := '<lineToCover lineNumber="'||l_line_no||'" covered="true"/>'||chr(10);
l_file_part := '<lineToCover lineNumber="'||l_line_no||'" covered="true"';
if a_unit_coverage.lines(l_line_no).covered_blocks <= a_unit_coverage.lines(l_line_no).no_blocks then
l_file_part := l_file_part || ' branchesToCover="'||a_unit_coverage.lines(l_line_no).no_blocks||'"';
l_file_part := l_file_part || ' coveredBranches="'||a_unit_coverage.lines(l_line_no).covered_blocks||'"';
end if;
l_file_part := l_file_part ||'/>'||chr(10);
end if;
ut_utils.append_to_clob(l_result, l_file_part);
l_line_no := a_unit_coverage.lines.next(l_line_no);
Expand Down
Loading