fix broken dependencies with ut_types

Pavel Kaplya · Pazus · commit 3453eb9ca162 · 2016-07-21T20:44:21.000+03:00
diff --git a/source/types/ut_assert_result.tpb b/source/types/ut_assert_result.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_assert_result is
   
   member function result_to_char(self in ut_assert_result) return varchar2 is
   begin
-    return ut_types.test_result_to_char(result);
+    return ut_utils.test_result_to_char(result);
   end;
   
 end;
diff --git a/source/types/ut_execution_result.tpb b/source/types/ut_execution_result.tpb
@@ -4,13 +4,13 @@ create or replace type body ut_execution_result is
     return self as result is
   begin
     self.start_time := a_start_time;
-		self.result := ut_types.tr_success;
+		self.result := ut_utils.tr_success;
     return;
   end ut_execution_result;
 
   member function result_to_char(self in ut_execution_result) return varchar2 is
   begin
-    return ut_types.test_result_to_char(self.result);
+    return ut_utils.test_result_to_char(self.result);
   end result_to_char;
 
 end;
diff --git a/source/types/ut_test_suite.tpb b/source/types/ut_test_suite.tpb
@@ -33,14 +33,14 @@ create or replace type body ut_test_suite is
     self.execution_result.end_time := current_timestamp;
   
     for i in self.items.first .. self.items.last loop
-      if (self.execution_result.result = ut_types.tr_success and self.items(i)
-         .execution_result.result in (ut_types.tr_failure, ut_types.tr_error)) or
-         (self.execution_result.result = ut_types.tr_failure and self.items(i)
-         .execution_result.result = ut_types.tr_error) then
+      if (self.execution_result.result = ut_utils.tr_success and self.items(i)
+         .execution_result.result in (ut_utils.tr_failure, ut_utils.tr_error)) or
+         (self.execution_result.result = ut_utils.tr_failure and self.items(i)
+         .execution_result.result = ut_utils.tr_error) then
         self.execution_result.result := self.items(i).execution_result.result;
       end if;
     
-      exit when self.execution_result.result = ut_types.tr_error;
+      exit when self.execution_result.result = ut_utils.tr_error;
     end loop;
   
     if a_reporter is not null then
diff --git a/source/ut_assert.pkb b/source/ut_assert.pkb
@@ -20,14 +20,14 @@ create or replace package body ut_assert is
   
     if a_assert_list is not null then
     
-      v_result := ut_types.tr_success;
+      v_result := ut_utils.tr_success;
       for i in a_assert_list.first .. a_assert_list.last loop
-        if a_assert_list(i).result = ut_types.tr_failure then
-          v_result := ut_types.tr_failure;
+        if a_assert_list(i).result = ut_utils.tr_failure then
+          v_result := ut_utils.tr_failure;
         end if;
       
-        if a_assert_list(i).result = ut_types.tr_error then
-          v_result := ut_types.tr_error;
+        if a_assert_list(i).result = ut_utils.tr_error then
+          v_result := ut_utils.tr_error;
           exit;
         end if;
       end loop;
@@ -83,19 +83,19 @@ create or replace package body ut_assert is
 
   procedure report_success(message in varchar2, expected in varchar2, actual in varchar2) is
   begin
-    report_assert(ut_types.tr_success
+    report_assert(ut_utils.tr_success
                  ,nvl(message, '') || ' expected: ' || nvl(expected, '') || ' actual: ' || nvl(actual, ''));
   end;
 
   procedure report_failure(message in varchar2, expected in varchar2, actual in varchar2) is
   begin
-    report_assert(ut_types.tr_failure
+    report_assert(ut_utils.tr_failure
                  ,nvl(message, '') || ' expected: ' || nvl(expected, '') || ' actual: ' || nvl(actual, ''));
   end;
 
   procedure report_error(message in varchar2) is
   begin
-    report_assert(ut_types.tr_error, message);
+    report_assert(ut_utils.tr_error, message);
   end;
 
   procedure are_equal(expected in number, actual in number) is
