Merge branch 'develop' of github.com:utPLSQL/utPLSQL into feature/12c…

…blockcoverage
utPLSQL · lwasylow · Apr 16, 2018 · Mar 11, 2018 · Mar 13, 2018 · Mar 13, 2018
commit 9c87b066bf3cbaa0c1357bfc1a4b629da1bdbadd
diff --git a/source/core/coverage/ut_block_coverage_helper.pkb b/source/core/coverage/ut_block_coverage_helper.pkb
@@ -41,11 +41,11 @@ 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;
   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
@@ -58,8 +58,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;

diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb
@@ -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;
@@ -104,7 +104,7 @@ create or replace package body ut_coverage is
   function get_coverage_data(a_coverage_options ut_coverage_options) return t_coverage is
   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

diff --git a/source/core/coverage/ut_coverage.pks b/source/core/coverage/ut_coverage.pks
@@ -16,8 +16,8 @@ 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';
+  gc_proftab_coverage constant varchar2(32) := 'proftab';
+  gc_block_coverage   constant varchar2(32) := 'block';
 
   -- total run coverage information
   subtype t_full_name is varchar2(4000);

diff --git a/source/core/coverage/ut_coverage_block.pkb b/source/core/coverage/ut_coverage_block.pkb
@@ -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
@@ -130,55 +130,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;
@@ -188,27 +188,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;

diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb
@@ -68,7 +68,7 @@ create or replace package body ut_coverage_helper is
   procedure coverage_start_internal(a_run_comment varchar2,a_coverage_type in varchar2)  is
   begin
     set_coverage_type(a_coverage_type);
-    if get_coverage_type = ut_coverage.c_block_coverage then
+    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 );
       $else
@@ -100,7 +100,7 @@ create or replace package body ut_coverage_helper is
   procedure coverage_pause is
   begin
     if not g_develop_mode then
-      if get_coverage_type = ut_coverage.c_block_coverage then
+      if get_coverage_type = ut_coverage.gc_block_coverage then
          null;
       else
          ut_proftab_helper.coverage_pause();
@@ -110,7 +110,7 @@ create or replace package body ut_coverage_helper is
 
   procedure coverage_resume is
   begin
-    if get_coverage_type = ut_coverage.c_block_coverage then
+    if get_coverage_type = ut_coverage.gc_block_coverage then
        null;
     else
        ut_proftab_helper.coverage_resume();
@@ -121,7 +121,7 @@ create or replace package body ut_coverage_helper is
   begin
     if not g_develop_mode then
       g_is_started := false;
-      if get_coverage_type = ut_coverage.c_block_coverage then
+      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();
         $else
@@ -137,7 +137,7 @@ create or replace package body ut_coverage_helper is
   begin
     g_develop_mode := false;
     g_is_started := false;
-    if get_coverage_type = ut_coverage.c_block_coverage then
+    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();
         $else

diff --git a/source/core/coverage/ut_coverage_proftab.pkb b/source/core/coverage/ut_coverage_proftab.pkb
@@ -101,7 +101,7 @@ create or replace package body ut_coverage_proftab 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
@@ -141,28 +141,28 @@ create or replace package body ut_coverage_proftab 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;
 
-            if l_line_calls(line_no).calls > 0 then
+            if l_line_calls(l_line_no).calls > 0 then
               --total stats
               l_result.covered_lines := l_result.covered_lines + 1;
-              l_result.executions := l_result.executions + l_line_calls(line_no).calls;
+              l_result.executions := l_result.executions + l_line_calls(l_line_no).calls;
               --object level stats
               l_result.objects(l_source_object.full_name).covered_lines := l_result.objects(l_source_object.full_name).covered_lines + 1;
-              l_result.objects(l_source_object.full_name).executions := l_result.objects(l_source_object.full_name).executions + l_line_calls(line_no).calls;
-            elsif l_line_calls(line_no).calls = 0 then
+              l_result.objects(l_source_object.full_name).executions := l_result.objects(l_source_object.full_name).executions + l_line_calls(l_line_no).calls;
+            elsif l_line_calls(l_line_no).calls = 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;
             end if;
-            l_result.objects(l_source_object.full_name).lines(line_no).executions := l_line_calls(line_no).calls;
+            l_result.objects(l_source_object.full_name).lines(l_line_no).executions := l_line_calls(l_line_no).calls;
 
-            line_no := l_line_calls.next(line_no);
+            l_line_no := l_line_calls.next(l_line_no);
           end loop;
         end if;
       end if;

diff --git a/source/core/coverage/ut_proftab_helper.pkb b/source/core/coverage/ut_proftab_helper.pkb
@@ -54,11 +54,11 @@ create or replace package body ut_proftab_helper is
   end;
 
   function proftab_results(a_object_owner varchar2, a_object_name varchar2) return t_proftab_rows is
-   c_raw_coverage sys_refcursor;
+   l_raw_coverage sys_refcursor;
    l_coverage_rows t_proftab_rows;
    l_coverage_id integer := ut_coverage_helper.get_coverage_id;
   begin
-     open c_raw_coverage for q'[select d.line#,
+     open l_raw_coverage for q'[select d.line#,
         case when sum(d.total_occur) = 0 and sum(d.total_time) > 0 then 1 else sum(d.total_occur) end total_occur
         from plsql_profiler_units u
         join plsql_profiler_data d
@@ -70,9 +70,9 @@ create or replace package body ut_proftab_helper is
          and u.unit_type not in ('PACKAGE SPEC', 'TYPE SPEC', 'ANONYMOUS BLOCK')
        group by d.line#]' using l_coverage_id,a_object_owner,a_object_name;
 
-      FETCH c_raw_coverage BULK COLLECT
+      FETCH l_raw_coverage BULK COLLECT
          INTO l_coverage_rows;
-      CLOSE c_raw_coverage;
+      CLOSE l_raw_coverage;
 
       RETURN l_coverage_rows; 
   end;

diff --git a/source/reporters/ut_coverage_report_html_helper.pkb b/source/reporters/ut_coverage_report_html_helper.pkb
@@ -104,9 +104,9 @@ create or replace package body ut_coverage_report_html_helper is
   function get_index(a_coverage_data ut_coverage.t_coverage, a_assets_path varchar2, a_project_name varchar2 := null, a_command_line varchar2 := null, a_coverage_type varchar2 := null)
     return clob is
     l_result        clob;
-    l_coverage_type varchar2(32) := coalesce(a_coverage_type, ut_coverage.c_proftab_coverage);
+    l_coverage_type varchar2(32) := coalesce(a_coverage_type, ut_coverage.gc_proftab_coverage);
   begin
-    if l_coverage_type = ut_coverage.c_block_coverage then
+    if l_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
         l_result := ut_block_report_html_helper.get_index(a_coverage_data => a_coverage_data, a_assets_path => a_assets_path,a_project_name=>a_project_name,a_command_line=> a_command_line);
       $else