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
Merge branch 'develop' of https://github.com/utPLSQL/utPLSQL into fea… 
…ture/12cov_extended
  • Loading branch information
@lwasylow
lwasylow committed Apr 7, 2018
commit 1f5104989236281090b387b915ea60cea7dcc5b3
10 changes: 5 additions & 5 deletions source/core/coverage/ut_block_coverage_helper.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ create or replace package body ut_block_coverage_helper is
end;

function block_results(a_object_owner varchar2, a_object_name varchar2) return t_block_rows is
c_raw_coverage sys_refcursor;
l_raw_coverage sys_refcursor;
l_coverage_rows t_block_rows;
l_coverage_id integer := ut_coverage_helper.get_coverage_id(ut_coverage.c_block_coverage);
l_coverage_id integer := ut_coverage_helper.get_coverage_id(ut_coverage.gc_block_coverage);
begin

open c_raw_coverage for q'[select ccb.line
open l_raw_coverage for q'[select ccb.line
,count(ccb.block) totalblocks
,sum(ccb.covered)
from dbmspcc_units ccu
Expand All @@ -59,8 +59,8 @@ create or replace package body ut_block_coverage_helper is
group by ccb.line
order by 1]' using l_coverage_id,a_object_owner,a_object_name;

fetch c_raw_coverage bulk collect into l_coverage_rows;
close c_raw_coverage;
fetch l_raw_coverage bulk collect into l_coverage_rows;
close l_raw_coverage;

return l_coverage_rows;
end;
Expand Down
9 changes: 5 additions & 4 deletions source/core/coverage/ut_coverage.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ create or replace package body ut_coverage is
* Public functions
*/
procedure coverage_start(a_coverage_options ut_coverage_options default null) is
l_coverage_type varchar2(10) := coalesce(a_coverage_options.coverage_type, c_proftab_coverage);
l_coverage_type varchar2(10) := coalesce(a_coverage_options.coverage_type, gc_proftab_coverage);
begin
ut_coverage_helper.coverage_start('utPLSQL Code coverage run '||ut_utils.to_string(systimestamp),l_coverage_type);
end;

procedure coverage_start_develop(a_coverage_options ut_coverage_options default null) is
l_coverage_type varchar2(10) := coalesce(a_coverage_options.coverage_type, c_proftab_coverage);
l_coverage_type varchar2(10) := coalesce(a_coverage_options.coverage_type, gc_proftab_coverage);
begin
ut_coverage_helper.coverage_start_develop(l_coverage_type);
end;
Expand All @@ -102,15 +102,16 @@ create or replace package body ut_coverage is
end;

function get_coverage_data(a_coverage_options ut_coverage_options) return t_coverage is
l_line_no binary_integer;
begin

if a_coverage_options.coverage_type = c_block_coverage then
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);
$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 = c_extended_coverage then
elsif a_coverage_options.coverage_type = gc_extended_coverage then
--Collect data for block and proftab and pass to extended for modifications.
return ut_coverage_extended.get_extended_coverage(a_coverage_options => a_coverage_options);
else
Expand Down
6 changes: 3 additions & 3 deletions source/core/coverage/ut_coverage.pks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ create or replace package ut_coverage authid current_user is
limitations under the License.
*/

c_proftab_coverage constant varchar2(32) := 'proftab';
c_block_coverage constant varchar2(32) := 'block';
c_extended_coverage constant varchar2(32) := 'extended';
gc_proftab_coverage constant varchar2(32) := 'proftab';
gc_block_coverage constant varchar2(32) := 'block';
gc_extended_coverage constant varchar2(32) := 'extended';

-- total run coverage information
subtype t_full_name is varchar2(4000);
Expand Down
42 changes: 21 additions & 21 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 @@ -90,7 +90,7 @@ create or replace package body ut_coverage_block 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;
line_no binary_integer;
l_line_no binary_integer;
l_source_objects_crsr ut_coverage_helper.t_tmp_table_objects_crsr;
l_source_object ut_coverage_helper.t_tmp_table_object;
begin
Expand Down Expand Up @@ -129,55 +129,55 @@ create or replace package body ut_coverage_block is
l_result.objects(l_source_object.full_name).total_lines := l_source_object.lines_count;
end if;
--map to results
line_no := l_line_calls.first;
if line_no is null then
l_line_no := l_line_calls.first;
if l_line_no is null then
l_result.uncovered_lines := l_result.uncovered_lines + l_source_object.lines_count;
l_result.objects(l_source_object.full_name).uncovered_lines := l_source_object.lines_count;
else
loop
exit when line_no is null;
exit when l_line_no is null;

--turn the block coverage into a line coverage format to allow for reading.
--whenever the linst is a part covered treat that line as a hit and execution but only part covered

