Added reporting of line where assertion has failed.

jgebal · jgebal · commit 457160a382a0 · 2016-11-27T02:48:37.000Z
Addded separate example with demo of ut_documentation_reporter
diff --git a/examples/RunAllExamples.sql b/examples/RunAllExamples.sql
@@ -21,4 +21,4 @@ prompt RunExampleTestAnnotationsHugePackage
 prompt RunExpectations
 @@RunExpectations.sql
 prompt RunWithDocumentationReporter
-RunWithDocumentationReporter.sql
+@@RunWithDocumentationReporter.sql
diff --git a/source/core/ut_assert_processor.pkb b/source/core/ut_assert_processor.pkb
@@ -111,21 +111,6 @@ create or replace package body ut_assert_processor as
 
   end;
 
-  function get_source_definition_line(a_owner varchar2, a_object_name varchar2, a_line_no integer) return varchar2 is
-    l_line varchar2(4000);
-  begin
-    execute immediate
-      q'[select text from dba_source
-          where owner = :a_owner and name = :a_object_name and line = :a_line_no
-             -- skip the declarations, consider only definitions
-            and type not in ('PACKAGE', 'TYPE') ]'
-      into l_line using a_owner, a_object_name, a_line_no;
-    return '"'||ltrim(rtrim( lower( l_line ), chr(10) ))||'"';
-  exception
-    when no_data_found then
-      return null;
-  end;
-
   function who_called_expectation return varchar2 is
     l_call_stack                 varchar2(32767) := dbms_utility.format_call_stack();
     l_caller_stack_line          varchar2(4000);
@@ -148,7 +133,8 @@ create or replace package body ut_assert_processor as
     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
-        'at "'||l_owner||'.'||l_object_name||'", line '||l_line_no||' '||get_source_definition_line(l_owner, l_object_name, l_line_no)
+        'at "' || l_owner || '.' || l_object_name || '", line '|| l_line_no || ' ' ||
+          ut_metadata.get_source_definition_line(l_owner, l_object_name, l_line_no)
       end;
   end;
 end;
diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb
@@ -6,31 +6,14 @@ create or replace package body ut_metadata as
 
   function get_package_spec_source_cursor(a_owner varchar2 := null, a_object varchar2 := null) return sys_refcursor is
     l_cur sys_refcursor;
-    l_object_does_not_exist exception;
-    pragma exception_init (l_object_does_not_exist, -942);
-    function get_query return varchar2 is 
+    function get_query return varchar2 is
     begin
       return 'select t.text from ' || g_source_view ||
               ' t where t.owner = :a_owner and t.name = :a_object_name and t.type = ''PACKAGE'' order by t.line';
     end;
   begin
-    if g_source_view is not null then
-      open l_cur for get_query
-        using a_owner, a_object;
-    else
-      begin
-        g_source_view := 'dba_source';
-        open l_cur for get_query
-          using a_owner, a_object;
-      exception 
-        when l_object_does_not_exist then
-          g_source_view := 'all_source';
-          
-          open l_cur for get_query
-            using a_owner, a_object;
-      end;
-    end if;
-
+    open l_cur for get_query
+      using a_owner, a_object;
     return l_cur;
   end;
 
@@ -149,5 +132,33 @@ create or replace package body ut_metadata as
 
   end get_package_spec_source;
 
+  function get_source_definition_line(a_owner varchar2, a_object_name varchar2, a_line_no integer) return varchar2 is
+    l_line varchar2(4000);
+  begin
+    execute immediate
+      'select text from ' || g_source_view || q'[
+          where owner = :a_owner and name = :a_object_name and line = :a_line_no
+             -- skip the declarations, consider only definitions
+            and type != 'PACKAGE' ]'
+      into l_line using a_owner, a_object_name, a_line_no;
+    return '"'||ltrim(rtrim( lower( l_line ), chr(10) ))||'"';
+  exception
+    when no_data_found then
+      return null;
+  end;
+
+begin
+  declare
+    l_cursor sys_refcursor;
+    l_object_does_not_exist exception;
+    pragma exception_init (l_object_does_not_exist, -942);
+  begin
+    g_source_view := 'dba_source';
+    open l_cursor for 'select 1 from '||g_source_view ||' where rownum = 1';
+    close l_cursor;
+  exception
+    when l_object_does_not_exist then
+      g_source_view := 'all_source';
+  end;
 end;
 /
diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks
@@ -54,5 +54,13 @@ create or replace package ut_metadata authid definer as
   */
   function get_package_spec_source(a_owner varchar2, a_object_name varchar2) return clob;
 
+
+  /*
+    function: get_source_definition_line
+
+    return the text of the souce line for a given object, excludes package spec
+  */
+  function get_source_definition_line(a_owner varchar2, a_object_name varchar2, a_line_no integer) return varchar2;
+
 end ut_metadata;
 /
