utPLSQL · jgebal · Feb 24, 2017 · Feb 4, 2017 · Feb 4, 2017 · Feb 5, 2017
diff --git a/source/core/types/ut_event_listener.tpb b/source/core/types/ut_event_listener.tpb
@@ -88,7 +88,7 @@ create or replace type body ut_event_listener is
       end if;
     end loop;
 
-  end;
+  end fire_event;
 
 end;
 /
diff --git a/source/core/types/ut_logical_suite.tpb b/source/core/types/ut_logical_suite.tpb
@@ -52,39 +52,35 @@ create or replace type body ut_logical_suite as
     self.items(self.items.last) := a_item;
   end;
 
-  overriding member procedure do_execute(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base) is
-    l_completed_without_errors boolean;
-  begin
-    l_completed_without_errors := self.do_execute(a_listener);
-  end;
-
   overriding member function do_execute(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base) return boolean is
     l_suite_savepoint varchar2(30);
     l_item_savepoint  varchar2(30);
     l_completed_without_errors boolean;
   begin
     ut_utils.debug_log('ut_logical_suite.execute');
+
+    a_listener.fire_before_event(ut_utils.gc_suite,self);   
+    self.start_time := current_timestamp; 
 
     if self.get_ignore_flag() then
       self.result := ut_utils.tr_ignore;
+      self.end_time := self.start_time;
       ut_utils.debug_log('ut_logical_suite.execute - ignored');
     else
-      a_listener.fire_before_event(ut_utils.gc_suite,self);
 
       self.start_time := current_timestamp;
 
       for i in 1 .. self.items.count loop
         -- execute the item (test or suite)
         self.items(i).do_execute(a_listener);
-
       end loop;
 
       self.calc_execution_result();
-
       self.end_time := current_timestamp;
 
-      a_listener.fire_after_event(ut_utils.gc_suite,self);
     end if;
+
+    a_listener.fire_after_event(ut_utils.gc_suite,self);
 
     return l_completed_without_errors;
   end;
@@ -103,7 +99,21 @@ create or replace type body ut_logical_suite as
     end if;
 
       self.result := l_result;
-    end;
+  end;
+
+  overriding member procedure fail(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base, a_failure_msg varchar2) is
+  begin
+    ut_utils.debug_log('ut_logical_suite.fail');
+    a_listener.fire_before_event(ut_utils.gc_suite, self);
+    self.start_time := current_timestamp;
+    for i in 1 .. self.items.count loop
+      -- execute the item (test or suite)
+      self.items(i).fail(a_listener,a_failure_msg);
+    end loop;
+    self.calc_execution_result();
+    self.end_time := self.start_time;
+    a_listener.fire_after_event(ut_utils.gc_suite, self);
+  end;  
 
 end;
 /
