Added test for floating --%disabled annotation.

jgebal · jgebal · commit 318b9ef61818 · 2017-12-07T23:09:04.000Z
Separated skipping tests and suites from executing them.
diff --git a/source/core/types/ut_logical_suite.tpb b/source/core/types/ut_logical_suite.tpb
@@ -52,6 +52,18 @@ create or replace type body ut_logical_suite as
     self.items(self.items.last) := a_item;
   end;
 
+  overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base) is
+  begin
+    a_listener.fire_before_event(ut_utils.gc_suite,self);
+    self.start_time := current_timestamp;
+    for i in 1 .. self.items.count loop
+      self.items(i).mark_as_skipped(a_listener);
+    end loop;
+    self.end_time := self.start_time;
+    a_listener.fire_after_event(ut_utils.gc_suite,self);
+    self.calc_execution_result();
+  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);
diff --git a/source/core/types/ut_logical_suite.tps b/source/core/types/ut_logical_suite.tps
@@ -30,6 +30,7 @@ create or replace type ut_logical_suite 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 procedure mark_as_skipped(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base),
   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 calc_execution_result(self in out nocopy ut_logical_suite),
   overriding member procedure mark_as_errored(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base, a_error_stack_trace varchar2),
diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb
@@ -47,13 +47,17 @@ create or replace type body ut_run as
     return;
   end;
 
+  overriding member procedure mark_as_skipped(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base) is
+  begin
+    null;
+  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
     ut_utils.debug_log('ut_run.execute');
 
     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
diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps
@@ -33,6 +33,7 @@ create or replace type ut_run under ut_suite_item (
     a_project_file_mappings ut_file_mappings := null,
     a_test_file_mappings    ut_file_mappings := null
   ) return self as result,
+  overriding member procedure mark_as_skipped(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base),
   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 calc_execution_result(self in out nocopy ut_run),
   overriding member procedure mark_as_errored(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base, a_error_stack_trace varchar2),
diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb
@@ -54,17 +54,11 @@ create or replace type body ut_suite  as
 
     ut_utils.set_action(self.object_name);
 
-    a_listener.fire_before_event(ut_utils.gc_suite,self);
-
-    self.start_time := current_timestamp;
-
     if self.get_disabled_flag() then
-      for i in 1 .. self.items.count loop
-        self.items(i).do_execute(a_listener);
-      end loop;
-      ut_utils.debug_log('ut_suite.execute - disabled');
+      self.mark_as_skipped(a_listener);
     else
-
+      a_listener.fire_before_event(ut_utils.gc_suite,self);
+      self.start_time := current_timestamp;
       if self.is_valid() then
 
         l_suite_savepoint := self.create_savepoint_if_needed();
@@ -90,10 +84,10 @@ create or replace type body ut_suite  as
       else
         propagate_error(ut_utils.table_to_clob(self.get_error_stack_traces()));
       end if;
+      self.calc_execution_result();
+      self.end_time := current_timestamp;
+      a_listener.fire_after_event(ut_utils.gc_suite,self);
     end if;
-    self.calc_execution_result();
-    self.end_time := current_timestamp;
-    a_listener.fire_after_event(ut_utils.gc_suite,self);
 
     ut_utils.set_action(null);
 
diff --git a/source/core/types/ut_suite.tps b/source/core/types/ut_suite.tps
@@ -32,9 +32,6 @@ create or replace type ut_suite  under ut_logical_suite (
     a_after_all_proc_name varchar2 := null
   ) return self as result,
   overriding member function is_valid(self in out nocopy ut_suite) return boolean,
-  /**
-  * Finds the item in the suite by it's name and returns the item index
-  */
   overriding member function do_execute(self in out nocopy ut_suite , a_listener in out nocopy ut_event_listener_base) return boolean,
   overriding member function get_error_stack_traces(self ut_suite) return ut_varchar2_list,
   overriding member function get_serveroutputs return clob
diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps
@@ -23,6 +23,7 @@ create or replace type ut_suite_item force under ut_suite_item_base (
     a_description varchar2, a_path varchar2, a_rollback_type integer, a_disabled_flag boolean),
   member procedure set_disabled_flag(self in out nocopy ut_suite_item, a_disabled_flag boolean),
   member function get_disabled_flag return boolean,
+  not instantiable member procedure mark_as_skipped(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base),
   member function create_savepoint_if_needed return varchar2,
   member procedure rollback_to_savepoint(self in out nocopy ut_suite_item, a_savepoint varchar2),
   member function get_transaction_invalidators return ut_varchar2_list,
diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb
@@ -53,22 +53,29 @@ create or replace type body ut_test as
     return l_is_valid;
   end;
 
