Renamed junit to be more TFS specific

lwasylow · lwasylow · commit 0a25335572d6 · 2018-03-28T20:33:46.000+01:00
diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql
@@ -49,7 +49,7 @@ grant execute on &&ut3_owner..ut to public;
 grant execute on &&ut3_owner..ut_runner to public;
 grant execute on &&ut3_owner..ut_teamcity_reporter to public;
 grant execute on &&ut3_owner..ut_xunit_reporter to public;
-grant execute on &&ut3_owner..ut_junit_reporter to public;
+grant execute on &&ut3_owner..ut_tfs_junit_reporter to public;
 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;
@@ -107,7 +107,7 @@ create public synonym ut for &&ut3_owner..ut;
 create public synonym ut_runner for &&ut3_owner..ut_runner;
 create public synonym ut_teamcity_reporter for &&ut3_owner..ut_teamcity_reporter;
 create public synonym ut_xunit_reporter for &&ut3_owner..ut_xunit_reporter;
-create public synonym ut_junit_reporter for &&ut3_owner..ut_junit_reporter;
+create public synonym ut_tfs_junit_reporter for &&ut3_owner..ut_tfs_junit_reporter;
 create public synonym ut_documentation_reporter for &&ut3_owner..ut_documentation_reporter;
 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;
diff --git a/source/create_synonyms_and_grants_for_user.sql b/source/create_synonyms_and_grants_for_user.sql
@@ -69,7 +69,7 @@ grant execute on &&ut3_owner..ut to &ut3_user;
 grant execute on &&ut3_owner..ut_runner to &ut3_user;
 grant execute on &&ut3_owner..ut_teamcity_reporter to &ut3_user;
 grant execute on &&ut3_owner..ut_xunit_reporter to &ut3_user;
-grant execute on &&ut3_owner..ut_junit_reporter to &ut3_user;
+grant execute on &&ut3_owner..ut_tfs_junit_reporter to &ut3_user;
 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;
@@ -126,7 +126,7 @@ create or replace synonym &ut3_user..ut for &&ut3_owner..ut;
 create or replace synonym &ut3_user..ut_runner for &&ut3_owner..ut_runner;
 create or replace synonym &ut3_user..ut_teamcity_reporter for &&ut3_owner..ut_teamcity_reporter;
 create or replace synonym &ut3_user..ut_xunit_reporter for &&ut3_owner..ut_xunit_reporter;
-create or replace synonym &ut3_user..ut_junit_reporter for &&ut3_owner..ut_junit_reporter;
+create or replace synonym &ut3_user..ut_tfs_junit_reporter for &&ut3_owner..ut_tfs_junit_reporter;
 create or replace synonym &ut3_user..ut_documentation_reporter for &&ut3_owner..ut_documentation_reporter;
 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;
diff --git a/source/install.sql b/source/install.sql
@@ -239,8 +239,8 @@ prompt Installing PLSQL profiler objects into &&ut3_owner schema
 @@install_component.sql 'reporters/ut_teamcity_reporter.tpb'
 @@install_component.sql 'reporters/ut_xunit_reporter.tps'
 @@install_component.sql 'reporters/ut_xunit_reporter.tpb'
-@@install_component.sql 'reporters/ut_junit_reporter.tps'
-@@install_component.sql 'reporters/ut_junit_reporter.tpb'
+@@install_component.sql 'reporters/ut_tfs_junit_reporter.tps'
+@@install_component.sql 'reporters/ut_tfs_junit_reporter.tpb'
 @@install_component.sql 'reporters/ut_sonar_test_reporter.tps'
 @@install_component.sql 'reporters/ut_sonar_test_reporter.tpb'
 
diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb
@@ -1,4 +1,4 @@
-create or replace type body ut_junit_reporter is
+create or replace type body ut_tfs_junit_reporter is
   /*
   utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
@@ -16,18 +16,18 @@ create or replace type body ut_junit_reporter is
   limitations under the License.
   */
 
-  constructor function ut_junit_reporter(self in out nocopy ut_junit_reporter) return self as result is
+  constructor function ut_tfs_junit_reporter(self in out nocopy ut_tfs_junit_reporter) return self as result is
   begin
     self.init($$plsql_unit);
     return;
   end;
 