--total stats
--Get total blocks ,blocks covered, blocks not covered this will be used for PCT calc
l_result.total_blocks := nvl(l_result.total_blocks, 0) + l_line_calls(line_no).blocks;
l_result.covered_blocks := nvl(l_result.covered_blocks, 0) + l_line_calls(line_no).covered_blocks;
l_result.total_blocks := nvl(l_result.total_blocks, 0) + l_line_calls(l_line_no).blocks;
l_result.covered_blocks := nvl(l_result.covered_blocks, 0) + l_line_calls(l_line_no).covered_blocks;
l_result.uncovered_blocks := nvl(l_result.uncovered_blocks, 0) +
(l_line_calls(line_no).blocks - l_line_calls(line_no).covered_blocks);
(l_line_calls(l_line_no).blocks - l_line_calls(l_line_no).covered_blocks);

--If line is partially covered add as part line cover and covered for line reporter
if l_line_calls(line_no).partcovered = 1 then
if l_line_calls(l_line_no).partcovered = 1 then
l_result.partcovered_lines := l_result.partcovered_lines + 1;
end if;

if l_line_calls(line_no).covered_blocks > 0 then
if l_line_calls(l_line_no).covered_blocks > 0 then
l_result.covered_lines := l_result.covered_lines + 1;
end if;

-- Use nvl as be default is null and screw the calcs
--Increase total blocks
l_result.objects(l_source_object.full_name).lines(line_no).no_blocks := l_line_calls(line_no).blocks;
l_result.objects(l_source_object.full_name).lines(line_no).covered_blocks := l_line_calls(line_no).covered_blocks;
l_result.objects(l_source_object.full_name).lines(l_line_no).no_blocks := l_line_calls(l_line_no).blocks;
l_result.objects(l_source_object.full_name).lines(l_line_no).covered_blocks := l_line_calls(l_line_no).covered_blocks;
l_result.objects(l_source_object.full_name).total_blocks := nvl(l_result.objects(l_source_object.full_name)
.total_blocks
,0) + l_line_calls(line_no).blocks;
,0) + l_line_calls(l_line_no).blocks;

--Total uncovered blocks is a line blocks minus covered blocsk
l_result.objects(l_source_object.full_name).uncovered_blocks := nvl(l_result.objects(l_source_object.full_name)
.uncovered_blocks
,0) +
(l_line_calls(line_no).blocks - l_line_calls(line_no)
(l_line_calls(l_line_no).blocks - l_line_calls(l_line_no)
.covered_blocks);

--If we have any covered blocks in line
if l_line_calls(line_no).covered_blocks > 0 then
if l_line_calls(l_line_no).covered_blocks > 0 then
--If any block is covered then we have a hit on that line
l_result.executions := l_result.executions + 1;
--object level stats
--If its part covered then mark it else treat as full cov
if l_line_calls(line_no).partcovered = 1 then
if l_line_calls(l_line_no).partcovered = 1 then
l_result.objects(l_source_object.full_name).partcovered_lines := l_result.objects(l_source_object.full_name)
.partcovered_lines + 1;
end if;
Expand All @@ -187,27 +187,27 @@ create or replace package body ut_coverage_block is
--How many blocks we covered
l_result.objects(l_source_object.full_name).covered_blocks := nvl(l_result.objects(l_source_object.full_name)
.covered_blocks
,0) + l_line_calls(line_no)
,0) + l_line_calls(l_line_no)
.covered_blocks;

--Object line executions
l_result.objects(l_source_object.full_name).executions := nvl(l_result.objects(l_source_object.full_name)
.executions
,0) + 1;

l_result.objects(l_source_object.full_name).lines(line_no).executions := 1;
l_result.objects(l_source_object.full_name).lines(l_line_no).executions := 1;

