Resolves #393 and #394 and #367

jgebal · jgebal · commit 08f35df36439 · 2017-07-12T01:40:36.000+01:00
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -351,18 +351,34 @@ create or replace package body ut_suite_manager is
     l_schema_ut_packages ut_object_names := ut_object_names();
     l_schema_suites      tt_schema_suites;
     l_iter               varchar2(4000);
+    procedure populate_suite_ut_packages(a_suite ut_logical_suite, a_packages in out nocopy ut_object_names) is
+      l_sub_suite ut_logical_suite;
+    begin
+      if a_packages is null then
+        a_packages := ut_object_names();
+      end if;
+      if a_suite is of (ut_suite) then
+        a_packages.extend;
+        a_packages(a_packages.last) := ut_object_name(a_suite.object_owner, a_suite.object_name);
+      end if;
+      for i in 1 .. a_suite.items.count loop
+        if a_suite.items(i) is of (ut_logical_suite) then
+          l_sub_suite := treat(a_suite.items(i) as ut_logical_suite);
+          populate_suite_ut_packages(l_sub_suite, a_packages);
+        end if;
+      end loop;
+    end;
   begin
     if a_schema_names is not null then
       for i in 1 .. a_schema_names.count loop
         l_schema_suites := get_schema_suites(a_schema_names(i));
         l_iter := l_schema_suites.first;
         while l_iter is not null loop
-          l_schema_ut_packages.extend;
-          l_schema_ut_packages(l_schema_ut_packages.last) := ut_object_name(l_schema_suites(l_iter).object_owner, l_schema_suites(l_iter).object_name);
+          populate_suite_ut_packages(l_schema_suites(l_iter), l_schema_ut_packages);
           l_iter := l_schema_suites.next(l_iter);
         end loop;
       end loop;
---      l_schema_ut_packages := set(l_schema_ut_packages);
+      l_schema_ut_packages := set(l_schema_ut_packages);
     end if;
 
     return l_schema_ut_packages;
diff --git a/tests/RunAll.sql b/tests/RunAll.sql
@@ -259,7 +259,7 @@ exec ut_coverage.coverage_start_develop();
 @@lib/RunTest.sql ut_utils/ut_utils.to_string.veryBigVarchar2.sql
 @@lib/RunTest.sql ut_utils/ut_utils.to_string.verySmallNumber.sql
 
-
+@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql
 --Finally
 @@lib/RunSummary
 
diff --git a/tests/helpers/html_coverage_test.pck b/tests/helpers/html_coverage_test.pck
@@ -1,25 +1,25 @@
-CREATE OR REPLACE PACKAGE ut3$user#.html_coverage_test IS
+create or replace package ut3$user#.html_coverage_test is
 
    -- Author  : LUW07
    -- Created : 23/05/2017 09:37:29
    -- Purpose : Supporting html coverage procedure
 
    -- Public type declarations
-   PROCEDURE run_if_statment(o_result OUT NUMBER);
-END HTML_COVERAGE_TEST;
+   procedure run_if_statment(o_result out number);
+end html_coverage_test;
 /
-CREATE OR REPLACE PACKAGE BODY ut3$user#.html_coverage_test IS
+create or replace package body ut3$user#.html_coverage_test is
 
    -- Private type declarations
-   PROCEDURE run_if_statment(o_result OUT NUMBER) IS
-      l_testedvalue NUMBER := 1;
-      l_success     NUMBER := 0;
-   BEGIN
-      IF l_testedvalue = 1 THEN
+   procedure run_if_statment(o_result out number) is
+      l_testedvalue number := 1;
+      l_success     number := 0;
+   begin
+      if l_testedvalue = 1 then
          l_success := 1;
-      END IF;
-      
+      end if;
+
       o_result := l_success;
-   END run_if_statment;
-END HTML_COVERAGE_TEST;
+   end run_if_statment;
+end html_coverage_test;
 /
diff --git a/tests/ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql b/tests/ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql
@@ -0,0 +1,33 @@
+-- set termout off
+-- create or replace package tests as
+--   procedure dummy;
+-- end;
+-- /
+-- set termout on
+
+declare
+  l_expected ut_object_names;
+  l_actual   ut_object_names;
+begin
+  l_expected := ut_object_names(
+    ut_object_name(user,'TEST_PACKAGE_1'),
+    ut_object_name(user,'TEST_PACKAGE_2'),
+    ut_object_name(user,'TEST_PACKAGE_3'),
+    ut_object_name(user,'TEST_REPORTERS_1'),
+    ut_object_name(user,'TEST_REPORTERS')
+  );
+  l_actual := ut_suite_manager.get_schema_ut_packages(ut_varchar2_list(user));
+  if l_actual = l_expected then
+    :test_result := ut_utils.tr_success;
+  else
+    dbms_output.put_line('actual:'||xmltype(anydata.convertcollection(l_actual)).getclobval());
+    dbms_output.put_line('expected:'||xmltype(anydata.convertcollection(l_expected)).getclobval());
+  end if;
+end;
+/
+
+-- set termout off
+-- drop package tests
+-- /
+-- set termout on
+--
