Added 12.2 coverage

lwasylow · lwasylow · commit 90858ebb8ac7 · 2018-03-14T19:26:51.000Z
Fixes to cycle dependancies
diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb
@@ -19,16 +19,6 @@ create or replace package body ut_coverage is
   
   type t_source_lines is table of binary_integer;
 
-  procedure set_coverage_type(a_coverage_type in varchar2) is
-  begin
-    g_coverage_type := a_coverage_type;
-  end;
-
-  function get_coverage_type return varchar2 is
-  begin
-    return g_coverage_type;
-  end;
-  
   -- The source query has two important transformations done in it.
   -- the flag: to_be_skipped ='Y' is set for a line of code that is badly reported by DBMS_PROFILER as executed 0 times.
   -- This includes lines that are:
@@ -159,15 +149,13 @@ create or replace package body ut_coverage is
   procedure coverage_start(a_coverage_options ut_coverage_options default null) is
     l_coverage_type varchar2(10) := coalesce(a_coverage_options.coverage_type, 'proftab');
   begin
-    set_coverage_type(a_coverage_type => l_coverage_type);
-    ut_coverage_helper.coverage_start('utPLSQL Code coverage run '||ut_utils.to_string(systimestamp));
+    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, 'proftab');
   begin
-    set_coverage_type(a_coverage_type => l_coverage_type);
-    ut_coverage_helper.coverage_start_develop();
+    ut_coverage_helper.coverage_start_develop(l_coverage_type);
   end;
 
   procedure coverage_pause is
@@ -404,7 +392,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 get_coverage_type = 'block' then
+    if a_coverage_options.coverage_type = 'block' then
       return get_coverage_data_block(a_coverage_options => a_coverage_options);
     else
       return get_coverage_data_profiler(a_coverage_options => a_coverage_options);
diff --git a/source/core/coverage/ut_coverage.pks b/source/core/coverage/ut_coverage.pks
@@ -58,10 +58,6 @@ create or replace package ut_coverage authid current_user is
     ,uncovered_blocks  binary_integer default null
     ,executions        number(38, 0) := 0
     ,objects           tt_program_units);
-
-  g_coverage_type varchar2(32);
-
-  function get_coverage_type return varchar2;
   
   procedure coverage_start(a_coverage_options ut_coverage_options default null);
 
diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb
@@ -35,17 +35,28 @@ create or replace package body ut_coverage_helper is
   
   type t_block_rows is table of t_block_row;
 
+  procedure set_coverage_type(a_coverage_type in varchar2) is
+  begin
+    g_coverage_type := a_coverage_type;
+  end;
+
+  function get_coverage_type return varchar2 is
+  begin
+    return g_coverage_type;
+  end;
+
   function is_develop_mode return boolean is
   begin
     return g_develop_mode;
   end;
 
-  procedure coverage_start_internal(a_run_comment varchar2)  is
+  procedure coverage_start_internal(a_run_comment varchar2,a_coverage_type in varchar2)  is
   --l_start_block varchar2(32767):= 'call dbms_plsql_code_coverage.start_coverage(run_comment => :a_run_comment)
   --                               into :g_coverage_id';
   begin
+    set_coverage_type(a_coverage_type);
     -- Make it dynamic to allow for block coverage.
-    if ut_coverage.get_coverage_type = 'block' then
+    if get_coverage_type = 'block' then
        --execute immediate l_start_block USING IN a_run_comment, OUT g_coverage_id;
        g_coverage_id := dbms_plsql_code_coverage.start_coverage(run_comment => a_run_comment);
     else
@@ -55,27 +66,27 @@ create or replace package body ut_coverage_helper is
     g_is_started := true;
   end;
 
-  procedure coverage_start(a_run_comment varchar2) is
+  procedure coverage_start(a_run_comment varchar2,a_coverage_type in varchar2) is
   begin
     if not g_is_started then
       g_develop_mode := false;
-      coverage_start_internal(a_run_comment);
+      coverage_start_internal(a_run_comment,a_coverage_type);
     end if;
   end;
 
-  procedure coverage_start_develop is
+  procedure coverage_start_develop(a_coverage_type in varchar2) is
   begin
     if not g_is_started then
       g_develop_mode := true;
-      coverage_start_internal('utPLSQL Code coverage run in development MODE '||ut_utils.to_string(systimestamp));
+      coverage_start_internal('utPLSQL Code coverage run in development MODE '||ut_utils.to_string(systimestamp),a_coverage_type);
     end if;
   end;
 
   procedure coverage_pause is
     l_return_code binary_integer;
   begin
     if not g_develop_mode then
-      if ut_coverage.get_coverage_type = 'block' then
+      if get_coverage_type = 'block' then
          null;
       else
          l_return_code := dbms_profiler.pause_profiler();
@@ -86,7 +97,7 @@ create or replace package body ut_coverage_helper is
   procedure coverage_resume is
     l_return_code binary_integer;
   begin
-    if ut_coverage.get_coverage_type = 'block' then
+    if get_coverage_type = 'block' then
        null;
     else
        l_return_code := dbms_profiler.resume_profiler();
@@ -97,7 +108,7 @@ create or replace package body ut_coverage_helper is
   begin
     if not g_develop_mode then
       g_is_started := false;
-      if ut_coverage.get_coverage_type = 'block' then
+      if get_coverage_type = 'block' then
          dbms_plsql_code_coverage.stop_coverage;
       else
          dbms_profiler.stop_profiler();
@@ -109,7 +120,7 @@ create or replace package body ut_coverage_helper is
   begin
     g_develop_mode := false;
     g_is_started := false;
-    if ut_coverage.get_coverage_type = 'block' then
+    if get_coverage_type = 'block' then
        null;
     else
        dbms_profiler.stop_profiler();
diff --git a/source/core/coverage/ut_coverage_helper.pks b/source/core/coverage/ut_coverage_helper.pks
@@ -16,6 +16,13 @@ create or replace package ut_coverage_helper authid definer is
   limitations under the License.
   */
 
+
+  g_coverage_type varchar2(32);
+
+  function get_coverage_type return varchar2;
+  
+  procedure set_coverage_type(a_coverage_type in varchar2);
+  
   --table of line calls indexed by line number
   --!!! this table is sparse!!!
   --type t_unit_line_calls is table of number(38,0) index by binary_integer;
@@ -51,12 +58,12 @@ create or replace package ut_coverage_helper authid definer is
 
   function  is_develop_mode return boolean;
 
-  procedure coverage_start(a_run_comment varchar2);
+  procedure coverage_start(a_run_comment in varchar2,a_coverage_type in varchar2);
 
   /*
   * Start coverage in develop mode, where all internal calls to utPLSQL itself are also included
   */
-  procedure coverage_start_develop;
+  procedure coverage_start_develop(a_coverage_type in varchar2);
 
   procedure coverage_stop;
 
