test

Pazus · Pazus · commit 88a0b8331fb1 · 2017-07-04T07:05:37.000+03:00
diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb
@@ -130,14 +130,15 @@ create or replace package body ut_expectation_processor as
     -- in 12.2 format_call_stack reportes not only package name, but also the procedure name
     -- when 11g and 12c reports only package name
     c_expectation_search_pattern constant varchar2(500) := 
-    '(^.*\.((UT_EXPECTATION[A-Z0-9#_$]*)|(UT)|(UTASSERT2?))(\.[A-Z0-9#_$]+)?$\s)+\s*(.*)';
+    '(^.*\.(UT_EXPECTATION[A-Z0-9#_$]*|UT|UTASSERT2?)(\.[A-Z0-9#_$]+)?$\s)+(.*)';
   begin
-    l_caller_stack_line    := regexp_substr( c_call_stack, c_expectation_search_pattern, 1, 1, 'm', 7);
-    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 );
+    dbms_output.put_line(c_call_stack);
+    l_caller_stack_line    := regexp_substr( c_call_stack, c_expectation_search_pattern, 1, 1, 'm', 4);
+    l_line_no              := to_number( regexp_substr(l_caller_stack_line,'0x[0-9a-f]+\s+(\d+)',subexpression => 1) );
+    l_caller_type_and_name    := trim(regexp_substr(l_caller_stack_line,'0x[0-9a-f]+\s+\d+\s+(.+)',subexpression => 1));
     if l_caller_stack_line like '%.%' then
-      l_owner       := regexp_substr(l_caller_stack_line,'\s([A-Za-z0-9$#_]+)\.([A-Za-z0-9$#_]|\.)+$',subexpression => 1);
-      l_object_name := regexp_substr(l_caller_stack_line,'\s([A-Za-z0-9$#_]+)\.(([A-Za-z0-9$#_]|\.)+)$',subexpression => 2);
+      l_owner       := regexp_substr(l_caller_stack_line,'([A-Za-z0-9$#_]+)\.([A-Za-z0-9$#_]|\.)+',subexpression => 1);
+      l_object_name := regexp_substr(l_caller_stack_line,'([A-Za-z0-9$#_]+)\.(([A-Za-z0-9$#_]|\.)+)',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
