Update tests and fixed typo in original coverage reporter

lwasylow · lwasylow · commit 36279faf01b0 · 2018-04-10T20:19:50.000+01:00
diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb
@@ -177,6 +177,13 @@ create or replace package body ut_coverage_helper is
     g_coverage_id(g_coverage_type) := a_coverage_id;
   end;
 
+  procedure mock_coverage_id(a_coverage_id g_coverage_arr) is
+  begin
+    g_develop_mode := true;
+    g_is_started := true;
+    g_coverage_id := a_coverage_id;
+  end;
+  
   procedure insert_into_tmp_table(a_data t_coverage_sources_tmp_rows) is
   begin
     forall i in 1 .. a_data.count
diff --git a/source/core/coverage/ut_coverage_helper.pks b/source/core/coverage/ut_coverage_helper.pks
@@ -18,7 +18,6 @@ create or replace package ut_coverage_helper authid definer is
 
   type g_coverage_arr is table of integer index by varchar2(30);
   g_coverage_id g_coverage_arr;
-  --g_coverage_id  integer;
   g_coverage_type varchar2(32);
   
   function get_coverage_type return varchar2;
@@ -86,6 +85,8 @@ create or replace package ut_coverage_helper authid definer is
   * Used internally, only for unit testing of the framework only
   */
   procedure mock_coverage_id(a_coverage_id integer);
+  
+  procedure mock_coverage_id(a_coverage_id g_coverage_arr);
 
   procedure insert_into_tmp_table(a_data t_coverage_sources_tmp_rows);
 
diff --git a/test/core/reporters/test_coverage/test_html_extended_reporter.pkb b/test/core/reporters/test_coverage/test_html_extended_reporter.pkb
@@ -0,0 +1,28 @@
+create or replace package body test_html_extended_reporter is
+
+  procedure report_on_file is
+    l_results   ut3.ut_varchar2_list;
+    l_expected  varchar2(32767);
+    l_actual    clob;
+  begin
+    --Arrange
+    l_expected := '%<h3>UT3.DUMMY_COVERAGE</h3>%<b>4</b> relevant lines. <span class="green"><b>3</b> lines covered</span> (including <span class="yellow"><b>1</b> lines partially covered</span> ) and <span class="red"><b>1</b> lines missed%';
+    
+    select *
+      bulk collect into l_results
+      from table(
+        ut3.ut.run(
+          a_path => 'ut3.test_dummy_coverage',
+          a_reporter=> ut3.ut_coverage_html_reporter(),
+          a_coverage_type => 'extended',
+          a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ),
+          a_test_files => ut3.ut_varchar2_list( )
+        )
+      );
+    l_actual := ut3.ut_utils.table_to_clob(l_results);
+    --Assert
+    ut.expect(l_actual).to_be_like(l_expected);
+  end;
+
+end test_html_extended_reporter;
+/
diff --git a/test/core/reporters/test_coverage/test_html_extended_reporter.pks b/test/core/reporters/test_coverage/test_html_extended_reporter.pks
@@ -0,0 +1,10 @@
+create or replace package test_html_extended_reporter is
+
+  --%suite(ut_html_extended_reporter)
+  --%suitepath(utplsql.core.reporters.test_extended_coverage)
+
+  --%test(reports on a project file mapped to database object in extended profiler coverage)
+  procedure report_on_file;
+
+end test_html_extended_reporter;
+/
diff --git a/test/core/reporters/test_coverage/test_html_proftab_reporter.pkb b/test/core/reporters/test_coverage/test_html_proftab_reporter.pkb
@@ -6,7 +6,7 @@ create or replace package body test_html_proftab_reporter is
     l_actual    clob;
   begin
     --Arrange
-    l_expected := '%<h3>UT3.DUMMY_COVERAGE</h3>%<b>3</b> relevant lines. <span class="green"><b>2</b> lines covered</span> ) and <span class="red"><b>1</b> lines missed%';
+    l_expected := '%<h3>UT3.DUMMY_COVERAGE</h3>%<b>3</b> relevant lines. <span class="green"><b>2</b> lines covered</span>  and <span class="red"><b>1</b> lines missed%';
     
     --l_expected := '%<div class="header"> <h3>UT3.DUMMY_COVERAGE</h3><h4><span class="green">66%</span> lines covered</h4><div> <b>3</b> relevant lines. <span class="green"><b>2</b> lines covered</span> ) and <span class="red"><b>1</b> lines missed</span></div></div>%';
     --Act
diff --git a/test/install_tests.sql b/test/install_tests.sql
@@ -36,6 +36,8 @@ set define on
 @@install_above_12_1.sql 'core/reporters/test_coverage/test_coveralls_reporter_block.pks'
 @@install_above_12_1.sql 'core/reporters/test_coverage/test_coverage_sonar_rprt_blk.pks'
 @@install_above_12_1.sql 'core/reporters/test_coverage/test_cov_cobertura_rptr_blk.pks'
+@@install_above_12_1.sql 'core/reporters/test_extended_coverage.pks'
+@@install_above_12_1.sql 'core/reporters/test_coverage/test_html_extended_reporter.pks'
 set define off
 @@core/reporters/test_coverage/test_coverage_sonar_reporter.pks
 @@core/reporters/test_coverage/test_coveralls_reporter.pks
@@ -81,6 +83,8 @@ set define on
 @@install_above_12_1.sql 'core/reporters/test_coverage/test_coveralls_reporter_block.pkb'
 @@install_above_12_1.sql 'core/reporters/test_coverage/test_coverage_sonar_rprt_blk.pkb'
 @@install_above_12_1.sql 'core/reporters/test_coverage/test_cov_cobertura_rptr_blk.pkb'
+@@install_above_12_1.sql 'core/reporters/test_extended_coverage.pkb'
+@@install_above_12_1.sql 'core/reporters/test_coverage/test_html_extended_reporter.pkb'
 set define off
 @@core/reporters/test_xunit_reporter.pkb
 @@core/reporters/test_tfs_junit_reporter.pkb