+  overriding member procedure mark_as_skipped(self in out nocopy ut_test, a_listener in out nocopy ut_event_listener_base) is
+  begin
+    a_listener.fire_before_event(ut_utils.gc_test,self);
+    self.start_time := current_timestamp;
+    self.result := ut_utils.tr_disabled;
+    ut_utils.debug_log('ut_test.execute - disabled');
+    self.results_count.set_counter_values(self.result);
+    self.end_time := self.start_time;
+    a_listener.fire_after_event(ut_utils.gc_test,self);
+  end;
+
   overriding member function do_execute(self in out nocopy ut_test, a_listener in out nocopy ut_event_listener_base) return boolean is
     l_completed_without_errors boolean;
     l_savepoint                varchar2(30);
   begin
 
     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_disabled_flag() then
-      self.result := ut_utils.tr_disabled;
-      ut_utils.debug_log('ut_test.execute - disabled');
-      self.results_count.set_counter_values(self.result);
-      self.end_time := self.start_time;
+      mark_as_skipped(a_listener);
     else
+      a_listener.fire_before_event(ut_utils.gc_test,self);
+      self.start_time := current_timestamp;
       if self.is_valid() then
 
         l_savepoint := self.create_savepoint_if_needed();
@@ -94,8 +101,8 @@ create or replace type body ut_test as
 
       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/core/types/ut_test.tps b/source/core/types/ut_test.tps
@@ -58,6 +58,7 @@ create or replace type ut_test under ut_suite_item (
   member function is_valid(self in out nocopy ut_test) return boolean,
   member procedure set_beforeeach(self in out nocopy ut_test, a_before_each_proc_name varchar2),
   member procedure set_aftereach(self in out nocopy ut_test, a_after_each_proc_name varchar2),
+  overriding member procedure mark_as_skipped(self in out nocopy ut_test, a_listener in out nocopy ut_event_listener_base),
   overriding member function do_execute(self in out nocopy ut_test, a_listener in out nocopy ut_event_listener_base) return boolean,
   overriding member procedure calc_execution_result(self in out nocopy ut_test),
   overriding member procedure mark_as_errored(self in out nocopy ut_test, a_listener in out nocopy ut_event_listener_base, a_error_stack_trace varchar2),
diff --git a/test/ut_suite_manager/test_suite_manager.pkb b/test/ut_suite_manager/test_suite_manager.pkb
@@ -1261,7 +1261,47 @@ end;';
   begin
     execute immediate 'drop package test_package_same_1';
     execute immediate 'drop package test_package_same_1_a';
-    null;
+  end;
+
+  procedure setup_disabled_pck is
+    pragma autonomous_transaction;
+  begin
+    execute immediate q'[create or replace package test_disabled_floating as
+  --%suite
+
+  --%test
+  procedure test1;
+
+  --%disabled
+
+  --%test
+  procedure test2;
+
+end;]';
+  end;
+
+  procedure clean_disabled_pck is
+    pragma autonomous_transaction;
+  begin
+    execute immediate 'drop package test_disabled_floating';
+  end;
+
+  procedure disable_suite_floating_annot is
+    l_objects_to_run ut3.ut_suite_items;
+    l_suite          ut3.ut_suite;
+  begin
+    --Arrange
+    setup_disabled_pck;
+    --Act
+    l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('test_disabled_floating'));
+
+    --Assert
+    ut.expect(l_objects_to_run.count).to_equal(1);
+    l_suite := treat(l_objects_to_run(1) as ut3.ut_suite);
+    ut.expect(l_suite.name).to_equal('test_disabled_floating');
+    ut.expect(l_suite.get_disabled_flag()).to_be_true();
+
+    clean_disabled_pck;
   end;
 
 end test_suite_manager;
diff --git a/test/ut_suite_manager/test_suite_manager.pks b/test/ut_suite_manager/test_suite_manager.pks
@@ -129,16 +129,15 @@ create or replace package test_suite_manager is
   procedure setup_empty_suite_path;
   procedure clean_empty_suite_path;
 
-  --%test
-  --%disabled
-  --procedure IncludesPackagesWithSutePath;
-  
   --%test(only the defined in suitepath suite/test is executed if multiple similarly named test suites exist in the context differed only by comment)
   --%beforetest(setup_pck_with_same_path)
-  --%aftertest(clean_pck_with_same_path)  
+  --%aftertest(clean_pck_with_same_path)
   procedure test_pck_with_same_path;
   procedure setup_pck_with_same_path;
   procedure clean_pck_with_same_path;
 
+  --%test(Whole suite gets disabled with floating annotation)
+  procedure disable_suite_floating_annot;
+
 end test_suite_manager;
 /
