moved beforeeach/aftereach to ut_test

Pazus · Pazus · commit 24da4d66762e · 2017-02-26T13:10:49.000+03:00
diff --git a/examples/demo_expectations.pck b/examples/demo_expectations.pck
@@ -32,11 +32,11 @@ create or replace package demo_expectations is
   procedure demo_to_be_null_failure;
 
   -- %test
-  -- %displayname(demo of failure for to_be_null expectation )
+  -- %displayname(demo of success for to_be_null expectation )
   procedure demo_to_be_null_success;
 
   -- %test
-  -- %displayname(demo of success for to_be_not_null expectation )
+  -- %displayname(demo of failure for to_be_not_null expectation )
   procedure demo_to_be_not_null_failure;
 
   -- %test
diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb
@@ -19,15 +19,13 @@ create or replace type body ut_suite  as
   constructor function ut_suite (
     self in out nocopy ut_suite , a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, a_path varchar2, a_description varchar2 := null,
     a_rollback_type integer := null, a_ignore_flag boolean := false, a_before_all_proc_name varchar2 := null,
-    a_after_all_proc_name varchar2 := null, a_before_each_proc_name varchar2 := null, a_after_each_proc_name varchar2 := null
+    a_after_all_proc_name varchar2 := null
   ) return self as result is
   begin
     self.self_type := $$plsql_unit;
     self.init(a_object_owner, a_object_name, a_name, a_description, a_path, a_rollback_type, a_ignore_flag);
     self.before_all := ut_executable(self, a_before_all_proc_name, ut_utils.gc_before_all);
-    self.before_each := ut_executable(self, a_before_each_proc_name, ut_utils.gc_before_each);
     self.items := ut_suite_items();
-    self.after_each := ut_executable(self, a_after_each_proc_name, ut_utils.gc_after_each);
     self.after_all := ut_executable(self, a_after_all_proc_name, ut_utils.gc_after_all);
     return;
   end;
@@ -37,18 +35,15 @@ create or replace type body ut_suite  as
   begin
     l_is_valid :=
       ( not self.before_all.is_defined() or self.before_all.is_valid() ) and
-      ( not self.before_each.is_defined() or self.before_each.is_valid() ) and
-      ( not self.after_each.is_defined() or self.after_each.is_valid() ) and
       ( not self.after_all.is_defined() or self.after_all.is_valid() );
     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
     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
@@ -59,15 +54,15 @@ create or replace type body ut_suite  as
   begin
     ut_utils.debug_log('ut_suite.execute');
     a_listener.fire_before_event(ut_utils.gc_suite,self);
-    
-    self.start_time := current_timestamp;    
+
+    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
-      
+
       if self.is_valid() then
 
         l_suite_savepoint := self.create_savepoint_if_needed();
@@ -77,45 +72,19 @@ create or replace type body ut_suite  as
 
         if l_suite_step_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
-            --includes listener calls for before and after actions
-            l_completed_without_errors := self.before_each.do_execute(self, a_listener);
-
-            -- 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);
-
+            self.items(i).do_execute(a_listener);
           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;
         else
           do_fail('Beforeall procedure failed: '||chr(10));
         end if;
 
+        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;
+
         self.rollback_to_savepoint(l_suite_savepoint);
-        
+
       else
         do_fail(null);
       end if;
@@ -126,7 +95,7 @@ create or replace type body ut_suite  as
     end if;
     a_listener.fire_after_event(ut_utils.gc_suite,self);
 
-    return l_completed_without_errors;
+    return l_suite_step_without_errors;
   end;
 
 end;
