Skip to content
Merged
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
Refactor Coverage to now enrich profile for partially covered lines u…
…sing block coverage.
  • Loading branch information
lwasylow committed Apr 8, 2018
commit ab7eb248ed2c56310cc27aab6a98f3b2cee2de1a
122 changes: 29 additions & 93 deletions source/core/coverage/ut_coverage_extended.pkb
Original file line number Diff line number Diff line change
Expand Up @@ -21,103 +21,39 @@ create or replace package body ut_coverage_extended is
*/

function get_extended_coverage(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage is
l_result ut_coverage.t_coverage;
l_result_block ut_coverage.t_coverage;
l_result_profiler ut_coverage.t_coverage;
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;
l_line_no binary_integer;
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
ut_coverage_helper.cleanup_tmp_table();
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);
ut_coverage_helper.cleanup_tmp_table();
l_result_profiler_enrich:= ut_coverage_proftab.get_coverage_data_profiler(a_coverage_options => a_coverage_options);


ut_coverage.populate_tmp_table(a_coverage_options,ut_coverage.get_cov_sources_sql(a_coverage_options,'N'));

l_source_objects_crsr := ut_coverage_helper.get_tmp_table_objects_cursor();
loop
fetch l_source_objects_crsr
into l_source_object;
exit when l_source_objects_crsr%notfound;
--check if we have a hits in any of reporters
if l_result_block.total_lines > 0 or l_result_profiler.total_lines > 0 then
--update total stats
l_result.total_lines := nvl(l_result.total_lines,0) + l_source_object.lines_count;
l_result.total_blocks := nvl(l_result_block.total_blocks,0);
l_result.uncovered_blocks := nvl(l_result_block.uncovered_blocks,0);
l_result.covered_blocks := nvl(l_result_block.covered_blocks,0);
l_result.partcovered_lines := nvl(l_result_block.partcovered_lines,0);

--populate object level coverage stats
if not l_result.objects.exists(l_source_object.full_name) then
l_result.objects(l_source_object.full_name) := l_new_unit;
l_result.objects(l_source_object.full_name).owner := l_source_object.owner;
l_result.objects(l_source_object.full_name).name := l_source_object.name;
l_result.objects(l_source_object.full_name).total_lines := l_source_object.lines_count;
l_result.objects(l_source_object.full_name).total_blocks := nvl(l_result_block.objects(l_source_object.full_name).total_blocks,0);
l_result.objects(l_source_object.full_name).uncovered_blocks := nvl(l_result_block.objects(l_source_object.full_name).uncovered_blocks,0);
l_result.objects(l_source_object.full_name).covered_blocks := nvl(l_result_block.objects(l_source_object.full_name).covered_blocks,0);
l_result.objects(l_source_object.full_name).partcovered_lines := nvl(l_result_block.objects(l_source_object.full_name).partcovered_lines,0);
-- Enrich profiler results with some of the block results
l_object := l_result_profiler_enrich.objects.first;
while (l_object is not null)
loop
l_line_no := l_result_profiler_enrich.objects(l_object).lines.first;
while (l_line_no is not null)
loop
if l_result_block.objects(l_object).lines.exists(l_line_no) then
-- enrich line level stats
l_result_profiler_enrich.objects(l_object).lines(l_line_no).partcove := l_result_block.objects(l_object).lines(l_line_no).partcove;
-- enrich object level stats
l_result_profiler_enrich.objects(l_object).partcovered_lines := nvl(l_result_profiler_enrich.objects(l_object).partcovered_lines,0) + l_result_block.objects(l_object).lines(l_line_no).partcove;
end if;

l_line_no := least(l_result_block.objects(l_source_object.full_name).lines.first,
l_result_profiler.objects(l_source_object.full_name).lines.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 l_line_no is null;

-- Set executions to zero at beginning, specific coverage will overwrite if exists.
l_result.objects(l_source_object.full_name).lines(l_line_no).executions := 0;
l_result.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 := 0;
l_result.objects(l_source_object.full_name).lines(l_line_no).partcove := 0;

-- we need to check if given index exists for that coverage type or we get no data found
if l_result_block.objects(l_source_object.full_name).lines.exists(l_line_no) then
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 := NVL(l_result_block.objects(l_source_object.full_name).lines(l_line_no).partcove,0);
--We capture block executions here, since block coverage do not capture more than 1
--if profiler executions exists we will use that number as profiler shows hits correctly

l_result.objects(l_source_object.full_name).lines(l_line_no).executions := l_result_block.objects(l_source_object.full_name).lines(l_line_no).executions;
end if;

if l_result_profiler.objects(l_source_object.full_name).lines.exists(l_line_no) then
l_result.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;
end if;

-- Recalculate total lines
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(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)
.covered_lines + 1;
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;

l_line_no := least(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;
end if;

end loop;
close l_source_objects_crsr;
return l_result;
--At the end go to next line
l_line_no := l_result_profiler_enrich.objects(l_object).lines.next(l_line_no);
end loop;
--total level stats enrich
l_result_profiler_enrich.partcovered_lines := nvl(l_result_profiler_enrich.partcovered_lines,0) + l_result_profiler_enrich.objects(l_object).partcovered_lines;
-- At the end go to next object
l_object := l_result_profiler_enrich.objects.next(l_object);
end loop;

return l_result_profiler_enrich;

end get_extended_coverage;

Expand Down