-  overriding member procedure after_calling_run(self in out nocopy ut_junit_reporter, a_run in ut_run) is
+  overriding member procedure after_calling_run(self in out nocopy ut_tfs_junit_reporter, a_run in ut_run) is
   begin  
      junit_version_one(a_run);
   end;
 
- member procedure junit_version_one(self in out nocopy ut_junit_reporter,a_run in ut_run) is
+ member procedure junit_version_one(self in out nocopy ut_tfs_junit_reporter,a_run in ut_run) is
     l_suite_id    integer := 0;
     l_tests_count integer := a_run.results_count.disabled_count + a_run.results_count.success_count +
                              a_run.results_count.failure_count + a_run.results_count.errored_count;
diff --git a/source/reporters/ut_tfs_junit_reporter.tps b/source/reporters/ut_tfs_junit_reporter.tps
@@ -1,4 +1,4 @@
-create or replace type ut_junit_reporter under ut_output_reporter_base(
+create or replace type ut_tfs_junit_reporter under ut_output_reporter_base(
   /*
   utPLSQL - Version 3
   Copyright 2016 - 2017 utPLSQL Project
@@ -21,12 +21,12 @@ create or replace type ut_junit_reporter under ut_output_reporter_base(
    *  https://docs.microsoft.com/en-us/vsts/build-release/tasks/test/publish-test-results?view=vsts
    */
      
-  constructor function ut_junit_reporter(
-  self in out nocopy ut_junit_reporter
+  constructor function ut_tfs_junit_reporter(
+  self in out nocopy ut_tfs_junit_reporter
   ) return self as result,
 
-  overriding member procedure after_calling_run(self in out nocopy ut_junit_reporter, a_run in ut_run),
-  member procedure junit_version_one(self in out nocopy ut_junit_reporter, a_run in ut_run),
+  overriding member procedure after_calling_run(self in out nocopy ut_tfs_junit_reporter, a_run in ut_run),
+  member procedure junit_version_one(self in out nocopy ut_tfs_junit_reporter, a_run in ut_run),
 
   overriding member function get_description return varchar2
 )
diff --git a/source/uninstall.sql b/source/uninstall.sql
@@ -194,7 +194,7 @@ drop type ut_teamcity_reporter force;
 
 drop type ut_xunit_reporter force;
 
-drop type ut_junit_reporter force;
+drop type ut_tfs_junit_reporter force;
 
 drop type ut_event_listener force;
 
diff --git a/test/api/test_ut_runner.pkb b/test/api/test_ut_runner.pkb
@@ -286,9 +286,9 @@ end;';
       select 'UT3.UT_COVERAGE_SONAR_REPORTER', 'Y' from dual union all
       select 'UT3.UT_COVERALLS_REPORTER', 'Y' from dual union all
       select 'UT3.UT_DOCUMENTATION_REPORTER', 'Y' from dual union all
-      select 'UT3.UT_JUNIT_REPORTER', 'Y' from dual union all
       select 'UT3.UT_SONAR_TEST_REPORTER', 'Y' from dual union all
       select 'UT3.UT_TEAMCITY_REPORTER', 'Y' from dual union all
+      select 'UT3.UT_TFS_JUNIT_REPORTER', 'Y' from dual union all
       select 'UT3.UT_XUNIT_REPORTER', 'Y' from dual;
     --Act
     open l_actual for select * from table(ut3.ut_runner.GET_REPORTERS_LIST()) order by 1;
diff --git a/test/core/reporters/test_tfs_junit_reporter.pkb b/test/core/reporters/test_tfs_junit_reporter.pkb
@@ -1,4 +1,4 @@
-create or replace package body test_junit_reporter as
+create or replace package body test_tfs_junit_reporter as
 
   procedure crate_a_test_package is
     pragma autonomous_transaction;
@@ -57,7 +57,7 @@ create or replace package body test_junit_reporter as
     --Act
     select *
       bulk collect into l_results
-      from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter()));
+      from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter()));
     l_actual := ut3.ut_utils.table_to_clob(l_results);
     --Assert
     ut.expect(l_actual).not_to_be_like('%<tag>%');
@@ -71,7 +71,7 @@ create or replace package body test_junit_reporter as
     --Act
     select *
       bulk collect into l_results