diff --git a/source/core/types/ut_suite.tps b/source/core/types/ut_suite.tps
@@ -20,16 +20,7 @@ create or replace type ut_suite  under ut_logical_suite (
   * Procedure exists within the package of the suite
   */
   before_all   ut_executable,
-  /**
-  * The procedure to be invoked before each of the child items of the suite (executed each time for each item)
-  * Procedure exists within the package of the suite
-  */
-  before_each  ut_executable,
-  /**
-  * The procedure to be invoked after each of the child items of the suite (executed each time for each item)
-  * Procedure exists within the package of the suite
-  */
-  after_each   ut_executable,
+
   /**
   * The procedure to be invoked after all of the items of the suite (executed once)
   * Procedure exists within the package of the suite
@@ -38,7 +29,7 @@ create or replace type ut_suite  under ut_logical_suite (
   constructor function ut_suite (
     self in out nocopy ut_suite , a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, a_path varchar2, a_description varchar2 := null,
     a_rollback_type integer := null, a_ignore_flag boolean := false, a_before_all_proc_name varchar2 := null,
-    a_after_all_proc_name varchar2 := null, a_before_each_proc_name varchar2 := null, a_after_each_proc_name varchar2 := null
+    a_after_all_proc_name varchar2 := null
   ) return self as result,
   overriding member function is_valid return boolean,
   /**
diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb
@@ -18,24 +18,30 @@ create or replace type body ut_test as
 
   constructor function ut_test(
     self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, a_description varchar2 := null,
-    a_path varchar2 := null, a_rollback_type integer := null, a_ignore_flag boolean := false, a_before_test_proc_name varchar2 := null, a_after_test_proc_name varchar2 := null
+    a_path varchar2 := null, a_rollback_type integer := null, a_ignore_flag boolean := false, 
+    a_before_each_proc_name varchar2 := null, a_before_test_proc_name varchar2 := null,
+    a_after_test_proc_name varchar2 := null, a_after_each_proc_name varchar2 := null
   ) return self as result is
   begin
     self.self_type := $$plsql_unit;
     self.init(a_object_owner, a_object_name, a_name, a_description, a_path, a_rollback_type, a_ignore_flag);
+    self.before_each := ut_executable(self, a_before_each_proc_name, ut_utils.gc_before_each);
     self.before_test := ut_executable(self, a_before_test_proc_name, ut_utils.gc_before_test);
     self.item := ut_executable(self, a_name, ut_utils.gc_test_execute);
     self.after_test := ut_executable(self, a_after_test_proc_name, ut_utils.gc_after_test);
+    self.after_each := ut_executable(self, a_after_each_proc_name, ut_utils.gc_after_each);
     return;
   end;
 
   member function is_valid return boolean is
     l_is_valid boolean;
   begin
     l_is_valid :=
+      ( not self.before_each.is_defined() or self.before_each.is_valid() ) and
       ( not self.before_test.is_defined() or self.before_test.is_valid() ) and
       ( self.item.is_valid()  ) and
-      ( not self.after_test.is_defined() or self.after_test.is_valid() );
+      ( not self.after_test.is_defined() or self.after_test.is_valid() ) and
+      ( not self.after_each.is_defined() or self.after_each.is_valid() );
     return l_is_valid;
   end;
 
@@ -60,19 +66,24 @@ create or replace type body ut_test as
         l_savepoint := self.create_savepoint_if_needed();
 
         --includes listener calls for before and after actions
-        l_completed_without_errors := self.before_test.do_execute(self, a_listener);
-
+        l_completed_without_errors := self.before_each.do_execute(self, a_listener);
+        
         if l_completed_without_errors then
-          -- execute the test
-          self.item.do_execute(self, a_listener);
+          l_completed_without_errors := self.before_test.do_execute(self, a_listener);
 
-        end if;
-        -- perform cleanup regardless of the test or setup failure
-        self.after_test.do_execute(self, a_listener);
+          if l_completed_without_errors then
+            -- execute the test
+            self.item.do_execute(self, a_listener);
 
+          end if;
+          -- perform cleanup regardless of the test or setup failure
+          self.after_test.do_execute(self, a_listener);
+        end if;
+        
+        self.after_each.do_execute(self, a_listener);
         self.rollback_to_savepoint(l_savepoint);
-
       end if;
+      
       self.calc_execution_result();
       self.end_time := current_timestamp;
     end if;
diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps
@@ -15,6 +15,11 @@ create or replace type ut_test under ut_suite_item (
   See the License for the specific language governing permissions and
   limitations under the License.
   */
+  /*
+  * The procedure to be invoked before invoking the test and before_test  procedure.
+  * Procedure exists within the same package as the test itself and is similar for all tests in the suite
+  */
+  before_each ut_executable,
   /**
   * The procedure to be invoked before invoking the test
   * Procedure exists within the same package as the test itself
@@ -29,14 +34,21 @@ create or replace type ut_test under ut_suite_item (
   * Procedure exists within the same package as the test itself
   */
   after_test  ut_executable,
+  /*
+  * The procedure to be invoked after invoking the test and after_test  procedure.
+  * Procedure exists within the same package as the test itself and is similar for all tests in the suite
+  */
+  after_each ut_executable,
   /**
   * The list of assert results as well as database errors encountered while invoking
   * The test procedure and the before_test/after_test blocks
   */
   results     ut_assert_results,
   constructor function ut_test(
     self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, a_description varchar2 := null,
-    a_path varchar2 := null, a_rollback_type integer := null, a_ignore_flag boolean := false, a_before_test_proc_name varchar2 := null, a_after_test_proc_name varchar2 := null
+    a_path varchar2 := null, a_rollback_type integer := null, a_ignore_flag boolean := false, 
+    a_before_each_proc_name varchar2 := null, a_before_test_proc_name varchar2 := null,
+    a_after_test_proc_name varchar2 := null, a_after_each_proc_name varchar2 := null
   ) return self as result,
   member function is_valid return boolean,
   overriding member function do_execute(self in out nocopy ut_test, a_listener in out nocopy ut_event_listener_base) return boolean,
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -120,9 +120,7 @@ create or replace package body ut_suite_manager is
           a_rollback_type         => l_suite_rollback,
           a_ignore_flag           => l_annotation_data.package_annotations.exists('disabled'),
           a_before_all_proc_name  => l_suite_setup_proc,
-          a_after_all_proc_name   => l_suite_teardown_proc,
-          a_before_each_proc_name => l_default_setup_proc,
-          a_after_each_proc_name  => l_default_teardown_proc
+          a_after_all_proc_name   => l_suite_teardown_proc
       );
 
 
