refactor reporting

Pazus · Pazus · commit 7fa55d0e84b7 · 2017-02-23T12:06:02.000+03:00
diff --git a/examples/remove_rooms_by_name/test_remove_rooms_by_name.pkg b/examples/remove_rooms_by_name/test_remove_rooms_by_name.pkg
@@ -17,12 +17,12 @@ create or replace package test_remove_rooms_by_name as
 
   -- %test
   -- %displayname(Removes a room without content in it)
-  procedure remove_empty_room;
-
   -- %beforetest(remove_empty_room)
+  -- %aftertest(remove_empty_room)
+  procedure remove_empty_room;
+  
   procedure setup_test_room;    
   
-  -- %aftertest(remove_empty_room)
   procedure clean_test_room;  
 
   -- %test
@@ -62,25 +62,28 @@ create or replace package body test_remove_rooms_by_name as
   end;
   
   -- %beforeeach
-  procedure setup_the_room is begin null end;
+  procedure setup_the_room is begin null; end;
   
   -- %aftereach
-  procedure clean_the_room is begin null end;
+  procedure clean_the_room is begin null;  end;
   
   -- %afterall
-  procedure clean_rooms is begin null end;
+  procedure clean_rooms is begin null; 
+   end;
   
   -- %beforetest(remove_empty_room)
-  procedure setup_test_room is begin null end;
+  procedure setup_test_room is begin null; 
+  raise_application_error(-20001,'Test exception');  end;
   
   -- %aftertest(remove_empty_room)
-  procedure clean_test_room is begin null end;
+  procedure clean_test_room is begin null; end;
 
 
   procedure remove_empty_room is
     l_rooms_not_named_b sys_refcursor;
     l_remaining_rooms   sys_refcursor;
   begin
+    
     open l_rooms_not_named_b for select * from rooms where name not like 'B%';
 
     remove_rooms_by_name('B%');
diff --git a/source/reporters/ut_documentation_reporter.tpb b/source/reporters/ut_documentation_reporter.tpb
@@ -118,7 +118,7 @@ create or replace type body ut_documentation_reporter is
       end if;
     end;
     
-    procedure print_warnings is     
+    procedure print_warnings(a_run in ut_run) is     
       procedure gather_warnings(a_item ut_suite_item) is
         l_suite ut_logical_suite;
       begin
@@ -131,12 +131,20 @@ create or replace type body ut_documentation_reporter is
         end if;
         
         --then process self warnings
-        for warn_ind in 1..a_item.warnings.count loop
-          l_warnings.extend;
-          l_warnings(l_warnings.last) := a_item.warnings(warn_ind);
-        end loop;
+        if a_item.warnings is not null and a_item.warnings.count > 0 then
+          for warn_ind in 1..a_item.warnings.count loop
+            l_warnings.extend;
+            l_warnings(l_warnings.last) := '  '||l_warnings.last||') '||a_item.path||': '||
+            regexp_replace(a_item.warnings(warn_ind),'('||chr(10)||'|'||chr(13)||')','\1       ');
+          end loop;
+        end if;
       end;
     begin
+      if a_run.items is not null and a_run.items.count >0 then
+        for run_item in 1..a_run.items.count loop
+          gather_warnings(a_run.items(run_item));
+        end loop;
+      end if;
       
       if l_warnings.count>0 then
         self.print_text( 'Warnings:' );
@@ -150,7 +158,7 @@ create or replace type body ut_documentation_reporter is
 
   begin
     print_failures_details(a_run);
-    print_warnings();
+    print_warnings(a_run);
     self.print_text( 'Finished in '||a_run.execution_time||' seconds' );
     l_summary_text :=
       a_run.results_count.total_count || ' tests, '
