Fix for unit-test results reporting into Sonar

jgebal · jgebal · commit 1d86276dd76d · 2022-03-03T00:24:21.000+02:00
diff --git a/.github/variables/.env b/.github/variables/.env
@@ -3,7 +3,7 @@ UT3_DEVELOP_SCHEMA=UT3_DEVELOP
 UT3_DEVELOP_SCHEMA_PASSWORD=ut3
 UT3_RELEASE_VERSION_SCHEMA=UT3
 UT3_RELEASE_VERSION_SCHEMA_PASSWORD=ut3
-UT3_USER='UT3$USER#'
+UT3_USER='UT3_USER'
 UT3_USER_PASSWORD=ut3
 UT3_TESTER=UT3_TESTER
 UT3_TESTER_PASSWORD=ut3
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -46,7 +46,7 @@ We use four different database accounts (users) for development process.
 * `ut3` - holds latest released version of utPLSQL. This schema holds the testing framework used for self-testing of utPLSQL development.
 * `ut3_develop` - holds the version of utPLSQL of your current branch. This is the schema you will be working on.
 * `ut3_tester` - holds unit test packages for development of utPLSQL.
-* `ut3$user#` - used for testing accessibility to schema names with special characters.
+* `ut3_user` - used for testing accessibility to schema names with special characters.
 * `ut3_tester_helper` - elevated privileges user, used for creating and dropping objects in other schemas during test run.
 
 
diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md
@@ -249,13 +249,13 @@ Failures:
   1) the_test
       "Checking table ALL_USERS"
       Actual: 28 (number) was expected to equal: 0 (number)
-      at "UT3$USER#.SHARED_EXPECTATION_TEST.TABLE_IS_EMPTY", line 6 ut.expect( l_count, 'Checking table '||p_table_name ).to_equal(0);
-      at "UT3$USER#.SHARED_EXPECTATION_TEST.THE_TEST", line 11
+      at "UT3_USER.SHARED_EXPECTATION_TEST.TABLE_IS_EMPTY", line 6 ut.expect( l_count, 'Checking table '||p_table_name ).to_equal(0);
+      at "UT3_USER.SHARED_EXPECTATION_TEST.THE_TEST", line 11
        
       "Checking table ALL_TABLES"
       Actual: 55 (number) was expected to equal: 0 (number)
-      at "UT3$USER#.SHARED_EXPECTATION_TEST.TABLE_IS_EMPTY", line 6 ut.expect( l_count, 'Checking table '||p_table_name ).to_equal(0);
-      at "UT3$USER#.SHARED_EXPECTATION_TEST.THE_TEST", line 12
+      at "UT3_USER.SHARED_EXPECTATION_TEST.TABLE_IS_EMPTY", line 6 ut.expect( l_count, 'Checking table '||p_table_name ).to_equal(0);
+      at "UT3_USER.SHARED_EXPECTATION_TEST.THE_TEST", line 12
        
 Finished in .066344 seconds
 1 tests, 1 failed, 0 errored, 0 disabled, 0 warning(s)
diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md
@@ -195,7 +195,7 @@ declare
 begin
   l_reporter.set_reporter_id( 'd8a79e85915640a6a4e1698fdf90ba74' );
   l_reporter.output_buffer.init();