@@ -174,7 +172,9 @@ create or replace package body ut_suite_manager is
                 a_rollback_type => l_rollback_type,
                 a_ignore_flag   => l_proc_annotations.exists('disabled'),
                 a_before_test_proc_name => l_setup_procedure,
-                a_after_test_proc_name  => l_teardown_procedure
+                a_after_test_proc_name  => l_teardown_procedure,
+                a_before_each_proc_name => l_default_setup_proc,
+                a_after_each_proc_name  => l_default_teardown_proc
             );
 
             l_suite.add_item(l_test);
@@ -418,13 +418,13 @@ create or replace package body ut_suite_manager is
       end if;
     end skip_by_path;
 
-    function package_exists_in_cur_schema(p_package_name varchar2) return boolean is
+    function package_exists_in_cur_schema(a_package_name varchar2) return boolean is
       l_cnt number;
     begin
       select count(*)
         into l_cnt
         from all_objects t
-       where t.object_name = upper(p_package_name)
+       where t.object_name = upper(a_package_name)
          and t.object_type = 'PACKAGE'
          and t.owner = c_current_schema;
       return l_cnt > 0;
diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb
@@ -44,7 +44,7 @@ create or replace type body ut_teamcity_reporter is
 
     l_test_full_name := lower(a_test.item.owner_name)||'.'||lower(a_test.item.object_name)||'.'||lower(a_test.item.procedure_name);
 
-    self.print_text(ut_teamcity_reporter_helper.test_started(a_test_name => l_test_full_name));
+    self.print_text(ut_teamcity_reporter_helper.test_started(a_test_name => l_test_full_name,a_capture_standard_output => true));
 
   end;
 