diff --git a/source/core/types/ut_logical_suite.tps b/source/core/types/ut_logical_suite.tps
@@ -1,4 +1,4 @@
-create or replace type ut_logical_suite force under ut_suite_item (
+create or replace type ut_logical_suite under ut_suite_item (
   /*
   utPLSQL - Version X.X.X.X
   Copyright 2016 - 2017 utPLSQL Project
@@ -31,7 +31,7 @@ create or replace type ut_logical_suite force under ut_suite_item (
   member function item_index(a_name varchar2) return pls_integer,
   member procedure add_item(self in out nocopy ut_logical_suite, a_item ut_suite_item),
   overriding member function  do_execute(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base) return boolean,
-  overriding member procedure do_execute(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base),
-  overriding member procedure calc_execution_result(self in out nocopy ut_logical_suite)
+  overriding member procedure calc_execution_result(self in out nocopy ut_logical_suite),
+  overriding member procedure fail(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base, a_failure_msg varchar2)
 ) not final
 /
diff --git a/source/core/types/ut_reporter_base.tpb b/source/core/types/ut_reporter_base.tpb
@@ -131,5 +131,6 @@ create or replace type body ut_reporter_base is
   begin
     ut_output_buffer.close(self);
   end;
+
 end;
 /
diff --git a/source/core/types/ut_reporter_base.tps b/source/core/types/ut_reporter_base.tps
@@ -1,4 +1,4 @@
-create or replace type ut_reporter_base force authid current_user as object(
+create or replace type ut_reporter_base authid current_user as object(
   /*
   utPLSQL - Version X.X.X.X
   Copyright 2016 - 2017 utPLSQL Project

diff --git a/source/core/types/ut_results_counter.tpb b/source/core/types/ut_results_counter.tpb
@@ -17,10 +17,11 @@ create or replace type body ut_results_counter as
   */
   constructor function ut_results_counter(self in out nocopy ut_results_counter) return self as result is
   begin
-    self.ignored_count := 0;
-    self.success_count := 0;
-    self.failure_count := 0;
-    self.errored_count := 0;
+    self.ignored_count  := 0;
+    self.success_count  := 0;
+    self.failure_count  := 0;
+    self.errored_count  := 0;
+    self.warnings_count := 0;
     return;
   end;
 
@@ -39,10 +40,17 @@ create or replace type body ut_results_counter as
     self.success_count  := self.success_count + a_item.success_count;
     self.failure_count  := self.failure_count + a_item.failure_count;
     self.errored_count  := self.errored_count + a_item.errored_count;
+    self.warnings_count := self.warnings_count + a_item.warnings_count;
+  end;
+
+  member procedure increase_warning_count(self in out nocopy ut_results_counter) is
+  begin
+    self.warnings_count := self.warnings_count + 1;
   end;
 
   member function total_count return integer is
   begin
+    --skip warnings here
     return self.ignored_count + self.success_count + self.failure_count + self.errored_count;
   end;
 

diff --git a/source/core/types/ut_results_counter.tps b/source/core/types/ut_results_counter.tps
@@ -19,9 +19,11 @@ create or replace type ut_results_counter as object(
   success_count integer,
   failure_count integer,
   errored_count integer,
+  warnings_count integer,
   constructor function ut_results_counter(self in out nocopy ut_results_counter) return self as result,
   constructor function ut_results_counter(self in out nocopy ut_results_counter, a_status integer) return self as result,
   member procedure sum_counter_values(self in out nocopy ut_results_counter, a_item ut_results_counter),
+  member procedure increase_warning_count(self in out nocopy ut_results_counter),
   member function total_count return integer,
   member function result_status return integer
 )

diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb
@@ -24,12 +24,6 @@ create or replace type body ut_run as
     return;
   end;
 
-  overriding member procedure do_execute(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base) is
-    l_completed_without_errors boolean;
-  begin
-    l_completed_without_errors := self.do_execute(a_listener);
-  end;
-
   overriding member function do_execute(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base) return boolean is
     l_completed_without_errors boolean;
   begin
@@ -38,6 +32,9 @@ create or replace type body ut_run as
     a_listener.fire_before_event(ut_utils.gc_run, self);
 
     self.start_time := current_timestamp;
+
+    -- clear anything that might stay in the session's cache
+    ut_assert_processor.clear_asserts;
 
     for i in 1 .. self.items.count loop
       l_completed_without_errors := self.items(i).do_execute(a_listener);
@@ -67,6 +64,23 @@ create or replace type body ut_run as
 
     self.result := l_result;
   end;
+
+  overriding member procedure fail(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base, a_failure_msg varchar2) is
+  begin
+    ut_utils.debug_log('ut_run.fail');
+
+    a_listener.fire_before_event(ut_utils.gc_run, self);
+    self.start_time := current_timestamp;
+
+    for i in 1 .. self.items.count loop
+      self.items(i).fail(a_listener, a_failure_msg);
+    end loop;
+
+    self.calc_execution_result();
+    self.end_time := self.start_time;
+
+    a_listener.fire_after_event(ut_utils.gc_run, self);
+  end;
 
 end;
 /
diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps
@@ -1,4 +1,4 @@
-create or replace type ut_run authid current_user under ut_suite_item (
+create or replace type ut_run under ut_suite_item (
   /*
   utPLSQL - Version X.X.X.X
   Copyright 2016 - 2017 utPLSQL Project
@@ -21,7 +21,7 @@ create or replace type ut_run authid current_user under ut_suite_item (
   items        ut_suite_items,
   constructor function ut_run( self in out nocopy ut_run, a_items ut_suite_items ) return self as result,
   overriding member function  do_execute(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base) return boolean,
-  overriding member procedure do_execute(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base),
-  overriding member procedure calc_execution_result(self in out nocopy ut_run)
+  overriding member procedure calc_execution_result(self in out nocopy ut_run),
+  overriding member procedure fail(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base, a_failure_msg varchar2)
 )
 /
diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb
@@ -43,67 +43,88 @@ create or replace type body ut_suite  as
     return l_is_valid;
   end;
 
-  overriding member function do_execute(self in out nocopy ut_suite , a_listener in out nocopy ut_event_listener_base) return boolean is
+  overriding member function do_execute(self in out nocopy ut_suite, a_listener in out nocopy ut_event_listener_base) return boolean is
     l_suite_savepoint varchar2(30);
     l_item_savepoint  varchar2(30);
     l_completed_without_errors boolean;
+    l_suite_step_without_errors boolean;
+
+    procedure do_fail(a_prefix varchar2) is
+      l_results ut_assert_results := ut_assert_processor.get_asserts_results();
+    begin
+      for i in 1..self.items.count loop
+        self.items(i).fail(a_listener, a_prefix||l_results(1).error_message);
+      end loop;
+    end;
   begin
-    ut_utils.debug_log('ut_suite .execute');
+    ut_utils.debug_log('ut_suite.execute');
+    a_listener.fire_before_event(ut_utils.gc_suite,self);
+
+    self.start_time := current_timestamp;    
 
     if self.get_ignore_flag() then
       self.result := ut_utils.tr_ignore;
+      self.end_time := self.start_time;
       ut_utils.debug_log('ut_suite .execute - ignored');
     else
-      a_listener.fire_before_event(ut_utils.gc_suite,self);
+
+      if self.is_valid() then
 
-      self.start_time := current_timestamp;
+        l_suite_savepoint := self.create_savepoint_if_needed();
 
-      l_suite_savepoint := self.create_savepoint_if_needed();
+        --includes listener calls for before and after actions
+        l_suite_step_without_errors := self.before_all.do_execute(self, a_listener);
 
-      --includes listener calls for before and after actions
-      l_completed_without_errors := self.before_all.do_execute(self, a_listener);
+        if l_suite_step_without_errors then
+          for i in 1 .. self.items.count loop
+            l_completed_without_errors := true;
 
-      if l_completed_without_errors then
-        for i in 1 .. self.items.count loop
-          l_completed_without_errors := true;
-
-          --savepoint
-          l_item_savepoint := self.items(i).create_savepoint_if_needed();
-          --before each
-          if l_completed_without_errors then
+            --savepoint
+            l_item_savepoint := self.items(i).create_savepoint_if_needed();
+
+            --before each
             --includes listener calls for before and after actions
             l_completed_without_errors := self.before_each.do_execute(self, a_listener);
-          end if;
 
-          -- execute the item (test or suite)
-          if l_completed_without_errors then
-            l_completed_without_errors := self.items(i).do_execute(a_listener);
-          end if;
-
-          --after each
-          if l_completed_without_errors then
+            -- execute the item (test or suite)
+            if l_completed_without_errors then
+              l_completed_without_errors := self.items(i).do_execute(a_listener);
+            else
+              self.items(i).fail(a_listener, 'Beforeach procedure failed:'||chr(10)||ut_assert_processor.get_asserts_results()(1).error_message);
+            end if;
+
+            --after each
             --includes listener calls for before and after actions
+            --run afteeach even if a test raised an exception
             l_completed_without_errors := self.after_each.do_execute(self, a_listener);
+            if not l_completed_without_errors then
+              self.put_warning('Aftereach procedure failed:'||chr(10)||ut_assert_processor.get_asserts_results()(1).error_message);
+            end if;
+
+            --rollback to savepoint
+            self.items(i).rollback_to_savepoint(l_item_savepoint);
+
+          end loop;
+
+          l_suite_step_without_errors := self.after_all.do_execute(self, a_listener);
+          if not l_suite_step_without_errors then
+            self.put_warning('Afterall procedure failed: '||chr(10)||ut_assert_processor.get_asserts_results()(1).error_message);
           end if;
-          --rollback to savepoint
-          self.items(i).rollback_to_savepoint(l_item_savepoint);
-
---          exit when not l_completed_without_errors;
-        end loop;
-      end if;
-
-      if l_completed_without_errors then
-        l_completed_without_errors := self.after_all.do_execute(self, a_listener);
+        else
+          do_fail('Beforeall procedure failed: '||chr(10));
+        end if;
+
+        self.rollback_to_savepoint(l_suite_savepoint);
+
+      else
+        do_fail(null);
       end if;
 
       self.calc_execution_result();
-
-      self.rollback_to_savepoint(l_suite_savepoint);
-
       self.end_time := current_timestamp;
 
-      a_listener.fire_after_event(ut_utils.gc_suite,self);
     end if;
+    a_listener.fire_after_event(ut_utils.gc_suite,self);
 
     return l_completed_without_errors;
   end;

diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb
@@ -29,6 +29,7 @@ create or replace type body ut_suite_item as
     self.rollback_type := a_rollback_type;
     self.ignore_flag := ut_utils.boolean_to_int(a_ignore_flag);
     self.results_count := ut_results_counter();
+    self.warnings := ut_varchar2_list();
   end;
 
   member procedure set_ignore_flag(self in out nocopy ut_suite_item, a_ignore_flag boolean) is
@@ -40,6 +41,12 @@ create or replace type body ut_suite_item as
   begin
     return ut_utils.int_to_boolean(self.ignore_flag);
   end;
+
+  final member procedure do_execute(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base) is
+    l_completed_without_errors boolean;
+  begin
+    l_completed_without_errors := self.do_execute(a_listener);
+  end;  
 
   member function create_savepoint_if_needed return varchar2 is
     l_savepoint varchar2(30);
@@ -67,6 +74,13 @@ create or replace type body ut_suite_item as
   begin
     return ut_utils.time_diff(start_time, end_time);
   end;
+
+  member procedure put_warning(self in out nocopy ut_suite_item, a_message varchar2) is
+  begin
+    self.warnings.extend;
+    self.warnings(self.warnings.last) := a_message;
+    self.results_count.increase_warning_count;
+  end;
 
 end;
 /
diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps
@@ -1,4 +1,4 @@
-create or replace type ut_suite_item under ut_suite_item_base (
+create or replace type ut_suite_item force under ut_suite_item_base (
   /*
   utPLSQL - Version X.X.X.X
   Copyright 2016 - 2017 utPLSQL Project
@@ -27,8 +27,10 @@ create or replace type ut_suite_item under ut_suite_item_base (
   member function execution_time return number,
 
   not instantiable member function  do_execute(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base) return boolean,
-  not instantiable member procedure do_execute(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base),
-  not instantiable member procedure calc_execution_result(self in out nocopy ut_suite_item)
+  final member procedure do_execute(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base),
+  not instantiable member procedure calc_execution_result(self in out nocopy ut_suite_item),
+  not instantiable member procedure fail(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base, a_failure_msg varchar2),
+  member procedure put_warning(self in out nocopy ut_suite_item, a_message varchar2)
 
 )
 not final not instantiable
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,7 +88,7 @@ create or replace type body ut_event_listener is @@
           end if;
         end loop;
-      end;
+      end fire_event;
     end;
     /