utPLSQL · lwasylow · Apr 16, 2018 · Mar 11, 2018 · Mar 13, 2018 · Mar 13, 2018
diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md
@@ -29,7 +29,7 @@ If you have `execute` privilege on the code that are tested, but do not have `cr
 If you have `execute` privilege only on the unit tests, but do not have `execute` privilege on the code that is tested, the code will not be reported by coverage - as if it did not exist in the database.
 If the code that is testes is complied as NATIVE, the code coverage will not be reported as well.
 
-## Running unite tests with coverage
+## Running unit tests with coverage
 Using code coverage functionality is as easy as using any other [reporter](reporters.md) for utPLSQL project. All you need to do is run your tests from your preferred SQL tool and save the outcomes of reporter to a file.
 All you need to do, is pass the constructor of the reporter to your `ut.run`
 
@@ -40,6 +40,8 @@ begin
 end;
 /
 ```
+
+
 Executes all unit tests in current schema, gather information about code coverage and output the html text into DBMS_OUTPUT.
 The `ut_coverage_html_reporter` will produce a interactive HTML report. You may see a sample of code coverage for utPLSQL project [here](https://utplsql.github.io/utPLSQL-coverage-html/)
 
@@ -52,6 +54,20 @@ The report allow to navigate to every source and inspect line by line coverage.
 ![Coverage Details page](../images/coverage_html_details.png)
 
 
+#### Oracle 12.2 block coverage.
+In Oracle 12.2 new functionality was released which supports native [block coverage](https://docs.oracle.com/en/database/oracle/oracle-database/12.2/arpls/DBMS_PLSQL_CODE_COVERAGE.html#GUID-55A9E502-9EC2-4118-B292-DC79E6DC465E).
+This has been enabled in utPLSQL code coverage as a separate option. It can be invoked by passing a argument a_coverage_type with value 'block'. By default profiler option is enabled ('proftab').
+
+Example:
+```sql
+begin
+  ut.run(ut_coverage_html_reporter(),a_coverage_type => 'block');
+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.
+
 ## Coverage reporting options
 By default the database schema/schemes containing the tests that were executed during the run, are fully reported by coverage reporter.
 All valid unit tests are excluded from the report regardless if they were invoked or not. This way the coverage report is not affected by presence of tests and contains only the tested code.

diff --git a/source/api/ut.pkb b/source/api/ut.pkb
@@ -106,29 +106,29 @@ create or replace package body ut is
 
   procedure run_autonomous(
     a_paths ut_varchar2_list, a_reporter ut_reporter_base, a_color_console integer,
-    a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings, a_test_file_mappings ut_file_mappings,
+    a_coverage_schemes ut_varchar2_list := null,a_coverage_type varchar2:=null, a_source_file_mappings ut_file_mappings, a_test_file_mappings ut_file_mappings,
     a_include_objects ut_varchar2_list, a_exclude_objects ut_varchar2_list
   ) is
     pragma autonomous_transaction;
   begin
     ut_runner.run(
       a_paths, ut_reporters(coalesce(a_reporter,ut_documentation_reporter())),
-      ut_utils.int_to_boolean(a_color_console), a_coverage_schemes,
+      ut_utils.int_to_boolean(a_color_console), a_coverage_schemes,a_coverage_type,
       a_source_file_mappings, a_test_file_mappings, a_include_objects, a_exclude_objects
     );
     rollback;
   end;
 
   procedure run_autonomous(
     a_paths ut_varchar2_list, a_reporter ut_reporter_base, a_color_console integer,
-    a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    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, a_exclude_objects ut_varchar2_list
   ) is
     pragma autonomous_transaction;
   begin
     ut_runner.run(
       a_paths, ut_reporters(coalesce(a_reporter,ut_documentation_reporter())),
-      ut_utils.int_to_boolean(a_color_console), a_coverage_schemes,
+      ut_utils.int_to_boolean(a_color_console), a_coverage_schemes,a_coverage_type,
       ut_file_mapper.build_file_mappings(a_source_files),
       ut_file_mapper.build_file_mappings(a_test_files),
       a_include_objects, a_exclude_objects
@@ -138,7 +138,7 @@ create or replace package body ut is
 
   function run(
     a_reporter ut_reporter_base := null, a_color_console integer := 0,
-    a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    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
   ) return ut_varchar2_rows pipelined is
     l_reporter  ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
@@ -148,7 +148,7 @@ create or replace package body ut is
   begin
     run_autonomous(
       l_paths, l_reporter, a_color_console,
-      a_coverage_schemes, a_source_file_mappings, a_test_file_mappings, a_include_objects, a_exclude_objects
+      a_coverage_schemes,a_coverage_type, a_source_file_mappings, a_test_file_mappings, a_include_objects, a_exclude_objects
     );
     if l_reporter is of (ut_output_reporter_base) then
       l_lines := treat(l_reporter as ut_output_reporter_base).get_lines_cursor();
@@ -165,7 +165,7 @@ create or replace package body ut is
 
   function run(
     a_reporter ut_reporter_base := null, a_color_console integer := 0,
-    a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    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
   ) return ut_varchar2_rows pipelined is
     l_reporter  ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
@@ -174,7 +174,7 @@ create or replace package body ut is
     l_line      varchar2(4000);
   begin
     run_autonomous(
-      l_paths, l_reporter, a_color_console, a_coverage_schemes, a_source_files, a_test_files,
+      l_paths, l_reporter, a_color_console, a_coverage_schemes,a_coverage_type, a_source_files, a_test_files,
       a_include_objects, a_exclude_objects
     );
     if l_reporter is of (ut_output_reporter_base) then
@@ -192,15 +192,15 @@ create or replace package body ut is
 
   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_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    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
   ) return ut_varchar2_rows pipelined is
     l_reporter  ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
     l_lines     sys_refcursor;
     l_line      varchar2(4000);
   begin
     run_autonomous(
-      a_paths, l_reporter, a_color_console, a_coverage_schemes, a_source_file_mappings, a_test_file_mappings,
+      a_paths, l_reporter, a_color_console, a_coverage_schemes,a_coverage_type, a_source_file_mappings, a_test_file_mappings,
       a_include_objects, a_exclude_objects
     );
     if l_reporter is of (ut_output_reporter_base) then
@@ -218,15 +218,15 @@ create or replace package body ut is
 
   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_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    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
   ) return ut_varchar2_rows pipelined is
     l_reporter  ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
     l_lines     sys_refcursor;
     l_line      varchar2(4000);
   begin
     run_autonomous(
-      a_paths, l_reporter, a_color_console, a_coverage_schemes, a_source_files, a_test_files,
+      a_paths, l_reporter, a_color_console, a_coverage_schemes,a_coverage_type, a_source_files, a_test_files,
       a_include_objects, a_exclude_objects
     );
     if l_reporter is of (ut_output_reporter_base) then
@@ -244,7 +244,7 @@ create or replace package body ut is
 
   function run(
     a_path varchar2, a_reporter ut_reporter_base := null, a_color_console integer := 0,
-    a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    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
   ) return ut_varchar2_rows pipelined is
     l_reporter  ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
@@ -253,7 +253,7 @@ create or replace package body ut is
     l_line      varchar2(4000);
   begin
     run_autonomous(
-      l_paths, l_reporter, a_color_console, a_coverage_schemes, a_source_file_mappings, a_test_file_mappings,
+      l_paths, l_reporter, a_color_console, a_coverage_schemes,a_coverage_type, a_source_file_mappings, a_test_file_mappings,
       a_include_objects, a_exclude_objects
     );
     if l_reporter is of (ut_output_reporter_base) then
@@ -271,7 +271,7 @@ create or replace package body ut is
 
   function run(
     a_path varchar2, a_reporter ut_reporter_base := null, a_color_console integer := 0,
-    a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    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
   ) return ut_varchar2_rows pipelined is
     l_reporter  ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
@@ -280,7 +280,7 @@ create or replace package body ut is
     l_line      varchar2(4000);
   begin
     run_autonomous(
-      l_paths, l_reporter, a_color_console, a_coverage_schemes, a_source_files, a_test_files,
+      l_paths, l_reporter, a_color_console, a_coverage_schemes,a_coverage_type, a_source_files, a_test_files,
       a_include_objects, a_exclude_objects
     );
     if l_reporter is of (ut_output_reporter_base) then
@@ -298,13 +298,13 @@ create or replace package body ut is
 
   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_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
+    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
   ) is
     l_reporter  ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
   begin
     run_autonomous(
-      a_paths, l_reporter, ut_utils.boolean_to_int(a_color_console), a_coverage_schemes, a_source_file_mappings, a_test_file_mappings,
+      a_paths, l_reporter, ut_utils.boolean_to_int(a_color_console), a_coverage_schemes,a_coverage_type, a_source_file_mappings, a_test_file_mappings,
       a_include_objects, a_exclude_objects
     );
     if l_reporter is of (ut_output_reporter_base) then
@@ -315,13 +315,13 @@ create or replace package body ut is
 
   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_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    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
   ) is
     l_reporter  ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
   begin
     run_autonomous(
-      a_paths, l_reporter, ut_utils.boolean_to_int(a_color_console), a_coverage_schemes, a_source_files, a_test_files,
+      a_paths, l_reporter, ut_utils.boolean_to_int(a_color_console), a_coverage_schemes,a_coverage_type, a_source_files, a_test_files,
       a_include_objects, a_exclude_objects
     );
     if l_reporter is of (ut_output_reporter_base) then
@@ -332,50 +332,50 @@ create or replace package body ut is
 
   procedure run(
     a_reporter ut_reporter_base := null, a_color_console boolean := 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_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
   ) is
   begin
     ut.run(
       ut_varchar2_list(sys_context('userenv', 'current_schema')), a_reporter, a_color_console,
-      a_coverage_schemes, a_source_file_mappings, a_test_file_mappings, a_include_objects, a_exclude_objects
+      a_coverage_schemes,a_coverage_type, a_source_file_mappings, a_test_file_mappings, a_include_objects, a_exclude_objects
     );
   end;
 
   procedure run(
     a_reporter ut_reporter_base := null, a_color_console boolean := false,
-    a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    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
   ) is
   begin
     ut.run(
       ut_varchar2_list(sys_context('userenv', 'current_schema')), a_reporter, a_color_console,
-      a_coverage_schemes, a_source_files, a_test_files, a_include_objects, a_exclude_objects
+      a_coverage_schemes,a_coverage_type, a_source_files, a_test_files, a_include_objects, a_exclude_objects
     );
   end;
 
   procedure run(
     a_path varchar2, a_reporter ut_reporter_base := null, a_color_console boolean := 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_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
   ) is
     l_paths  ut_varchar2_list := ut_varchar2_list(coalesce(a_path, sys_context('userenv', 'current_schema')));
   begin
     ut.run(
-      l_paths, a_reporter, a_color_console, a_coverage_schemes, a_source_file_mappings, a_test_file_mappings,
+      l_paths, a_reporter, a_color_console, a_coverage_schemes,a_coverage_type, a_source_file_mappings, a_test_file_mappings,
       a_include_objects, a_exclude_objects
     );
   end;
 
   procedure run(
     a_path varchar2, a_reporter ut_reporter_base := null, a_color_console boolean := false,
-    a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
+    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
   ) is
     l_paths  ut_varchar2_list := ut_varchar2_list(coalesce(a_path, sys_context('userenv', 'current_schema')));
   begin
     ut.run(
-      l_paths, a_reporter, a_color_console, a_coverage_schemes, a_source_files, a_test_files,
+      l_paths, a_reporter, a_color_console, a_coverage_schemes,a_coverage_type, a_source_files, a_test_files,
       a_include_objects, a_exclude_objects
     );
   end;