Extra tests and cleanup of old code.

lwasylow · lwasylow · commit 8f8d257fc9de · 2022-04-01T01:02:39.000+01:00
diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb
@@ -290,24 +290,6 @@ create or replace package body ut_suite_cache_manager is
     return expand_paths(group_paths_by_schema(a_paths));
   end;
   
-  function get_cached_suite_rows(
-    a_object_owner     varchar2,
-    a_path             varchar2 := null,
-    a_object_name      varchar2 := null,
-    a_procedure_name   varchar2 := null,
-    a_random_seed      positive := null,
-    a_tags             ut_varchar2_rows := null
-  ) return ut_suite_cache_rows is
-    l_tags            ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows());
-    l_object_owner    varchar2(250) := ut_utils.qualified_sql_name(a_object_owner);
-    l_object_name     varchar2(250) := ut_utils.qualified_sql_name(a_object_name);
-    l_procedure_name  varchar2(250) := ut_utils.qualified_sql_name(a_procedure_name);
-    l_schema_paths    ut_path_items;
-  begin
-    l_schema_paths := ut_path_items(ut_path_item(l_object_owner,l_object_name,l_procedure_name,a_path));
-    return get_cached_suite_rows(l_schema_paths,a_random_seed,l_tags);
-  end;
-  
   function get_cached_suite_rows(
     a_schema_paths     ut_path_items,
     a_random_seed      positive := null,
diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks
@@ -46,22 +46,13 @@ create or replace package ut_suite_cache_manager authid definer is
   * Not to be used publicly. Used internally for building suites at runtime.
   */
   function get_cached_suite_rows(
-    a_object_owner     varchar2,
-    a_path             varchar2 := null,
-    a_object_name      varchar2 := null,
-    a_procedure_name   varchar2 := null,
+    a_schema_paths     ut_path_items,
     a_random_seed      positive := null,
     a_tags             ut_varchar2_rows := null
   ) return ut_suite_cache_rows;
   
   function get_schema_paths(a_paths in ut_varchar2_list) return ut_path_items;
   
-  function get_cached_suite_rows(
-    a_schema_paths     ut_path_items,
-    a_random_seed      positive := null,
-    a_tags             ut_varchar2_rows := null
-  ) return ut_suite_cache_rows;
-
   /*
   * Retrieves suite item info rows from cache.
   * Returned data is not filtered by user access rights.
diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb
@@ -344,6 +344,38 @@ end;';
     ut.expect(l_actual).to_equal(l_expected);
   end;
 
+  procedure test_get_suites_info_by_path is
+    l_expected sys_refcursor;
+    l_actual   sys_refcursor;
+  begin
+    --Arrange
+    open l_expected for
+      select
+             'UT3_USER'  object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name,
+             'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no,
+             'some.path.dummy_test_package' path, 0 disabled_flag, null disabled_reason,null tags
+        from dual union all
+      select
+             'UT3_USER'  object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name,
+             'dummy_test' item_description, 'UT_TEST' item_type, 6 item_line_no,
+             'some.path.dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag, null disabled_reason,null tags
+        from dual union all
+      select
+             'UT3_USER'  object_owner, 'PATH' object_name, 'PATH' item_name,
+             null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no,
+             'some.path' path, 0 disabled_flag, null disabled_reason, null tags
+        from dual union all
+      select
+             'UT3_USER'  object_owner, 'SOME' object_name, 'SOME' item_name,
+             null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no,
+             'some' path, 0 disabled_flag, null disabled_reason, null tags
+        from dual;
+    --Act
+    open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('ut3_user:some.path.dummy_test_package'));
+    --Assert
+    ut.expect(l_actual).to_equal(l_expected);
+  end;
+
   procedure test_get_reporters_list is
     l_expected sys_refcursor;
     l_actual   sys_refcursor;
diff --git a/test/ut3_user/api/test_ut_runner.pks b/test/ut3_user/api/test_ut_runner.pks
@@ -65,6 +65,11 @@ create or replace package test_ut_runner is
   --%aftertest(cleanup_cache)
   procedure test_get_suites_info_twotag;  
 
+  --%test(get_suites_info returns a cursor containing records for a newly created test with passed path)
+  --%beforetest(setup_cache_objects)
+  --%aftertest(cleanup_cache)
+  procedure test_get_suites_info_by_path;
+
   --%test(get_reporters_list returns a cursor containing all built-in reporters and information about output-reporter)
   --%beforetest(setup_cache_objects)
   --%aftertest(cleanup_cache)
