changed substr to regexp in ut_assert_processor.pkb

Pazus · Pazus · commit eb3b540a3117 · 2016-12-03T11:22:27.000+03:00
set who_called_expectation call only on failure
diff --git a/source/core/types/ut_assert_result.tpb b/source/core/types/ut_assert_result.tpb
@@ -25,7 +25,9 @@ create or replace type body ut_assert_result is
     self.actual_type           := a_actual_type;
     self.expected_value_string := a_expected_value_string;
     self.actual_value_string   := a_actual_value_string;
-    self.caller_info           := ut_assert_processor.who_called_expectation();
+    if a_result = ut_utils.tr_failure then
+      self.caller_info           := ut_assert_processor.who_called_expectation();
+    end if;
     return;
   end ut_assert_result;
 
diff --git a/source/core/ut_assert_processor.pkb b/source/core/ut_assert_processor.pkb
@@ -112,24 +112,20 @@ create or replace package body ut_assert_processor as
   end;
 
   function who_called_expectation return varchar2 is
-    l_call_stack                 varchar2(32767) := dbms_utility.format_call_stack();
+    c_call_stack                 constant varchar2(32767) := dbms_utility.format_call_stack();
     l_caller_stack_line          varchar2(4000);
     l_caller_type_and_name       varchar2(4000);
     l_line_no                    integer;
-    l_owner                      varchar2(100);
-    l_object_name                varchar2(100);
-    l_last_space_pos             integer;
-    l_object_delimiter_pos       integer;
+    l_owner                      varchar2(1000);
+    l_object_name                varchar2(1000);
     c_expectation_search_pattern constant varchar2(50) := '(.*\.UT_EXPECTATION[A-Z0-9#_$]*\s)+(.*)\s';
   begin
-    l_caller_stack_line    := regexp_substr( l_call_stack, c_expectation_search_pattern, 1, 1, 'm', 2);
-    l_line_no              := to_number( trim( substr( l_caller_stack_line, 11, 10 ) ) );
+    l_caller_stack_line    := regexp_substr( c_call_stack, c_expectation_search_pattern, 1, 1, 'm', 2);
+    l_line_no              := to_number( regexp_substr(l_caller_stack_line,'^\dx[0-9a-f]+\s+(\d+)',subexpression => 1) );
     l_caller_type_and_name    := substr( l_caller_stack_line, 23 );
-    l_last_space_pos       := instr( l_caller_type_and_name, ' ', -1 );
-    l_object_delimiter_pos := instr( l_caller_type_and_name, '.' );
-    if l_object_delimiter_pos > 0 then
-      l_owner := substr( l_caller_type_and_name, l_last_space_pos + 1, l_object_delimiter_pos - l_last_space_pos - 1 );
-      l_object_name  := substr( l_caller_type_and_name, l_object_delimiter_pos + 1 );
+    if l_caller_stack_line like '%.%' then
+      l_owner       := regexp_substr(l_caller_stack_line,'\s(\w+)\.(\w|\.)+$',subexpression => 1);
+      l_object_name := regexp_substr(l_caller_stack_line,'\s(\w+)\.((\w|\.)+)$',subexpression => 2);
     end if;
     return
       case when l_owner is not null and l_object_name is not null and l_line_no is not null then
