Applied fixes to code.

lwasylow · lwasylow · commit 94cb49e805ee · 2018-03-01T21:55:44.000Z
diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql
@@ -53,6 +53,7 @@ grant execute on &&ut3_owner..ut_documentation_reporter to public;
 grant execute on &&ut3_owner..ut_coverage_html_reporter to public;
 grant execute on &&ut3_owner..ut_coverage_sonar_reporter to public;
 grant execute on &&ut3_owner..ut_coveralls_reporter to public;
+grant execute on &&ut3_owner..ut_coverage_cobertura_reporter to public;
 grant execute on &&ut3_owner..ut_reporters to public;
 grant execute on &&ut3_owner..ut_varchar2_list to public;
 grant execute on &&ut3_owner..ut_varchar2_rows to public;
@@ -107,7 +108,7 @@ create public synonym ut_documentation_reporter for &&ut3_owner..ut_documentatio
 create public synonym ut_coverage_html_reporter for &&ut3_owner..ut_coverage_html_reporter;
 create public synonym ut_coverage_sonar_reporter for &&ut3_owner..ut_coverage_sonar_reporter;
 create public synonym ut_coveralls_reporter for &&ut3_owner..ut_coveralls_reporter;
-create public synonym ut_coverage_cob_reporter for &&ut3_owner..ut_coverage_cob_reporter;
+create public synonym ut_coverage_cobertura_reporter for &&ut3_owner..ut_coverage_cobertura_reporter;
 create public synonym ut_reporters for &&ut3_owner..ut_reporters;
 create public synonym ut_varchar2_list for &&ut3_owner..ut_varchar2_list;
 create public synonym ut_varchar2_rows for &&ut3_owner..ut_varchar2_rows;
diff --git a/source/create_synonyms_and_grants_for_user.sql b/source/create_synonyms_and_grants_for_user.sql
@@ -73,6 +73,7 @@ grant execute on &&ut3_owner..ut_documentation_reporter to &ut3_user;
 grant execute on &&ut3_owner..ut_coverage_html_reporter to &ut3_user;
 grant execute on &&ut3_owner..ut_coverage_sonar_reporter to &ut3_user;
 grant execute on &&ut3_owner..ut_coveralls_reporter to &ut3_user;
+grant execute on &&ut3_owner..ut_coverage_cobertura_reporter to &ut3_user;
 grant execute on &&ut3_owner..ut_reporters to &ut3_user;
 grant execute on &&ut3_owner..ut_varchar2_list to &ut3_user;
 grant execute on &&ut3_owner..ut_varchar2_rows to &ut3_user;
@@ -126,7 +127,7 @@ create or replace synonym &ut3_user..ut_documentation_reporter for &&ut3_owner..
 create or replace synonym &ut3_user..ut_coverage_html_reporter for &&ut3_owner..ut_coverage_html_reporter;
 create or replace synonym &ut3_user..ut_coverage_sonar_reporter for &&ut3_owner..ut_coverage_sonar_reporter;
 create or replace synonym &ut3_user..ut_coveralls_reporter for &&ut3_owner..ut_coveralls_reporter;
-create or replace synonym &ut3_user..ut_coverage_cob_reporter for &&ut3_owner..ut_coverage_cob_reporter;
+create or replace synonym &ut3_user..ut_coverage_cobertura_reporter for &&ut3_owner..ut_coverage_cobertura_reporter;
 create or replace synonym &ut3_user..ut_reporters for &&ut3_owner..ut_reporters;
 create or replace synonym &ut3_user..ut_varchar2_list for &&ut3_owner..ut_varchar2_list;
 create or replace synonym &ut3_user..ut_varchar2_rows for &&ut3_owner..ut_varchar2_rows;
diff --git a/source/install.sql b/source/install.sql
@@ -240,8 +240,8 @@ prompt Installing PLSQL profiler objects into &&ut3_owner schema
 @@install_component.sql 'reporters/ut_coverage_sonar_reporter.tpb'
 @@install_component.sql 'reporters/ut_coveralls_reporter.tps'
 @@install_component.sql 'reporters/ut_coveralls_reporter.tpb'
-@@install_component.sql 'reporters/ut_coverage_cob_reporter.tps'
-@@install_component.sql 'reporters/ut_coverage_cob_reporter.tpb'
+@@install_component.sql 'reporters/ut_coverage_cobertura_reporter.tps'
+@@install_component.sql 'reporters/ut_coverage_cobertura_reporter.tpb'
 
 @@install_component.sql 'api/be_between.syn'
 @@install_component.sql 'api/be_empty.syn'
diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb
@@ -1,6 +1,6 @@
-create or replace type body ut_coverage_cob_reporter is
+create or replace type body ut_coverage_cobertura_reporter is
   /*
-  utPLSQL - Version v3.0.4.1372
+  utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
 
   Licensed under the Apache License, Version 2.0 (the "License"):
@@ -16,16 +16,16 @@ create or replace type body ut_coverage_cob_reporter is
   limitations under the License.
   */
 
-  constructor function ut_coverage_cob_reporter(
-    self in out nocopy ut_coverage_cob_reporter
+  constructor function ut_coverage_cobertura_reporter(
+    self in out nocopy ut_coverage_cobertura_reporter
   ) return self as result is
   begin
     self.init($$plsql_unit);
     return;
   end;
 
 
-  overriding member procedure after_calling_run(self in out nocopy ut_coverage_cob_reporter, a_run in ut_run) as
+  overriding member procedure after_calling_run(self in out nocopy ut_coverage_cobertura_reporter, a_run in ut_run) as
     l_report_lines  ut_varchar2_list;
     l_coverage_data ut_coverage.t_coverage;
     
@@ -61,6 +61,7 @@ create or replace type body ut_coverage_cob_reporter is
       l_file_part            varchar2(32767);
       l_result               clob;
       l_unit                 ut_coverage.t_full_name;
+      l_obj_name             ut_coverage.t_object_name;
       c_coverage_def constant varchar2(200) := '<?xml version="1.0"?>'||CHR(10)||'<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">'||chr(10);
       c_file_footer     constant varchar2(30) := '</file>'||chr(10);
       c_coverage_footer constant varchar2(30) := '</coverage>';
@@ -69,16 +70,9 @@ create or replace type body ut_coverage_cob_reporter is
       c_package_footer  constant varchar2(30) := '</package>'||chr(10);
       c_class_footer  constant varchar2(30) := '</class>'||chr(10);
       c_lines_footer  constant varchar2(30) := '</lines>'||chr(10);
-      l_epoch         varchar2(50);
+      l_epoch         varchar2(50) := (sysdate - to_date('01-01-1970 00:00:00', 'dd-mm-yyyy hh24:mi:ss')) * 24 * 60 * 60;
       begin
-      
-      select 
-      (sysdate - to_date('01-01-1970 00:00:00', 'dd-mm-yyyy hh24:mi:ss')) * 24 * 60 * 60 
-      into l_epoch
-      from dual;
-
-
-      
+   
       dbms_lob.createtemporary(l_result,true);
 
       ut_utils.append_to_clob(l_result, c_coverage_def);
@@ -106,10 +100,11 @@ create or replace type body ut_coverage_cob_reporter is
       ut_utils.append_to_clob(l_result, l_file_part);
                  
       while l_unit is not null loop
-        l_file_part := '<package name="'||dbms_xmlgen.convert(l_unit)||'" line-rate="0.0" branch-rate="0.0" complexity="0.0">'||CHR(10);
+        l_obj_name := a_coverage_data.objects(l_unit).name;
+        l_file_part := '<package name="'||dbms_xmlgen.convert(l_obj_name)||'" line-rate="0.0" branch-rate="0.0" complexity="0.0">'||CHR(10);
         ut_utils.append_to_clob(l_result, l_file_part);
         
-        l_file_part := '<class name="'||dbms_xmlgen.convert(l_unit)||'" filename="'||dbms_xmlgen.convert(l_unit)||'" line-rate="0.0" branch-rate="0.0" complexity="0.0">'||CHR(10);
+        l_file_part := '<class name="'||dbms_xmlgen.convert(l_obj_name)||'" filename="'||dbms_xmlgen.convert(l_unit)||'" line-rate="0.0" branch-rate="0.0" complexity="0.0">'||CHR(10);
         ut_utils.append_to_clob(l_result, l_file_part);
         
         l_file_part := '<lines>'||CHR(10);
diff --git a/source/reporters/ut_coverage_cobertura_reporter.tps b/source/reporters/ut_coverage_cobertura_reporter.tps
@@ -1,6 +1,6 @@
-create or replace type ut_coverage_cob_reporter under ut_coverage_reporter_base(
+create or replace type ut_coverage_cobertura_reporter under ut_coverage_reporter_base(
   /*
-  utPLSQL - Version v3.0.4.1372
+  utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
 
   Licensed under the Apache License, Version 2.0 (the "License"):
@@ -16,10 +16,11 @@ create or replace type ut_coverage_cob_reporter under ut_coverage_reporter_base(
   limitations under the License.
   */
 
-  constructor function ut_coverage_cob_reporter(
-    self in out nocopy ut_coverage_cob_reporter
+  constructor function ut_coverage_cobertura_reporter(
+    self in out nocopy ut_coverage_cobertura_reporter
   ) return self as result,
 
-  overriding member procedure after_calling_run(self in out nocopy ut_coverage_cob_reporter, a_run in ut_run)
+  overriding member procedure after_calling_run(self in out nocopy ut_coverage_cobertura_reporter, a_run in ut_run)
 )
 /
+
diff --git a/source/uninstall.sql b/source/uninstall.sql
@@ -1,5 +1,5 @@
 /*
-  utPLSQL - Version v3.0.4.1372
+  utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
 
   Licensed under the Apache License, Version 2.0 (the "License"):
@@ -56,7 +56,7 @@ drop type ut_coveralls_reporter force;
 
 drop type ut_coverage_sonar_reporter force;
 
-drop type ut_coverage_cob_reporter force;
+drop type ut_coverage_cobertura_reporter force;
 
 drop package ut_coverage_report_html_helper;
 
@@ -295,4 +295,4 @@ end;
 
 spool off
 
-exit;
+exit;
diff --git a/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pkb
@@ -1,4 +1,4 @@
-create or replace package body test_coverage_cob_reporter is
+create or replace package body test_cov_cobertura_reporter is
 
   procedure report_on_file is
     l_results   ut3.ut_varchar2_list;
@@ -14,7 +14,7 @@ create or replace package body test_coverage_cob_reporter is
 </sources>
 <packages>
 <package name="test/ut3.dummy_coverage.pkb" line-rate="0.0" branch-rate="0.0" complexity="0.0">
-<class name="test/ut3.dummy_coverage.pkb" filename="test/ut3.dummy_coverage.pkb" line-rate="0.0" branch-rate="0.0" complexity="0.0">
+<class name="ut3.dummy_coverage" filename="test/ut3.dummy_coverage.pkb" line-rate="0.0" branch-rate="0.0" complexity="0.0">
 <lines>
 <line number="4" hits="1" branch="false"/>
 <line number="5" hits="0" branch="false"/>
@@ -30,7 +30,7 @@ create or replace package body test_coverage_cob_reporter is
       from table(
         ut3.ut.run(
           a_path => 'ut3.test_dummy_coverage',
-          a_reporter=> ut3.ut_coverage_cob_reporter( ),
+          a_reporter=> ut3.ut_coverage_cobertura_reporter( ),
           a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ),
           a_test_files => ut3.ut_varchar2_list( )
         )
diff --git a/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pks b/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pks
@@ -1,10 +1,10 @@
-create or replace package test_coverage_cob_reporter is
+create or replace package test_cov_cobertura_reporter is
 
-  --%suite(ut_coverage_cob_reporter)
+  --%suite(ut_cov_cobertura_reporter)
   --%suitepath(utplsql.core.reporters.test_coverage)
 
   --%test(reports on a project file mapped to database object)
   procedure report_on_file;
 
-end;
+end test_cov_cobertura_reporter;
 /
diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh
@@ -1,8 +1,12 @@
 #!/bin/bash
 set -ev
+
+
 #goto git root directory
 git rev-parse && cd "$(git rev-parse --show-cdup)"
 
+. development/env.sh
+
 cd test
 
 "$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_tests.sql
diff --git a/test/install_tests.sql b/test/install_tests.sql
@@ -27,7 +27,7 @@ whenever oserror exit failure rollback
 @@core/reporters/test_coverage.pks
 @@core/reporters/test_coverage/test_coverage_sonar_reporter.pks
 @@core/reporters/test_coverage/test_coveralls_reporter.pks
-@@core/reporters/test_coverage/test_coverage_cob_reporter.pks
+@@core/reporters/test_coverage/test_cov_cobertura_reporter.pks
 @@core/reporters/test_xunit_reporter.pks
 @@core/expectations.pks
 @@core/expectations/scalar_data/binary/test_be_greater_or_equal.pks
@@ -58,7 +58,7 @@ whenever oserror exit failure rollback
 @@core/reporters/test_coverage.pkb
 @@core/reporters/test_coverage/test_coverage_sonar_reporter.pkb
 @@core/reporters/test_coverage/test_coveralls_reporter.pkb
-@@core/reporters/test_coverage/test_coverage_cob_reporter.pkb
+@@core/reporters/test_coverage/test_cov_cobertura_reporter.pkb
 @@core/reporters/test_xunit_reporter.pkb
 @@core/expectations.pkb
 @@core/expectations/scalar_data/binary/test_be_greater_or_equal.pkb
@@ -104,4 +104,4 @@ begin
 end;
 /
 
-exit
+exit;
