Added tests for ut.run procedure

lwasylow · lwasylow · commit 5ee864177ae7 · 2019-04-24T19:40:00.000+01:00
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -17,6 +17,7 @@ create or replace package body ut_suite_manager is
   */
 
   gc_suitpath_error_message constant varchar2(100) := 'Suitepath exceeds 1000 CHAR on: ';
+  gc_tag_errmsg             constant number := 450;
 
   type t_path_item is record (
     object_name    varchar2(250),
@@ -691,6 +692,34 @@ create or replace package body ut_suite_manager is
     return l_suites;
   end;
 
+  function build_no_test_error_msg(
+    a_schema_name in varchar2,
+    a_suite_path in varchar2,
+    a_procedure_name in varchar2,
+    a_object_name in varchar2,
+    a_tags in varchar2    
+    ) return varchar2 is
+    l_error_msg varchar2(500);
+  begin
+    if a_suite_path is not null then 
+      l_error_msg := 'No suite packages found for path '||a_schema_name||':'||a_suite_path;
+    elsif a_procedure_name is not null then 
+      l_error_msg := 'Suite test '||a_schema_name||'.'||a_object_name|| '.'||a_procedure_name||' does not exist';
+    elsif a_object_name is not null then
+      l_error_msg := 'Suite package '||a_schema_name||'.'||a_object_name|| ' does not exist';
+    end if;
+    
+    if l_error_msg is null and a_tags is not null then
+      l_error_msg := 'No tests found for tags: '||ut_utils.to_string(a_tags,a_max_output_len => gc_tag_errmsg);
+    elsif l_error_msg is not null and a_tags is not null then
+      l_error_msg := l_error_msg||'with tags: '||ut_utils.to_string(a_tags,a_max_output_len => gc_tag_errmsg);
+    end if;
+    
+    l_error_msg := l_error_msg ||'.';
+    
+    return l_error_msg;
+  end;
+
   procedure configure_execution_by_path(
     a_paths in ut_varchar2_list,
     a_suites out nocopy ut_suite_items,
@@ -730,15 +759,9 @@ create or replace package body ut_suite_manager is
             a_tags
           );
         if a_suites.count = l_suites_count then
-          if l_path_item.suite_path is not null then
-            raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for path '||l_schema||':'||l_path_item.suite_path|| '.');
-          elsif l_path_item.procedure_name is not null then
-            raise_application_error(ut_utils.gc_suite_package_not_found,'Suite test '||l_schema||'.'||l_path_item.object_name|| '.'||l_path_item.procedure_name||' does not exist');
-          elsif l_path_item.object_name is not null then
-            raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema||'.'||l_path_item.object_name|| ' does not exist');
-          elsif a_tags is not null then
-            raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for tags: '||ut_utils.to_string(a_tags,a_max_output_len => 450));
-          end if;
+          raise_application_error(ut_utils.gc_suite_package_not_found,build_no_test_error_msg(
+            l_schema,l_path_item.suite_path,l_path_item.procedure_name,
+            l_path_item.object_name,a_tags));
         end if;
         l_index := a_suites.first;
         l_suites_count := a_suites.count;
diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb
@@ -206,7 +206,7 @@ create or replace package body run_helper is
       procedure test1;
 
       --%test(Test2 from test package 1)
-      --%tags(test1,suite1test1)
+      --%tags(test1,suite1test2)
       procedure test2;
 
     end test_package_1;
diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb
@@ -895,6 +895,62 @@ Failures:%
     ut.expect( l_results ).to_be_like( '%test_package_2%' );
     ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); 
   end;  
