Merge branch 'develop' into feature/color_reporter

Pazus · web-flow · commit 91cc456016ef · 2017-01-20T08:26:54.000+03:00
diff --git a/examples/between_string/test_betwnstr.pkg b/examples/between_string/test_betwnstr.pkg
@@ -13,6 +13,11 @@ create or replace package test_betwnstr as
 
   -- %test(Returns null for null input string value)
   procedure null_string;
+
+  -- %test(Demo of a disabled test)
+  -- %disable
+  procedure disabled_test;
+
 end;
 /
 create or replace package body test_betwnstr as
@@ -37,5 +42,10 @@ create or replace package body test_betwnstr as
     ut.expect( betwnstr( null, 2, 5 ) ).to_( be_null );
   end;
 
+  procedure disabled_test is
+  begin
+    ut.expect( betwnstr( null, null, null) ).not_to( be_null );
+  end;
+
 end;
 /
diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb
@@ -36,19 +36,17 @@ create or replace type body ut_test as
 
     ut_utils.debug_log('ut_test.execute');
 
+    a_listener.fire_before_event(ut_utils.gc_test,self);
+    self.start_time := current_timestamp;
+
     if self.get_ignore_flag() then
       self.result := ut_utils.tr_ignore;
       ut_utils.debug_log('ut_test.execute - ignored');
-      self.start_time := current_timestamp;
-      self.end_time := current_timestamp;
+      self.results_count := ut_results_counter(self.result);
+      self.end_time := self.start_time;
     else
-
-      a_listener.fire_before_event(ut_utils.gc_test,self);
-
       if self.is_valid() then
 
-        self.start_time := current_timestamp;
-
         l_savepoint := self.create_savepoint_if_needed();
 
         --includes listener calls for before and after actions
@@ -67,9 +65,8 @@ create or replace type body ut_test as
       end if;
       self.calc_execution_result();
       self.end_time := current_timestamp;
-      a_listener.fire_after_event(ut_utils.gc_test,self);
-
     end if;
+    a_listener.fire_after_event(ut_utils.gc_test,self);
     return l_completed_without_errors;
   end;
 
diff --git a/source/reporters/ut_xunit_reporter.tpb b/source/reporters/ut_xunit_reporter.tpb
@@ -20,7 +20,7 @@ create or replace type body ut_xunit_reporter is
     begin
       self.print_text(
           '<testcase classname="'||get_path(a_test.path, a_test.name)||'" ' ||
-          ' assertions="'||a_test.results.count||'"' ||
+          ' assertions="'||coalesce(cardinality(a_test.results),0)||'"' ||
           self.get_common_item_attributes(a_test) ||
           ' status="'||ut_utils.test_result_to_char(a_test.result)||'"' ||
           '>'
