made corresponding changes to tests

Pazus · Pazus · commit 15740aacaef6 · 2017-02-26T13:56:56.000+03:00
diff --git a/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByName.sql b/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByName.sql
@@ -22,18 +22,19 @@ begin
   
   ut.expect(l_test1_suite.name).to_equal('test_package_1');
   ut.expect(l_test1_suite.items.count).to_equal(3);
-  ut.expect(l_test1_suite.before_each is not null).to_be_true;
   
   ut.expect(l_test1_suite.items(1).name).to_equal('test1');
   ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1');
   ut.expect(treat(l_test1_suite.items(1) as ut_test).before_test.is_defined).to_be_false;
   ut.expect(treat(l_test1_suite.items(1) as ut_test).after_test.is_defined).to_be_false;
+  ut.expect(treat(l_test1_suite.items(1) as ut_test).before_each.is_defined).to_be_true;
   ut.expect(treat(l_test1_suite.items(1) as ut_test).ignore_flag).to_equal(0);
   
   ut.expect(l_test1_suite.items(2).name).to_equal('test2');
   ut.expect(l_test1_suite.items(2).description).to_equal('Test2 from test package 1');
   ut.expect(treat(l_test1_suite.items(2) as ut_test).before_test.is_defined).to_be_true;
   ut.expect(treat(l_test1_suite.items(2) as ut_test).after_test.is_defined).to_be_true;
+  ut.expect(treat(l_test1_suite.items(2) as ut_test).before_each.is_defined).to_be_true;
   ut.expect(treat(l_test1_suite.items(2) as ut_test).ignore_flag).to_equal(0);
   
   -- temporary behavior.
diff --git a/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByNameCurUser.sql b/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByNameCurUser.sql
@@ -22,18 +22,19 @@ begin
   
   ut.expect(l_test1_suite.name).to_equal('test_package_1');
   ut.expect(l_test1_suite.items.count).to_equal(3);
-  ut.expect(l_test1_suite.before_each is not null).to_be_true;
   
   ut.expect(l_test1_suite.items(1).name).to_equal('test1');
   ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1');
   ut.expect(treat(l_test1_suite.items(1) as ut_test).before_test.is_defined).to_be_false;
   ut.expect(treat(l_test1_suite.items(1) as ut_test).after_test.is_defined).to_be_false;
+  ut.expect(treat(l_test1_suite.items(1) as ut_test).before_each.is_defined).to_be_true;
   ut.expect(treat(l_test1_suite.items(1) as ut_test).ignore_flag).to_equal(0);
   
   ut.expect(l_test1_suite.items(2).name).to_equal('test2');
   ut.expect(l_test1_suite.items(2).description).to_equal('Test2 from test package 1');
   ut.expect(treat(l_test1_suite.items(2) as ut_test).before_test.is_defined).to_be_true;
   ut.expect(treat(l_test1_suite.items(2) as ut_test).after_test.is_defined).to_be_true;
+  ut.expect(treat(l_test1_suite.items(2) as ut_test).before_each.is_defined).to_be_true;
   ut.expect(treat(l_test1_suite.items(2) as ut_test).ignore_flag).to_equal(0);
   
   -- temporary behavior.
diff --git a/tests/ut_test_suite/ut_test_suite.ReportsWarningsATestWhenAfterEachFails.sql b/tests/ut_test_suite/ut_test_suite.ReportsWarningsATestWhenAfterEachFails.sql
@@ -25,7 +25,7 @@ begin
   dbms_output.get_lines( l_output_data, l_num_lines);
   if failing_after_each.gv_glob_val = 2 then
     for i in 1 .. l_num_lines loop
-      if l_output_data(i) like '%2 tests, 2 failed, 0 errored% 2 warning%' then
+      if l_output_data(i) like '%2 tests, 0 failed, 2 errored%' then
         :test_result := ut_utils.tr_success;
       end if;
     end loop;
