Merge branch 'develop' into release/v3.1.11

jgebal · jgebal · commit 36279f9751e0 · 2021-11-17T00:25:38.000+02:00
# Conflicts:
#	docs/about/authors.md
#	docs/about/license.md
#	docs/about/project-details.md
#	docs/about/support.md
#	docs/index.md
#	docs/userguide/advanced_data_comparison.md
#	docs/userguide/annotations.md
#	docs/userguide/best-practices.md
#	docs/userguide/coverage.md
#	docs/userguide/exception-reporting.md
#	docs/userguide/expectations.md
#	docs/userguide/getting-started.md
#	docs/userguide/install.md
#	docs/userguide/querying_suites.md
#	docs/userguide/reporters.md
#	docs/userguide/running-unit-tests.md
#	docs/userguide/upgrade.md
#	source/core/ut_utils.pkb
#	source/core/ut_utils.pks
diff --git a/source/install.sql b/source/install.sql
@@ -165,9 +165,6 @@ create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_contex
 prompt Installing PLSQL profiler objects into &&ut3_owner schema
 @@core/coverage/proftab.sql
 
-prompt Installing PLSQL profiler objects into &&ut3_owner schema
-@@core/coverage/proftab.sql
-
 prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
 @@core/coverage/dbms_plssqlcode.sql
 
diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb
@@ -79,9 +79,10 @@ create or replace type body ut_coverage_cobertura_reporter is
       c_packages_footer constant varchar2(30) := '</packages>';
       c_package_footer  constant varchar2(30) := '</package>';
       c_class_footer    constant varchar2(30) := '</class>';
-      c_classes_footer    constant varchar2(30) := '</classes>';
+      c_classes_footer  constant varchar2(30) := '</classes>';
       c_lines_footer    constant varchar2(30) := '</lines>';
       l_epoch           varchar2(50) := (sysdate - to_date('01-01-1970 00:00:00', 'dd-mm-yyyy hh24:mi:ss')) * 24 * 60 * 60;
+      l_lines_valid     integer := a_coverage_data.covered_lines + a_coverage_data.uncovered_lines;
       begin
    
       ut_utils.append_to_list( l_result, ut_utils.get_xml_header(a_run.client_character_set) );
@@ -90,9 +91,11 @@ create or replace type body ut_coverage_cobertura_reporter is
       --write header
       ut_utils.append_to_list(
         l_result,
-        '<coverage line-rate="0" branch-rate="0.0" lines-covered="'
+        '<coverage line-rate="'
+          ||to_char(round((case l_lines_valid when 0 then 0 else a_coverage_data.covered_lines/(l_lines_valid) end), 17), rpad('FM0.0',20,'9') , 'NLS_NUMERIC_CHARACTERS=''. ''')
+          ||'" branch-rate="0.0" lines-covered="'
           ||a_coverage_data.covered_lines||'" lines-valid="'
-          ||TO_CHAR(a_coverage_data.covered_lines + a_coverage_data.uncovered_lines)
+          ||to_char(l_lines_valid)
           ||'" branches-covered="0" branches-valid="0" complexity="0" version="1" timestamp="'||l_epoch||'">'
       );
       
diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb
@@ -20,7 +20,7 @@ create or replace package body test_cov_cobertura_reporter is
     l_expected :=
     q'[<?xml version="1.0"?>
 <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<coverage line-rate="0" branch-rate="0.0" lines-covered="1" lines-valid="2" branches-covered="0" branches-valid="0" complexity="0" version="1" timestamp="%">
+<coverage line-rate="0.5" branch-rate="0.0" lines-covered="1" lines-valid="2" branches-covered="0" branches-valid="0" complexity="0" version="1" timestamp="%">
 <sources>
 <source>]'||l_file_path||q'[</source>
 </sources>
diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb
@@ -15,7 +15,7 @@ create or replace package body test_coverage_standalone is
     l_expected :=
       q'[<?xml version="1.0" encoding="]'||upper(a_charset)||q'["?>
 <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<coverage line-rate="0" branch-rate="0.0" lines-covered="2" lines-valid="2" branches-covered="0" branches-valid="0" complexity="0" version="1" timestamp="%">
+<coverage line-rate="1.0" branch-rate="0.0" lines-covered="2" lines-valid="2" branches-covered="0" branches-valid="0" complexity="0" version="1" timestamp="%">
 <sources>
 <source>]'||l_file_path||q'[</source>
 </sources>
diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb
@@ -164,7 +164,7 @@ create or replace package body test_proftab_coverage is
     l_expected :=
       q'[<?xml version="1.0"?>
 <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<coverage line-rate="0" branch-rate="0.0" lines-covered="0" lines-valid="9" branches-covered="0" branches-valid="0" complexity="0" version="1" timestamp="%">
+<coverage line-rate="0.0" branch-rate="0.0" lines-covered="0" lines-valid="9" branches-covered="0" branches-valid="0" complexity="0" version="1" timestamp="%">
 <sources>
 <source>package body ut3_develop.{p}</source>
 </sources>