-      from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter()));
+      from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter()));
     l_actual := ut3.ut_utils.table_to_clob(l_results);
     --Assert
     ut.expect(l_actual).not_to_be_like('%Actual: 1 (number) was expected to equal: 1 (number)%');
@@ -85,7 +85,7 @@ create or replace package body test_junit_reporter as
     --Act
     select *
       bulk collect into l_results
-      from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter()));
+      from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter()));
     l_actual := ut3.ut_utils.table_to_clob(l_results);
     --Assert
     ut.expect(l_actual).to_be_like('%at "%.CHECK_JUNIT_REPORTING%", line %');
@@ -98,7 +98,7 @@ create or replace package body test_junit_reporter as
     --Act
     select *
       bulk collect into l_results
-      from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter()));
+      from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter()));
     l_actual := ut3.ut_utils.table_to_clob(l_results);
     --Assert
     ut.expect(l_actual).to_be_like('%testcase classname="check_junit_reporting"%');
@@ -111,7 +111,7 @@ create or replace package body test_junit_reporter as
     --Act
     select *
       bulk collect into l_results
-      from table(ut3.ut.run('check_junit_flat_suitepath',ut3.ut_junit_reporter()));
+      from table(ut3.ut.run('check_junit_flat_suitepath',ut3.ut_tfs_junit_reporter()));
     l_actual := ut3.ut_utils.table_to_clob(l_results);
     --Assert
     ut.expect(l_actual).to_be_like('<testsuites>
@@ -138,7 +138,7 @@ create or replace package body test_junit_reporter as
     --Act
     select *
     bulk collect into l_results
-    from table(ut3.ut.run('check_junit_reporting', ut3.ut_junit_reporter()));
+    from table(ut3.ut.run('check_junit_reporting', ut3.ut_tfs_junit_reporter()));
     l_actual := ut3.ut_utils.table_to_clob(l_results);
     --Assert
     ut.expect(l_actual).to_match('time="[0-9]*\.[0-9]{6}"');
@@ -153,7 +153,7 @@ create or replace package body test_junit_reporter as
     --Act
     select *
       bulk collect into l_results
-      from table(ut3.ut.run('check_junit_rep_suitepath',ut3.ut_junit_reporter()));
+      from table(ut3.ut.run('check_junit_rep_suitepath',ut3.ut_tfs_junit_reporter()));
     l_actual := ut3.ut_utils.table_to_clob(l_results);
     --Assert
     ut.expect(l_actual).to_be_like('%testcase classname="core.check_junit_rep_suitepath"%');   
diff --git a/test/core/reporters/test_tfs_junit_reporter.pks b/test/core/reporters/test_tfs_junit_reporter.pks
@@ -1,6 +1,6 @@
-create or replace package test_junit_reporter as
+create or replace package test_tfs_junit_reporter as
 
-  --%suite(ut_junit_reporter)
+  --%suite(ut_tfs_junit_reporter)
   --%suitepath(utplsql.core.reporters)
 
   --%beforeall
diff --git a/test/install_tests.sql b/test/install_tests.sql
@@ -30,7 +30,7 @@ whenever oserror exit failure rollback
 @@core/reporters/test_coverage/test_coveralls_reporter.pks
 @@core/reporters/test_coverage/test_cov_cobertura_reporter.pks
 @@core/reporters/test_xunit_reporter.pks
-@@core/reporters/test_junit_reporter.pks
+@@core/reporters/test_tfs_junit_reporter.pks
 @@core/expectations.pks
 @@core/expectations/scalar_data/binary/test_be_greater_or_equal.pks
 @@core/expectations/scalar_data/binary/test_be_greater_than.pks
@@ -63,7 +63,7 @@ whenever oserror exit failure rollback
 @@core/reporters/test_coverage/test_coveralls_reporter.pkb
 @@core/reporters/test_coverage/test_cov_cobertura_reporter.pkb
 @@core/reporters/test_xunit_reporter.pkb
-@@core/reporters/test_junit_reporter.pkb
+@@core/reporters/test_tfs_junit_reporter.pkb
 @@core/expectations.pkb
 @@core/expectations/scalar_data/binary/test_be_greater_or_equal.pkb
 @@core/expectations/scalar_data/binary/test_be_greater_than.pkb
