Removing a hash function from api into utils package which is more suited for it.

lwasylow · lwasylow · commit 02d41a64b391 · 2022-04-07T11:39:03.000+01:00
diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb
@@ -265,37 +265,6 @@ create or replace package body ut_runner is
     end loop;
   end;
 
-  function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2 is
-    l_start_pos pls_integer := 1;
-    l_end_pos   pls_integer := 1;
-    l_result    varchar2(4000);
-    l_item      varchar2(4000);
-    l_at_end    boolean := false;
-  begin
-    if a_random_seed is null then
-      l_result := a_path;
-      end if;
-    if a_path is not null then
-      loop
-        l_end_pos := instr(a_path,'.',l_start_pos);
-        if l_end_pos = 0 then
-          l_end_pos := length(a_path)+1;
-          l_at_end  := true;
-          end if;
-        l_item := substr(a_path,l_start_pos,l_end_pos-l_start_pos);
-        if l_item is not null then
-          l_result  :=
-            l_result ||
-              ut_utils.get_hash( to_char( dbms_utility.get_hash_value( l_item, 1, a_random_seed ) ) );
-          end if;
-        exit when l_at_end;
-        l_result  := l_result || chr(0);
-        l_start_pos := l_end_pos + 1;
-      end loop;
-      end if;
-    return l_result;
-  end;
-
   procedure coverage_start(a_coverage_run_id raw) is
   begin
     ut_coverage.coverage_start(a_coverage_run_id);
diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks
@@ -151,11 +151,6 @@ create or replace package ut_runner authid current_user is
    */
   function get_reporters_list return tt_reporters_info pipelined;
 
-  /*
-  * Returns a hash value of suitepath based on input path and random seed
-  */
-  function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2;
-
   procedure coverage_start(a_coverage_run_id raw);
 
   procedure coverage_stop;
diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb
@@ -270,7 +270,7 @@ create or replace package body ut_suite_cache_manager is
     extract_parent_child as (
         select s.path, substr(s.path,1,instr(s.path,'.',-1,1)-1) as parent_path,s.object_owner,
           case when a_random_seed is null then s.line_no else null end line_no,
-          case when a_random_seed is null then null else ut_runner.hash_suite_path(s.path, a_random_seed) end random_seed
+          case when a_random_seed is null then null else ut_utils.hash_suite_path(s.path, a_random_seed) end random_seed
           from table(a_suite_rows) s),        
       t1(path,parent_path,object_owner,line_no,random_seed) as (
         --Anchor memeber
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -892,6 +892,37 @@ create or replace package body ut_utils is
     return case when a_data is null then null else dbms_crypto.hash(a_data, a_hash_type) end;
   end;
 
+  function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2 is
+    l_start_pos pls_integer := 1;
+    l_end_pos   pls_integer := 1;
+    l_result    varchar2(4000);
+    l_item      varchar2(4000);
+    l_at_end    boolean := false;
+  begin
+    if a_random_seed is null then
+      l_result := a_path;
+      end if;
+    if a_path is not null then
+      loop
+        l_end_pos := instr(a_path,'.',l_start_pos);
+        if l_end_pos = 0 then
+          l_end_pos := length(a_path)+1;
+          l_at_end  := true;
+          end if;
+        l_item := substr(a_path,l_start_pos,l_end_pos-l_start_pos);
+        if l_item is not null then
+          l_result  :=
+            l_result ||
+              ut_utils.get_hash( to_char( dbms_utility.get_hash_value( l_item, 1, a_random_seed ) ) );
+          end if;
+        exit when l_at_end;
+        l_result  := l_result || chr(0);
+        l_start_pos := l_end_pos + 1;
+      end loop;
+      end if;
+    return l_result;
+  end;
+
   function qualified_sql_name(a_name varchar2) return varchar2 is
   begin
     return
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -452,6 +452,11 @@ create or replace package ut_utils authid definer is
   */
   function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash;
 
+  /*
+  * Returns a hash value of suitepath based on input path and random seed
+  */
+  function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2;
+
   /*
   * Verifies that the input string is a qualified SQL name using sys.dbms_assert.qualified_sql_name
   * If null value passed returns null
