Merge pull request #176 from Pazus/feature/disabled_tag

jgebal · web-flow · commit 633a25f90a14 · 2017-01-21T14:33:41.000Z
renamed "disable" annotation to "disabled"
diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md
@@ -38,7 +38,7 @@ create or replace package test_pkg is
 
   -- %test
   -- %displayname(Name of test3)
-  -- %disable
+  -- %disabled
   procedure test3;
   
   -- %test(Name of test4)
@@ -73,4 +73,4 @@ end test_pkg;
 | `%beforetest(<procedure_name>)` | Procedure | Denotes that mentioned procedure should be executed before the annotated `%test` procedure. |
 | `%aftertest(<procedure_name>)` | Procedure | Denotes that mentioned procedure should be executed after the annotated `%test` procedure. |
 | `%rollback(<type>)` | Package/procedure | Configure transaction control behaviour (type). Supported values: `auto`(default) - rollback to savepoint (before the test/suite setup) is issued after each test/suite teardown; `manual` - rollback is never issued automatically. Property can be overridden for child element (test in suite) |
-| `%disable` | Package/procedure | Used to disable a suite or a test |
+| `%disabled` | Package/procedure | Used to disable a suite or a test |
diff --git a/examples/between_string/test_betwnstr.pkg b/examples/between_string/test_betwnstr.pkg
@@ -15,7 +15,7 @@ create or replace package test_betwnstr as
   procedure null_string;
 
   -- %test(Demo of a disabled test)
-  -- %disable
+  -- %disabled
   procedure disabled_test;
 
 end;
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -102,7 +102,7 @@ create or replace package body ut_suite_manager is
           a_path                  => l_suite_path,  --a patch for this suite (excluding the package name of current suite)
           a_description           => l_suite_name,
           a_rollback_type         => l_suite_rollback,
-          a_ignore_flag           => l_annotation_data.package_annotations.exists('disable'),
+          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,
@@ -156,7 +156,7 @@ create or replace package body ut_suite_manager is
                 a_description   => l_displayname,
                 a_path          => l_suite.path || '.' || l_proc_name,
                 a_rollback_type => l_rollback_type,
-                a_ignore_flag   => l_proc_annotations.exists('disable'),
+                a_ignore_flag   => l_proc_annotations.exists('disabled'),
                 a_before_test_proc_name => l_setup_procedure,
                 a_after_test_proc_name  => l_teardown_procedure
             );
diff --git a/tests/helpers/test_package_3.pck b/tests/helpers/test_package_3.pck
@@ -22,6 +22,10 @@ create or replace package test_package_3 is
   procedure test2_setup;
 
   procedure test2_teardown;
+  
+  --%test
+  --%disabled
+  procedure disabled_test;
 
 end test_package_3;
 /
@@ -64,6 +68,11 @@ create or replace package body test_package_3 is
     gv_var_1      := gv_var_1_temp;
     gv_var_1_temp := null;
   end;
+  
+  procedure disabled_test is
+  begin
+    null;
+  end;
 
 end test_package_3;
 /
diff --git a/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheSchema.sql b/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheSchema.sql
@@ -31,7 +31,7 @@ begin
         ut.expect(l_test2_suite.items.count).to_equal(2);
       when 'tests2' then          
         ut.expect(l_test1_suite.name).to_equal('test_package_3');
-        ut.expect(l_test1_suite.items.count).to_equal(2);
+        ut.expect(l_test1_suite.items.count).to_equal(3);
     end case;
   
   end loop;
diff --git a/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByName.sql b/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByName.sql
@@ -7,6 +7,8 @@ declare
   
   l_test0_suite ut_logical_suite;
   l_test1_suite ut_logical_suite;
+  l_test1        ut_test;
+  l_test3        ut_test;
 begin  
 --Act
   l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path));
@@ -20,7 +22,15 @@ begin
   l_test1_suite :=  treat(l_test0_suite.items(1) as ut_logical_suite);
   
   ut.expect(l_test1_suite.name).to_equal('test_package_3');
-  ut.expect(l_test1_suite.items.count).to_equal(2);
+  ut.expect(l_test1_suite.items.count).to_equal(3);
+  
+  l_test1 := treat(l_test1_suite.items(1) as ut_test);
+  ut.expect(l_test1.name).to_equal('test1');
+  ut.expect(l_test1.ignore_flag).to_equal(0);
+  
+  l_test3 := treat(l_test1_suite.items(3) as ut_test);
+  ut.expect(l_test3.name).to_equal('disabled_test');
+  ut.expect(l_test3.ignore_flag).to_equal(1);
   
   if ut_assert_processor.get_aggregate_asserts_result = ut_utils.tr_success then
     :test_result := ut_utils.tr_success;
diff --git a/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByPath.sql b/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByPath.sql
@@ -7,6 +7,8 @@ declare
   
   l_test0_suite ut_logical_suite;
   l_test1_suite ut_logical_suite;
+  l_test1        ut_test;
+  l_test3        ut_test;
 begin  
 --Act
   l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path));
@@ -20,7 +22,15 @@ begin
   l_test1_suite :=  treat(l_test0_suite.items(1) as ut_logical_suite);
   
   ut.expect(l_test1_suite.name).to_equal('test_package_3');
-  ut.expect(l_test1_suite.items.count).to_equal(2);
+  ut.expect(l_test1_suite.items.count).to_equal(3);
+  
+  l_test1 := treat(l_test1_suite.items(1) as ut_test);
+  ut.expect(l_test1.name).to_equal('test1');
+  ut.expect(l_test1.ignore_flag).to_equal(0);
+  
+  l_test3 := treat(l_test1_suite.items(3) as ut_test);
+  ut.expect(l_test3.name).to_equal('disabled_test');
+  ut.expect(l_test3.ignore_flag).to_equal(1);
   
   if ut_assert_processor.get_aggregate_asserts_result = ut_utils.tr_success then
     :test_result := ut_utils.tr_success;
