Addresing sonar issues

lwasylow · lwasylow · commit 52c0307bbb5d · 2022-04-01T00:33:09.000+01:00
diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb
@@ -195,12 +195,15 @@ create or replace package body ut_runner is
     l_cursor       sys_refcursor;
     l_results      ut_suite_items_info;
     c_bulk_limit   constant integer := 100;
+    i pls_integer;
   begin
     l_cursor := ut_suite_manager.get_suites_info(ut_varchar2_list(nvl(a_path,sys_context('userenv', 'current_schema'))));
     loop
       fetch l_cursor bulk collect into l_results limit c_bulk_limit;
-      for i in 1 .. l_results.count loop
+      i := l_results.first;
+      while (i is not null) loop
         pipe row (l_results(i));
+        i := l_results.next(i);
       end loop;
       exit when l_cursor%notfound;
     end loop;
diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb
@@ -131,8 +131,10 @@ create or replace package body ut_suite_cache_manager is
     c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_\*]+))?(\.([A-Za-z0-9$#_\*]+))?$';
     l_results            ut_path_items := ut_path_items();
     l_path_item          ut_path_item;
+    i                    pls_integer;
   begin
-    for i in 1 .. a_paths.count loop
+    i := a_paths.first;
+    while (i is not null) loop
       l_results.extend;     
       if a_paths(i) like '%:%' then
         l_path_item := ut_path_item(schema_name => upper(regexp_substr(a_paths(i),'^[^.:]+')),
@@ -143,7 +145,8 @@ create or replace package body ut_suite_cache_manager is
                                     object_name => regexp_substr(a_paths(i), c_package_path_regex, subexpression => 3),
                                     procedure_name => regexp_substr(a_paths(i), c_package_path_regex, subexpression => 5));
         l_results(l_results.last) := l_path_item;
-      end if;  
+      end if;
+      i := a_paths.next(i);
     end loop;
     
     return l_results;
@@ -189,7 +192,7 @@ create or replace package body ut_suite_cache_manager is
       bulk collect into l_schema_paths
       from 
       (select schema_name,object_name,procedure_name,suite_path,
-      row_number() over ( partition by schema_name,object_name,procedure_name,suite_path order by 1) r_num
+      row_number() over ( partition by schema_name,object_name,procedure_name,suite_path order by 1) as r_num
       from paths_to_expand)
       where r_num = 1 ;
     return l_schema_paths;
@@ -211,7 +214,7 @@ create or replace package body ut_suite_cache_manager is
   begin
     select obj bulk collect into  l_suite_items
     from (
-    select  /*+ cardinality(c 500) */ value(c) as obj,row_number() over ( partition by path order by path asc) r_num  
+    select  /*+ cardinality(c 500) */ value(c) as obj,row_number() over ( partition by path order by path asc) as r_num  
       from ut_suite_cache c,
       table(a_schema_paths)  sp
       where c.object_owner = upper(sp.schema_name)
@@ -301,7 +304,7 @@ create or replace package body ut_suite_cache_manager is
     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(a_object_owner,a_object_name,a_procedure_name,a_path));
+    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;
   
@@ -314,10 +317,6 @@ create or replace package body ut_suite_cache_manager is
     l_suite_items     ut_suite_cache_rows := ut_suite_cache_rows();
     l_schema_paths    ut_path_items;
     l_tags            ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows());
-
-    l_suite_item_name varchar2(20);
-    l_paths           ut_varchar2_rows;
-    l_schema          varchar2(4000);
     l_sql             varchar2(32767);
   begin     
 
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -82,12 +82,9 @@ create or replace package body ut_suite_manager is
           l_schema := sys.dbms_assert.schema_name(upper(l_object));
         exception
           when sys.dbms_assert.invalid_schema_name then
-            if l_object like '%*%' then
+            if l_object like '%*%' or ut_metadata.package_exists_in_cur_schema(upper(l_object)) then
               a_paths(i) := c_current_schema || '.' || a_paths(i);
               l_schema := c_current_schema;              
-            elsif ut_metadata.package_exists_in_cur_schema(upper(l_object)) then
-              a_paths(i) := c_current_schema || '.' || a_paths(i);
-              l_schema := c_current_schema;
             else
               raise;
             end if;
@@ -531,7 +528,6 @@ create or replace package body ut_suite_manager is
     l_paths              ut_varchar2_list := a_paths;
     l_schema_names       ut_varchar2_rows;
     l_schema_paths       ut_path_items;
-    l_reconcile_paths    ut_path_items;
     l_schema             varchar2(4000);
   begin
     ut_event_manager.trigger_event('configure_execution_by_path - start');
