Updated html reporter to show a information about the partially covered lines by displaying a covered not covered blocks.

lwasylow · lwasylow · commit e2e1437a38ae · 2018-04-12T00:22:26.000+01:00
diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md
@@ -67,6 +67,26 @@ end;
 
 In this mode html reporter will show additionally number of lines that been partially covered and highlight them in orange. Number of blocks in code, blocks covered and missed.
 
+#### Oracle 12.2 extended coverage with profiler and block coverage
+Using data collected from profiler and block coverage running parallel we are able to enrich information about coverage.
+For every line recorded by profiler if we have a partially covered same line in block coverage we will display that information
+presenting line as partially covered and displaying number of block and how many blocks been covered in that line.
+
+Example:
+```sql
+begin
+  ut.run(ut_coverage_html_reporter(),a_coverage_type => 'extended');
+end;
+/
+```
+
+Sample output:
+![Package Coverage Summary](../images/extended_coverage_html_summary.png)
+
+![Line Coverage Details](../images/extended_coverage_html_line.png)
+
+
+
 ### Coverage reporting options
 
 There are two distinct ways to gather code coverage:
diff --git a/source/core/coverage/ut_coverage_extended.pkb b/source/core/coverage/ut_coverage_extended.pkb
@@ -42,6 +42,8 @@ create or replace package body ut_coverage_extended is
         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;
+         l_result_profiler_enrich.objects(l_object).lines(l_line_no).covered_blocks := l_result_block.objects(l_object).lines(l_line_no).covered_blocks;
+         l_result_profiler_enrich.objects(l_object).lines(l_line_no).no_blocks := l_result_block.objects(l_object).lines(l_line_no).no_blocks;
          -- 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;
diff --git a/source/reporters/ut_extended_report_html_helper.pkb b/source/reporters/ut_extended_report_html_helper.pkb
@@ -28,6 +28,7 @@ create or replace package body ut_extended_report_html_helper is
       l_coverage_pct  number(5, 2);
       l_coverage_block_pct  number(5, 2);
       l_hits varchar2(30);
+      l_blocks varchar2(30);
     begin
       dbms_lob.createtemporary(l_result, true);
 
@@ -52,14 +53,36 @@ create or replace package body ut_extended_report_html_helper is
             <code class="sql">' || (dbms_xmlgen.convert(a_source_code(line_no))) ||
                          '</code></li>';
         else
-           l_hits := to_char(a_coverage_unit.lines(line_no).executions);
-                         
+          l_hits := to_char(a_coverage_unit.lines(line_no).executions);
+          if nvl(a_coverage_unit.lines(line_no).covered_blocks,0) < nvl(a_coverage_unit.lines(line_no).no_blocks,0) 
+          and nvl(a_coverage_unit.lines(line_no).partcove,0) = 1 then
+            l_blocks := to_char(a_coverage_unit.lines(line_no).covered_blocks) || chr(47)||
+                        to_char(a_coverage_unit.lines(line_no).no_blocks);  
+          else
+           l_blocks := null;
+          end if;
+           
           l_file_part := '
             <li class="' || ut_coverage_report_html_helper.line_status(a_coverage_unit.lines(line_no)) || '" data-hits="' ||
-                         dbms_xmlgen.convert(l_hits)|| '" data-linenumber="' || (line_no) || '">';
+                         dbms_xmlgen.convert(l_hits)|| '"'||
+                         case 
+                           when l_blocks is not null 
+                             then ' data-blocks="'||dbms_xmlgen.convert(l_blocks)||'"' 
+                           else 
+                             null 
+                           end
+                         ||' data-linenumber="' || (line_no) || '">';
           if a_coverage_unit.lines(line_no).executions > 0 then
             
-            l_file_part := l_file_part || '
+            l_file_part := l_file_part ||
+            case when l_blocks is not null
+              then '
+                <span class="blocks">' ||dbms_xmlgen.convert(l_blocks) ||
+                '</span>'
+              else
+                null
+              end
+            || '
               <span class="hits">' || dbms_xmlgen.convert(l_hits) ||
                            '</span>';
           end if;
