simplified pattern

Pazus · Pazus · commit 4ae671fb1f4a · 2017-07-04T00:00:17.000+03:00
diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb
@@ -130,9 +130,9 @@ 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_RESULT\s+)(.*\.UT_EXPECTATION[A-Z0-9#_$]*(\.[A-Za-z0-9$#_]+)?.*?)+(.*\.UT(\.FAIL)?\s+)?(.*\.UTASSERT2?(\.[A-Za-z0-9$#_]+)?.*?$\s+)*(.*?$)';
+    '(^.*\.((UT_EXPECTATION[A-Z0-9#_$]*)|(UT)|(UTASSERT2?))(\.[A-Z0-9#_$]+)?$\s)+\s*(.*)';
   begin
-    l_caller_stack_line    := regexp_substr( c_call_stack, c_expectation_search_pattern, 1, 1, 'mn', 8);
+    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 );
     if l_caller_stack_line like '%.%' then
