Merge branch 'develop' into feature/support_of_context

# Conflicts: # source/api/ut_runner.pkb # source/core/ut_utils.pks # source/reporters/ut_teamcity_reporter.tpb
utPLSQL · jgebal · Apr 25, 2018 · Mar 4, 2018 · Mar 14, 2018 · Mar 15, 2018
commit 4bc7ced9f3513fd3fb82be8d4bf3d66687a3ed2e
diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb
@@ -105,7 +105,7 @@ create or replace package body ut_runner is
         rollback;
         raise;
     end;
-    if a_fail_on_errors and l_run.result in (ut_utils.tr_failure, ut_utils.tr_error) then
+    if a_fail_on_errors and l_run.result in (ut_utils.gc_failure, ut_utils.gc_error) then
       raise_application_error(ut_utils.gc_some_tests_failed, 'Some tests failed');
     end if;
   end;
@@ -146,34 +146,36 @@ create or replace package body ut_runner is
     return;
   end;
 
-  function get_reporters_list return tt_reporters_info pipelined is
+  function get_reporters_list return tt_reporters_info pipelined
+  AS
     l_cursor      sys_refcursor;
-    l_owner       varchar2(128) := upper(ut_utils.ut_owner());
+    l_owner  varchar2(128) := ut_utils.ut_owner();
     l_results     tt_reporters_info;
     c_bulk_limit  constant integer := 10;
-    l_view_name   varchar2(200) := ut_metadata.get_dba_view('dba_types');
-  begin
-    open l_cursor for q'[
-      SELECT
-        owner || '.' || type_name,
-        CASE
-          WHEN sys_connect_by_path(owner||'.'||type_name,',') LIKE '%]' || l_owner || q'[.UT_OUTPUT_REPORTER_BASE%'
-          THEN 'Y'
-          ELSE 'N'
-        END is_output_reporter
-      FROM ]'||l_view_name||q'[ t
-     WHERE instantiable = 'YES'
-     CONNECT BY supertype_name = PRIOR type_name AND supertype_owner = PRIOR owner
-       START WITH type_name = 'UT_REPORTER_BASE' AND owner = ']'|| l_owner || '''';
-    loop
-      fetch l_cursor bulk collect into l_results limit c_bulk_limit;
-      for i in 1 .. l_results.count loop
-        pipe row (l_results(i));
+    begin
+      open l_cursor for 'SELECT
+          owner || ''.'' || type_name,
+          CASE
+                  WHEN sys_connect_by_path(owner
+                  || ''.''
+                  || type_name,'','') LIKE ''%' || l_owner || '''
+                  || ''.UT_OUTPUT_REPORTER_BASE%'' THEN ''Y''
+                  ELSE ''N''
+              END
+          is_output_reporter
+      FROM dba_types t
+      WHERE instantiable = ''YES''
+      CONNECT BY supertype_name = PRIOR type_name AND supertype_owner = PRIOR owner
+        START WITH type_name = ''UT_REPORTER_BASE'' AND owner = '''|| l_owner || '''';
+      loop
+        fetch l_cursor bulk collect into l_results limit c_bulk_limit;
+        for i in 1 .. l_results.count loop
+          pipe row (l_results(i));
+        end loop;
+        exit when l_cursor%notfound;
       end loop;
-      exit when l_cursor%notfound;
-    end loop;
-    close l_cursor;
-  end;
+      close l_cursor;
+    end;
 
 end ut_runner;
 /
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -56,10 +56,10 @@ create or replace package ut_utils authid definer is
 
   /* Constants: Test Results */
   subtype t_test_result   is binary_integer range 0 .. 3;
-  tr_disabled                constant t_test_result := 0; -- test/suite was disabled
-  tr_success                 constant t_test_result := 1; -- test passed
-  tr_failure                 constant t_test_result := 2; -- one or more expectations failed
-  tr_error                   constant t_test_result := 3; -- exception was raised
+  gc_disabled                constant t_test_result := 0; -- test/suite was disabled
+  gc_success                 constant t_test_result := 1; -- test passed
+  gc_failure                 constant t_test_result := 2; -- one or more expectations failed
+  gc_error                   constant t_test_result := 3; -- exception was raised
 
   gc_disabled_char           constant varchar2(8) := 'Disabled'; -- test/suite was disabled
   gc_success_char            constant varchar2(7) := 'Success'; -- test passed

diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb
@@ -69,7 +69,7 @@ create or replace type body ut_teamcity_reporter is
 
       self.print_clob(a_test.get_serveroutputs());
 
-      if a_test.result = ut_utils.tr_error then
+      if a_test.result = ut_utils.gc_error then
         for i in 1 .. a_test.before_each_list.count loop
           if a_test.before_each_list(i).error_backtrace is not null then
             l_std_err_msg := l_std_err_msg || 'Before each exception:' || chr(10) || a_test.before_each_list(i).error_backtrace || chr(10);