--Whenever there is no covered block treat as uncovered (query returns only lines where the blocks are in code so we
--dont have a false results here when there is no blocks
elsif l_line_calls(line_no).covered_blocks = 0 then
elsif l_line_calls(l_line_no).covered_blocks = 0 then
l_result.uncovered_lines := l_result.uncovered_lines + 1;
l_result.objects(l_source_object.full_name).uncovered_lines := l_result.objects(l_source_object.full_name)
.uncovered_lines + 1;
l_result.objects(l_source_object.full_name).lines(line_no).executions := 0;
l_result.objects(l_source_object.full_name).lines(l_line_no).executions := 0;
end if;
--increase part covered counter (+ 1/0)
l_result.objects(l_source_object.full_name).lines(line_no).partcove := l_line_calls(line_no).partcovered;
line_no := l_line_calls.next(line_no);
l_result.objects(l_source_object.full_name).lines(l_line_no).partcove := l_line_calls(l_line_no).partcovered;
l_line_no := l_line_calls.next(l_line_no);
end loop;
end if;
end if;
Expand Down
28 changes: 14 additions & 14 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 @@ -87,7 +87,7 @@ create or replace package body ut_coverage_extended is
l_source_objects_crsr ut_coverage_helper.t_tmp_table_objects_crsr;
l_source_object ut_coverage_helper.t_tmp_table_object;
l_new_unit ut_coverage.t_unit_coverage;
line_no binary_integer;
l_line_no binary_integer;
begin
l_result_block := ut_coverage_block.get_coverage_data_block(a_coverage_options => a_coverage_options);
l_result_profiler:= ut_coverage_proftab.get_coverage_data_profiler(a_coverage_options => a_coverage_options);
Expand Down Expand Up @@ -121,43 +121,43 @@ create or replace package body ut_coverage_extended is
l_result.objects(l_source_object.full_name).partcovered_lines := l_result_block.objects(l_source_object.full_name).partcovered_lines;
end if;

line_no := coalesce(l_result_block.objects(l_source_object.full_name).lines.first,
l_line_no := coalesce(l_result_block.objects(l_source_object.full_name).lines.first,
l_result_profiler.objects(l_source_object.full_name).lines.first);

if line_no is null then
if l_line_no is null then
l_result.uncovered_lines := l_result.uncovered_lines + l_source_object.lines_count;
l_result.objects(l_source_object.full_name).uncovered_lines := l_source_object.lines_count;
else
loop
exit when line_no is null;
exit when l_line_no is null;
-- object level stats

-- Failing on non existing data for block objects.Check if exists and then use it
l_result.objects(l_source_object.full_name).lines(line_no).executions := greatest(l_result_block.objects(l_source_object.full_name).lines(line_no).executions,
l_result_profiler.objects(l_source_object.full_name).lines(line_no).executions);
l_result.objects(l_source_object.full_name).lines(line_no).no_blocks := NVL(l_result_block.objects(l_source_object.full_name).lines(line_no).no_blocks,0);
l_result.objects(l_source_object.full_name).lines(line_no).covered_blocks := NVL(l_result_block.objects(l_source_object.full_name).lines(line_no).covered_blocks,0);
l_result.objects(l_source_object.full_name).lines(line_no).partcove := l_result_block.objects(l_source_object.full_name).lines(line_no).partcove;
l_result.objects(l_source_object.full_name).lines(l_line_no).executions := greatest(l_result_block.objects(l_source_object.full_name).lines(l_line_no).executions,
l_result_profiler.objects(l_source_object.full_name).lines(l_line_no).executions);
l_result.objects(l_source_object.full_name).lines(l_line_no).no_blocks := NVL(l_result_block.objects(l_source_object.full_name).lines(l_line_no).no_blocks,0);
l_result.objects(l_source_object.full_name).lines(l_line_no).covered_blocks := NVL(l_result_block.objects(l_source_object.full_name).lines(l_line_no).covered_blocks,0);
l_result.objects(l_source_object.full_name).lines(l_line_no).partcove := l_result_block.objects(l_source_object.full_name).lines(l_line_no).partcove;
-- total level stats

-- Recalculate total lines
if l_result.objects(l_source_object.full_name).lines(line_no).executions > 0 then
if l_result.objects(l_source_object.full_name).lines(l_line_no).executions > 0 then
-- total level stats
l_result.executions := l_result.executions + l_result.objects(l_source_object.full_name).lines(line_no).executions;
l_result.executions := l_result.executions + l_result.objects(l_source_object.full_name).lines(l_line_no).executions;
l_result.covered_lines := l_result.covered_lines + 1;
-- object level stats
l_result.objects(l_source_object.full_name).covered_lines := l_result.objects(l_source_object.full_name)
.uncovered_lines + 1;
elsif l_result.objects(l_source_object.full_name).lines(line_no).executions = 0 then
elsif l_result.objects(l_source_object.full_name).lines(l_line_no).executions = 0 then
-- total level stats
l_result.uncovered_lines := l_result.uncovered_lines + 1;
-- object level stats
l_result.objects(l_source_object.full_name).uncovered_lines := l_result.objects(l_source_object.full_name)
.uncovered_lines + 1;
end if;

line_no := coalesce(l_result_block.objects(l_source_object.full_name).lines.next(line_no),
l_result_profiler.objects(l_source_object.full_name).lines.next(line_no));
l_line_no := coalesce(l_result_block.objects(l_source_object.full_name).lines.next(l_line_no),
l_result_profiler.objects(l_source_object.full_name).lines.next(l_line_no));

end loop;
end if;
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.