-  ut_runner.run (ut_varchar2_list ('ut3_tester','ut3$user#'), ut_reporters( l_reporter ) );
+  ut_runner.run (ut_varchar2_list ('ut3_tester','ut3_user'), ut_reporters( l_reporter ) );
 end;
 /
 ```
diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql
@@ -35,7 +35,7 @@ alter session set plsql_optimize_level=0;
 @@ut3_tester_helper/annotation_cache_helper.pks
 @@ut3_tester_helper/annotation_cache_helper.pkb
 create or replace synonym ut3_tester.annotation_cache_helper for ut3_tester_helper.annotation_cache_helper;
-create or replace synonym ut3$user#.coverage_helper for ut3_tester_helper.coverage_helper;
+create or replace synonym ut3_user.coverage_helper for ut3_tester_helper.coverage_helper;
 
 set linesize 200
 set define on
diff --git a/test/run_tests.sh b/test/run_tests.sh
@@ -6,8 +6,12 @@ git rev-parse && cd "$(git rev-parse --show-cdup)"
 
 time utPLSQL-cli/bin/utplsql run ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@${CONNECTION_STR} \
 -source_path=source -owner=ut3_develop \
--p='ut3_tester,ut3$user#' \
+-p='ut3_tester,ut3_user' \
 -test_path=test -c \
+  -regex_expression="test/(\w+)(/(\w+))*/(\w+)\.(.{3})$" \
+  -owner_subexpression=1 \
+  -type_subexpression=5 \
+  -name_subexpression=4 \
 -f=ut_coverage_sonar_reporter     -o=coverage.xml \
 -f=ut_coverage_cobertura_reporter -o=cobertura.xml \
 -f=ut_coverage_html_reporter      -o=coverage.html \
diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pkb b/test/ut3_tester/core/annotations/test_annotation_manager.pkb
@@ -71,19 +71,19 @@ create or replace package body test_annotation_manager is
     exec_autonomous(q'[alter package dummy_test_package compile]');
   end;
 
-  procedure create_parse_proc_as_ut3$user# is
+  procedure create_parse_proc_as_ut3_user is
   begin
-    ut3_tester_helper.main_helper.create_parse_proc_as_ut3$user#();
+    ut3_tester_helper.main_helper.create_parse_proc_as_ut3_user();
   end;
 
-  procedure parse_dummy_test_as_ut3$user# is
+  procedure parse_dummy_test_as_ut3_user is
   begin
-    ut3_tester_helper.main_helper.parse_dummy_test_as_ut3$user#();
+    ut3_tester_helper.main_helper.parse_dummy_test_as_ut3_user();
   end;
 
-  procedure drop_parse_proc_as_ut3$user# is
+  procedure drop_parse_proc_as_ut3_user is
   begin
-    ut3_tester_helper.main_helper.drop_parse_proc_as_ut3$user#();
+    ut3_tester_helper.main_helper.drop_parse_proc_as_ut3_user();
   exception
     when others then
       null;
@@ -400,10 +400,10 @@ create or replace package body test_annotation_manager is
     l_start_date  date;
   begin
     l_start_date := sysdate;
-    parse_dummy_test_as_ut3$user#();
+    parse_dummy_test_as_ut3_user();
     drop_dummy_test_package();
     --Act
-    parse_dummy_test_as_ut3$user#();
+    parse_dummy_test_as_ut3_user();
     --Assert
     select count(1)
            into l_cache_count
diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pks b/test/ut3_tester/core/annotations/test_annotation_manager.pks
@@ -14,9 +14,9 @@ create or replace package test_annotation_manager is
 
   procedure create_dummy_test_package;
 
-  procedure create_parse_proc_as_ut3$user#;
+  procedure create_parse_proc_as_ut3_user;
 
-  procedure drop_parse_proc_as_ut3$user#;
+  procedure drop_parse_proc_as_ut3_user;
 
   procedure drop_dummy_test_package;
 
@@ -85,8 +85,8 @@ create or replace package test_annotation_manager is
     procedure update_modified_test_package;
 
     --%test(Keeps annotations in cache when object was removed but user can't see whole schema)
-    --%beforetest(create_dummy_test_package,create_parse_proc_as_ut3$user#)
-    --%aftertest(drop_parse_proc_as_ut3$user#)
+    --%beforetest(create_dummy_test_package,create_parse_proc_as_ut3_user)
+    --%aftertest(drop_parse_proc_as_ut3_user)
     procedure keep_dropped_data_in_cache;
 
     --%test(Does not return data for dropped object)
diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb
@@ -104,26 +104,26 @@ create or replace package body main_helper is
     commit;
   end;  
   
-  procedure create_parse_proc_as_ut3$user# is
+  procedure create_parse_proc_as_ut3_user is
     pragma autonomous_transaction;
   begin
     execute immediate q'[
-    create or replace procedure ut3$user#.parse_annotations is
+    create or replace procedure ut3_user.parse_annotations is
       begin
         ut3_develop.ut_runner.rebuild_annotation_cache('UT3_TESTER','PACKAGE');
       end;]';
   end;
 
-  procedure drop_parse_proc_as_ut3$user# is
+  procedure drop_parse_proc_as_ut3_user is
     pragma autonomous_transaction;
   begin
-    execute immediate 'drop procedure ut3$user#.parse_annotations';
+    execute immediate 'drop procedure ut3_user.parse_annotations';
   end;
   
-  procedure parse_dummy_test_as_ut3$user# is
+  procedure parse_dummy_test_as_ut3_user is
     pragma autonomous_transaction;
   begin
-    execute immediate 'begin ut3$user#.parse_annotations; end;';
+    execute immediate 'begin ut3_user.parse_annotations; end;';
   end;
   
   procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_list, a_item varchar2) is
diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks
@@ -29,11 +29,11 @@ create or replace package main_helper is
   
   procedure cleanup_annotation_cache;
   
-  procedure create_parse_proc_as_ut3$user#;
+  procedure create_parse_proc_as_ut3_user;
   
-  procedure drop_parse_proc_as_ut3$user#;
+  procedure drop_parse_proc_as_ut3_user;
   
-  procedure parse_dummy_test_as_ut3$user#;
+  procedure parse_dummy_test_as_ut3_user;
   
   procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_list, a_item varchar2);
 
diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb
@@ -3,7 +3,7 @@ create or replace package body run_helper is
   procedure setup_cache_objects is
     pragma autonomous_transaction;
   begin
-    execute immediate q'[create or replace package ut3$user#.dummy_test_package as    
+    execute immediate q'[create or replace package ut3_user.dummy_test_package as
         --%suite(dummy_test_suite)
         --%suitepath(some.path)
         --%rollback(manual)
@@ -12,7 +12,7 @@ create or replace package body run_helper is
         --%beforetest(some_procedure)
         procedure some_dummy_test_procedure;
       end;]';
-    execute immediate q'[create or replace procedure ut3$user#.dummy_test_procedure as
+    execute immediate q'[create or replace procedure ut3_user.dummy_test_procedure as
         --%some_annotation(some_text)
         --%rollback(manual)
       begin
@@ -27,7 +27,7 @@ create or replace package body run_helper is
       
     execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]';
 
-    execute immediate q'[create or replace package ut3$user#.bad_test_package as
+    execute immediate q'[create or replace package ut3_user.bad_test_package as
         --%rollback(manual)
         --%test(dummy_test)
         procedure some_dummy_test_procedure;
@@ -37,7 +37,7 @@ create or replace package body run_helper is
   procedure setup_cache_objectstag is
     pragma autonomous_transaction;
   begin
-    execute immediate q'[create or replace package ut3$user#.dummy_test_package as    
+    execute immediate q'[create or replace package ut3_user.dummy_test_package as
         --%suite(dummy_test_suite)
         --%suitepath(some.path)
         --%tags(dummy)
@@ -48,7 +48,7 @@ create or replace package body run_helper is
         --%beforetest(some_procedure)
         procedure some_dummy_test_procedure;
       end;]';
-    execute immediate q'[create or replace procedure ut3$user#.dummy_test_procedure as
+    execute immediate q'[create or replace procedure ut3_user.dummy_test_procedure as
         --%some_annotation(some_text)
         --%rollback(manual)
       begin
@@ -67,7 +67,7 @@ create or replace package body run_helper is
   procedure setup_cache_twotags is
     pragma autonomous_transaction;
   begin
-    execute immediate q'[create or replace package ut3$user#.dummy_test_package as    
+    execute immediate q'[create or replace package ut3_user.dummy_test_package as
         --%suite(dummy_test_suite)
         --%tags(suitetag1,suitetag2)
         --%rollback(manual)
@@ -77,7 +77,7 @@ create or replace package body run_helper is
         --%beforetest(some_procedure)
         procedure some_dummy_test_procedure;
       end;]';
-    execute immediate q'[create or replace procedure ut3$user#.dummy_test_procedure as
+    execute immediate q'[create or replace procedure ut3_user.dummy_test_procedure as
         --%some_annotation(some_text)
         --%rollback(manual)
       begin
@@ -141,19 +141,19 @@ create or replace package body run_helper is
     pragma autonomous_transaction;
   begin
     setup_cache_objects();
-    ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3$USER#','PACKAGE');
-    ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3$USER#','PROCEDURE');
+    ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3_USER','PACKAGE');
+    ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3_USER','PROCEDURE');
     ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3_TESTER_HELPER','PROCEDURE');
   end;
 
   procedure cleanup_cache is
     pragma autonomous_transaction;
   begin
     delete from ut3_develop.ut_annotation_cache_info
-     where object_type = 'PROCEDURE' and object_owner in ('UT3$USER#','UT3_TESTER_HELPER')
+     where object_type = 'PROCEDURE' and object_owner in ('UT3_USER','UT3_TESTER_HELPER')
         or object_type = 'PACKAGE' and object_owner = user and object_name = 'DUMMY_TEST_PACKAGE';
-    execute immediate q'[drop package ut3$user#.dummy_test_package]';
-    execute immediate q'[drop procedure ut3$user#.dummy_test_procedure]';
+    execute immediate q'[drop package ut3_user.dummy_test_package]';
+    execute immediate q'[drop procedure ut3_user.dummy_test_procedure]';
     execute immediate q'[drop procedure ut3_tester_helper.dummy_test_procedure]';
   end;
 
@@ -185,15 +185,15 @@ create or replace package body run_helper is
     begin
       create_db_link;
       execute immediate q'[
-    create or replace package ut3$user#.test_db_link is
+    create or replace package ut3_user.test_db_link is
       --%suite
 
       --%test
       procedure runs_with_db_link;
     end;]';
 
       execute immediate q'[
-    create or replace package body ut3$user#.test_db_link is
+    create or replace package body ut3_user.test_db_link is
       procedure runs_with_db_link is
         a_value integer;
         begin
@@ -208,7 +208,7 @@ create or replace package body run_helper is
   procedure db_link_cleanup is
     begin
       drop_db_link;
-      begin execute immediate 'drop package ut3$user#.test_db_link'; exception when others then null; end;
+      begin execute immediate 'drop package ut3_user.test_db_link'; exception when others then null; end;
   end;
 
  procedure create_suite_with_link is
@@ -258,7 +258,7 @@ create or replace package body run_helper is
     execute immediate 'drop package test_distributed_savepoint';
   end;
   
-  procedure create_ut3$user#_tests is
+  procedure create_ut3_user_tests is
     pragma autonomous_transaction;
   begin
     execute immediate q'[create or replace package test_package_1 is
@@ -348,7 +348,7 @@ create or replace package body run_helper is
     execute immediate q'[grant execute on test_package_3 to public]';
   end;
 
-  procedure drop_ut3$user#_tests is
+  procedure drop_ut3_user_tests is
     pragma autonomous_transaction;
   begin
     execute immediate q'[drop package test_package_1]';
diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks
@@ -17,8 +17,8 @@ create or replace package run_helper is
   procedure create_suite_with_link;
   procedure drop_suite_with_link;
   
-  procedure create_ut3$user#_tests;
-  procedure drop_ut3$user#_tests;
+  procedure create_ut3_user_tests;
+  procedure drop_ut3_user_tests;
   
   procedure create_test_suite;
   procedure drop_test_suite;
diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb
@@ -13,14 +13,14 @@ create or replace package body test_ut_run is
     ut3_tester_helper.main_helper.clear_expectations();
   end;
 
-  procedure create_ut3$user#_tests is
+  procedure create_ut3_user_tests is
   begin
-    ut3_tester_helper.run_helper.create_ut3$user#_tests();
+    ut3_tester_helper.run_helper.create_ut3_user_tests();
   end;
   
-  procedure drop_ut3$user#_tests is
+  procedure drop_ut3_user_tests is
   begin
-    ut3_tester_helper.run_helper.drop_ut3$user#_tests();
+    ut3_tester_helper.run_helper.drop_ut3_user_tests();
   end;
 
   procedure ut_version is
@@ -257,7 +257,7 @@ create or replace package body test_ut_run is
     ut.expect(l_results).to_be_like(
       '%1) does_stuff%' ||
         'ORA-01403: no data found%' ||
-        'ORA-06512: at "UT3$USER#.PARENT_SUITE%'
+        'ORA-06512: at "UT3_USER.PARENT_SUITE%'
     );
   end;
 
diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks
diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb
diff --git a/test/ut3_user/expectations.pkb b/test/ut3_user/expectations.pkb
diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb
diff --git a/test/ut3_user/reporters/test_documentation_reporter.pkb b/test/ut3_user/reporters/test_documentation_reporter.pkb
diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pkb b/test/ut3_user/reporters/test_teamcity_reporter.pkb

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ declare`
`195`	`195`	`begin`
`196`	`196`	`l_reporter.set_reporter_id( 'd8a79e85915640a6a4e1698fdf90ba74' );`
`197`	`197`	`l_reporter.output_buffer.init();`
`198`		`- ut_runner.run (ut_varchar2_list ('ut3_tester','ut3$user#'), ut_reporters( l_reporter ) );`
	`198`	`+ ut_runner.run (ut_varchar2_list ('ut3_tester','ut3_user'), ut_reporters( l_reporter ) );`
`199`	`199`	`end;`
`200`	`200`	`/`
`201`	`201`	```