Merge pull request #625 from lwasylow/feature/12cblockcoverage

lwasylow · web-flow · commit faab0fee4901 · 2018-04-03T23:24:45.000+01:00
12.2 coverage
diff --git a/source/api/ut.pkb b/source/api/ut.pkb
diff --git a/source/api/ut.pks b/source/api/ut.pks
@@ -49,74 +49,74 @@ create or replace package ut authid current_user as
 
   function run(
     a_reporter ut_reporter_base := null, a_color_console integer := 0,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   ) return ut_varchar2_rows pipelined;
 
   function run(
     a_reporter ut_reporter_base := null, a_color_console integer := 0,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   ) return ut_varchar2_rows pipelined;
 
   function run(
     a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console integer := 0,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   ) return ut_varchar2_rows pipelined;
 
   function run(
     a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console integer := 0,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   ) return ut_varchar2_rows pipelined;
 
   function run(
     a_path varchar2, a_reporter ut_reporter_base := null, a_color_console integer := 0,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   ) return ut_varchar2_rows pipelined;
 
   function run(
     a_path varchar2, a_reporter ut_reporter_base := null, a_color_console integer := 0,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   ) return ut_varchar2_rows pipelined;
 
   procedure run(
     a_reporter ut_reporter_base := null, a_color_console boolean := false,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   );
 
   procedure run(
     a_reporter ut_reporter_base := null, a_color_console boolean := false,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   );
 
   procedure run(
     a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console boolean := false,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   );
 
   procedure run(
     a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console boolean := false,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   );
 
   procedure run(
     a_path varchar2, a_reporter ut_reporter_base := null, a_color_console boolean := false,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   );
 
   procedure run(
     a_path varchar2, a_reporter ut_reporter_base := null, a_color_console boolean := false,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
+    a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_coverage_type varchar2:=null
   );
 
   /**
diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb
@@ -66,8 +66,8 @@ create or replace package body ut_runner is
 
   procedure run(
     a_paths ut_varchar2_list, a_reporters ut_reporters, a_color_console boolean := false,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2 := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false
+    a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false,a_coverage_type varchar2 := null
   ) is
     l_items_to_run ut_run;
     l_listener     ut_event_listener;
diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks
@@ -57,8 +57,9 @@ create or replace package ut_runner authid current_user is
   */
   procedure run(
     a_paths ut_varchar2_list, a_reporters ut_reporters, a_color_console boolean := false,
-    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2 := null , a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
-    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false
+    a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, 
+    a_fail_on_errors boolean default false, a_coverage_type varchar2 := null
   );
 
   /**
diff --git a/source/core/coverage/ut_block_coverage_helper.pkb b/source/core/coverage/ut_block_coverage_helper.pkb
@@ -1,4 +1,4 @@
-create or replace package body ut_block_helper is
+create or replace package body ut_block_coverage_helper is
   /*
   utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
diff --git a/source/core/coverage/ut_block_coverage_helper.pks b/source/core/coverage/ut_block_coverage_helper.pks
@@ -1,4 +1,4 @@
-create or replace package ut_block_helper authid definer is
+create or replace package ut_block_coverage_helper authid definer is
   /*
   utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
diff --git a/source/core/coverage/ut_coverage_block.pkb b/source/core/coverage/ut_coverage_block.pkb
@@ -104,7 +104,7 @@ create or replace package body ut_coverage_block is
       exit when l_source_objects_crsr%notfound;
     
       --get coverage data
-      l_line_calls := ut_block_helper.get_raw_coverage_data_block(l_source_object.owner, l_source_object.name);
+      l_line_calls := ut_block_coverage_helper.get_raw_coverage_data_block(l_source_object.owner, l_source_object.name);
     
       --if there is coverage, we need to filter out the garbage (badly indicated data)
       if l_line_calls.count > 0 then
diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb
@@ -70,9 +70,9 @@ create or replace package body ut_coverage_helper is
     set_coverage_type(a_coverage_type);
     if get_coverage_type = ut_coverage.c_block_coverage then
       $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
-       ut_block_helper.coverage_start(a_run_comment => a_run_comment ,a_coverage_id => g_coverage_id );
+       ut_block_coverage_helper.coverage_start(a_run_comment => a_run_comment ,a_coverage_id => g_coverage_id );
       $else
-       null;
+       raise_application_error(ut_utils.gc_invalid_coverage_type,'Invalid coverage type requested. Please validate your Oracle install');
       $end
     else
        ut_proftab_helper.coverage_start(a_run_comment => a_run_comment, a_coverage_id => g_coverage_id);
@@ -123,7 +123,7 @@ create or replace package body ut_coverage_helper is
       g_is_started := false;
       if get_coverage_type = ut_coverage.c_block_coverage then
         $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
-         ut_block_helper.coverage_stop();
+         ut_block_coverage_helper.coverage_stop();
         $else
          null;
         $end
@@ -139,7 +139,7 @@ create or replace package body ut_coverage_helper is
     g_is_started := false;
     if get_coverage_type = ut_coverage.c_block_coverage then
         $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
-         ut_block_helper.coverage_stop();
+         ut_block_coverage_helper.coverage_stop();
         $else
          null;
         $end
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -90,6 +90,11 @@ create or replace package ut_utils authid definer is
   gc_invalid_version_no constant pls_integer := -20214;
   pragma exception_init(ex_invalid_version_no, -20214);
 
+  -- Invalid coverage type
+  ex_invalid_coverage_type exception;
+  gc_invalid_coverage_type constant pls_integer := -20215;
+  pragma exception_init(ex_invalid_coverage_type, -20215);
+
   gc_max_storage_varchar2_len constant integer := 4000;
   gc_max_output_string_length constant integer := 4000;
   gc_max_input_string_length  constant integer := gc_max_output_string_length - 2; --we need to remove 2 chars for quotes around string
diff --git a/source/install.sql b/source/install.sql
@@ -127,14 +127,14 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
 --gathering coverage
 @@install_component.sql 'core/coverage/ut_coverage_sources_tmp.sql'
 @@install_component.sql 'core/coverage/ut_coverage_helper.pks'
-@@install_above_12_1.sql 'core/coverage/ut_block_helper.pks'
+@@install_above_12_1.sql 'core/coverage/ut_block_coverage_helper.pks'
 @@install_component.sql 'core/coverage/ut_proftab_helper.pks'
 @@install_component.sql 'core/coverage/ut_coverage.pks'
 @@install_above_12_1.sql 'core/coverage/ut_coverage_block.pks'
 @@install_component.sql 'core/coverage/ut_coverage_proftab.pks'
 @@install_component.sql 'core/coverage/ut_coverage_reporter_base.tps'
 @@install_component.sql 'core/coverage/ut_coverage_helper.pkb'
-@@install_above_12_1.sql 'core/coverage/ut_block_helper.pkb'
+@@install_above_12_1.sql 'core/coverage/ut_block_coverage_helper.pkb'
 @@install_component.sql 'core/coverage/ut_proftab_helper.pkb'
 @@install_component.sql 'core/coverage/ut_coverage.pkb'
 @@install_above_12_1.sql 'core/coverage/ut_coverage_block.pkb'
diff --git a/test/install_below_12_2.sql b/test/install_below_12_2.sql
@@ -0,0 +1,28 @@
+set termout off
+set echo off
+spool dummy.sql
+prompt whenever sqlerror exit failure rollback
+spool off
+
+
+def FILE_NAME = '&&1'
+column SCRIPT_NAME new_value SCRIPT_NAME noprint
+
+VAR V_FILE_NAME VARCHAR2(1000);
+begin
+  if dbms_db_version.version = 12 and dbms_db_version.release < 2
+     or dbms_db_version.version < 12
+  then
+    :V_FILE_NAME := '&&FILE_NAME';
+  else
+    :V_FILE_NAME := 'dummy.sql';
+  end if;
+end;
+/
+set verify off
+select :V_FILE_NAME as SCRIPT_NAME  from dual;
+set termout on
+
+
+@@&&SCRIPT_NAME
+
diff --git a/test/install_tests.sql b/test/install_tests.sql
@@ -27,6 +27,10 @@ whenever oserror exit failure rollback
 @@core/test_suite_manager.pks
 @@core/reporters/test_coverage.pks
 set define on
+@@install_below_12_2.sql 'core/reporters/test_not_existing_block.pks'
+@@install_below_12_2.sql 'core/reporters/test_not_existing_block.pkb'
+set define off
+set define on
 @@install_above_12_1.sql 'core/reporters/test_block_coverage.pks'
 @@install_above_12_1.sql 'core/reporters/test_coverage/test_html_block_reporter.pks'
 @@install_above_12_1.sql 'core/reporters/test_coverage/test_coveralls_reporter_block.pks'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-create or replace package body ut_block_helper is`
	`1`	`+create or replace package body ut_block_coverage_helper is`
`2`	`2`	`/*`
`3`	`3`	`utPLSQL - Version 3`
`4`	`4`	`Copyright 2016 - 2017 utPLSQL Project`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-create or replace package ut_block_helper authid definer is`
	`1`	`+create or replace package ut_block_coverage_helper authid definer is`
`2`	`2`	`/*`
`3`	`3`	`utPLSQL - Version 3`
`4`	`4`	`Copyright 2016 - 2017 utPLSQL Project`