+ 
+  procedure run_proc_pkg_name_no_tag is
+    l_results clob;
+    l_exp_message varchar2(4000);
+  begin
+    l_exp_message :=q'[ORA-20204: Suite package ut3_tester_helper.test_package_1 does not existwith tags: 'nonexists'.]';
+    ut3.ut.run('ut3_tester_helper.test_package_1',a_tags => 'nonexists');
+    l_results :=  ut3_tester_helper.main_helper.get_dbms_output_as_clob();
+        ut.fail('Expecte test to fail');
+  exception
+    when others then
+    ut.expect( sqlerrm ).to_be_like( l_exp_message );
+  end; 
+  
+  procedure run_proc_pkg_name_tag is
+    l_results clob;
+  begin
+    ut3.ut.run('ut3_tester_helper.test_package_1',a_tags => 'suite1test1');
+    l_results :=  ut3_tester_helper.main_helper.get_dbms_output_as_clob();
+    --Assert
+    ut.expect( l_results ).to_be_like( '%test_package_1%' );
+    ut.expect( l_results ).to_be_like( '%test_package_1.test1%executed%' ); 
+    ut.expect( l_results ).not_to_be_like( '%test_package_1.test2%' ); 
+    ut.expect( l_results ).not_to_be_like( '%test_package_2%' );
+    ut.expect( l_results ).not_to_be_like( '%test_package_3%' );
+  end;
+  
+  procedure run_pkg_name_file_list_tag is
+    l_results clob;
+  begin
+    ut3.ut.run('ut3_tester_helper.test_package_1',a_tags => 'suite1test1');
+    l_results :=  ut3_tester_helper.main_helper.get_dbms_output_as_clob();
+    --Assert
+    ut.expect( l_results ).to_be_like( '%test_package_1%' );
+    ut.expect( l_results ).to_be_like( '%test_package_1.test1%executed%' ); 
+    ut.expect( l_results ).not_to_be_like( '%test_package_1.test2%' ); 
+    ut.expect( l_results ).not_to_be_like( '%test_package_2%' );
+    ut.expect( l_results ).not_to_be_like( '%test_package_3%' );
+  end;
+  
+  procedure run_proc_path_list_tag is
+    l_results clob;
+  begin
+     ut3.ut.run(
+       'ut3_tester_helper.test_package_1',
+       ut3.ut_sonar_test_reporter(), a_source_files => ut3.ut_varchar2_list(),a_tags => 'suite1',
+       a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb',
+         'tests/ut3_tester_helper.test_package_2.pkb',
+         'tests/ut3_tester_helper.test_package_3.pkb')
+       );
+    l_results :=  ut3_tester_helper.main_helper.get_dbms_output_as_clob();
+    --Assert
+    ut.expect( l_results ).to_be_like( '%tests/ut3_tester_helper.test_package_1.pkb%' );
+    ut.expect( l_results ).not_to_be_like( '%tests/ut3_tester_helper.test_package_2.pkb%' );
+    ut.expect( l_results ).not_to_be_like( '%tests/ut3_tester_helper.test_package_3.pkb%' );
+  end;
   
 end;
 /
diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks
@@ -168,7 +168,7 @@ create or replace package test_ut_run is
   --%beforeall(create_ut3$user#_tests)
   --%afterall(drop_ut3$user#_tests)
   
-  --%test(Execute test by tag)
+  --%test(Execute test by tag ut_run)
   procedure test_run_by_one_tag;
   
   --%test( Execute suite by one tag)
@@ -194,6 +194,18 @@ create or replace package test_ut_run is
   
   --%test(Execute suite test for duplicate list tags)
   procedure suite_duplicate_tag;   
+
+  --%test(Run a package by name with non existing tag)
+  procedure run_proc_pkg_name_no_tag;
+
+  --%test(Runs given package only with package name given as path and filter by tag)
+  procedure run_proc_pkg_name_tag;
+  
+  --%test(Runs all from given package with package name given as path and coverage file list with tag)
+  procedure run_pkg_name_file_list_tag;
+  
+  --%test(Runs tests from given paths with paths list and tag)
+  procedure run_proc_path_list_tag;  
   
   --%endcontext
   
