added old syntax

Pazus · Pazus · commit 22398ceaa080 · 2017-01-11T09:21:21.000+03:00
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -55,6 +55,8 @@ create or replace package body ut_suite_manager is
       
       if l_annotation_data.package_annotations.exists('displayname') then
         l_suite_name         := ut_annotations.get_annotation_param(l_annotation_data.package_annotations('displayname'), 1);
+      elsif l_annotation_data.package_annotations('suite').count>0 then
+        l_suite_name         := ut_annotations.get_annotation_param(l_annotation_data.package_annotations('suite'), 1);
       end if;
 
       if l_annotation_data.package_annotations.exists('suitepath') then
@@ -129,6 +131,8 @@ create or replace package body ut_suite_manager is
             
             if l_proc_annotations.exists('displayname') then
               l_displayname := ut_annotations.get_annotation_param(l_proc_annotations('displayname'), 1);
+            elsif l_proc_annotations('test').count>0 then
+              l_displayname := ut_annotations.get_annotation_param(l_proc_annotations('test'), 1);
             end if;
 
             if l_proc_annotations.exists('rollback') then
diff --git a/tests/helpers/test_package_1.pck b/tests/helpers/test_package_1.pck
@@ -12,9 +12,10 @@ create or replace package test_package_1 is
   procedure global_teardown;
 
   --%test
+  --%displayname(Test1 from test package 1)
   procedure test1;
 
-  --%test
+  --%test(Test2 from test package 1)
   --%beforetest(test2_setup)
   --%aftertest(test2_teardown)
   procedure test2;
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,6 +22,22 @@ 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).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).ignore_flag).to_equal(0);
+  
+  -- temporary behavior.
+  -- decided that when executed by package, not path, only that package has to execute
   l_test2_suite :=  treat(l_test1_suite.items(3) as ut_suite);
   
   ut.expect(l_test2_suite.name).to_equal('test_package_2');
@@ -30,6 +46,18 @@ begin
   
   if ut_assert_processor.get_aggregate_asserts_result = ut_utils.tr_success then
     :test_result := ut_utils.tr_success;
+  else
+    declare
+      l_results ut_assert_results;
+    begin
+      l_results := ut_assert_processor.get_asserts_results;
+      for i in 1..l_results.count loop
+        if l_results(i).result > ut_utils.tr_success then
+          dbms_output.put_line(l_results(i).get_result_clob);
+        end if;
+      end loop;
+    end;
+
   end if;
 
 end;
diff --git a/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureByPath.sql b/tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureByPath.sql
@@ -26,6 +26,7 @@ begin
   l_test_proc := treat(l_test1_suite.items(1) as ut_test);   
   
   ut.expect(l_test_proc.name).to_equal('test2');
+  ut.expect(l_test_proc.description).to_equal('Test2 from test package 1');
   ut.expect(l_test_proc.before_test is not null).to_be_true;
   ut.expect(l_test_proc.after_test is not null).to_be_true;
   
