From 74985306f9f52b85bdc9ae69729ec402f02a3754 Mon Sep 17 00:00:00 2001 From: Blaine Carter Date: Tue, 1 Jun 2021 14:17:11 -0600 Subject: [PATCH 1/3] Replaced hard coded 0 in total test coverage with covered lines / total total lines. Rounding to 17 decimal places since that's what I found when looking at cobertura examples online. Used an rpad to generate the format mask to avoid having a long string of 9s. This was mentioned in #1107 but does not have an issue of its own. --- source/reporters/ut_coverage_cobertura_reporter.tpb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index d8aae7f7a..7bc8bfcd4 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -90,7 +90,9 @@ create or replace type body ut_coverage_cobertura_reporter is --write header ut_utils.append_to_list( l_result, - '' From 4e2b9f5f7b5ee5a39fac59a5fc20bb28f7c27d98 Mon Sep 17 00:00:00 2001 From: Blaine Carter Date: Tue, 7 Sep 2021 16:13:23 -0600 Subject: [PATCH 2/3] Fixed a divide by zero error. I introduced the error in the previous commit. To fix I added a l_lines_valid variable, used a case statement to check for 0 else return the calculation. I also replaced the lines_valid calculation to use the new variable to reduce code duplication. --- source/reporters/ut_coverage_cobertura_reporter.tpb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index 7bc8bfcd4..e34bca79b 100644 --- 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) := ''; c_package_footer constant varchar2(30) := ''; c_class_footer constant varchar2(30) := ''; - c_classes_footer constant varchar2(30) := ''; + c_classes_footer constant varchar2(30) := ''; c_lines_footer constant varchar2(30) := ''; 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 number := 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) ); @@ -91,10 +92,10 @@ create or replace type body ut_coverage_cobertura_reporter is ut_utils.append_to_list( l_result, '' ); From 581991b4127445f1846cc89823329f3c3309c396 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 15 Nov 2021 21:39:13 +0200 Subject: [PATCH 3/3] Fixed failing tests and improved coverage reporting --- source/reporters/ut_coverage_cobertura_reporter.tpb | 6 +++--- .../reporters/test_coverage/test_cov_cobertura_reporter.pkb | 2 +- .../reporters/test_coverage/test_coverage_standalone.pkb | 2 +- .../reporters/test_coverage/test_proftab_coverage.pkb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index e34bca79b..8ee6dd31a 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -82,7 +82,7 @@ create or replace type body ut_coverage_cobertura_reporter is c_classes_footer constant varchar2(30) := ''; c_lines_footer constant varchar2(30) := ''; 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 number := a_coverage_data.covered_lines + a_coverage_data.uncovered_lines; + 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) ); @@ -92,10 +92,10 @@ create or replace type body ut_coverage_cobertura_reporter is ut_utils.append_to_list( l_result, '' ); 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 index a18409463..2c36f37ba 100644 --- 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'[ - + ]'||l_file_path||q'[ diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb index d94108a32..e5706f885 100644 --- 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'[ - + ]'||l_file_path||q'[ diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb index 81a9a4c58..7256fc202 100644 --- 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'[ - + package body ut3_develop.{p}