Merge branch 'develop' into feature/createarchive

rlove · web-flow · commit 58969df9c30e · 2017-01-17T14:30:06.000-07:00
diff --git a/source/core/types/ut_assert_result.tpb b/source/core/types/ut_assert_result.tpb
@@ -59,13 +59,13 @@ create or replace type body ut_assert_result is
 
       if self.result != ut_utils.tr_success then
         if self.actual_value_string is not null or self.actual_type is not null then
-          l_actual_val_msg := '  expected (actual value): ';
+          l_actual_val_msg := '  expected this: ';
           l_actual_val := self.actual_value_string || '(' || self.actual_type || ')';
         end if;
 
-        l_expected_msg := '  '||self.matcher_name || self.additional_info;
+        l_expected_msg := '  ' || self.matcher_name || self.additional_info;
         if self.expected_value_string is not null or self.expected_type is not null then
-          l_expected_msg := l_expected_msg || ' (expected value): ';
+          l_expected_msg := l_expected_msg || ': ';
           l_expected_val := self.expected_value_string||'('||self.expected_type||')';
           if length(l_expected_msg) > length(l_actual_val_msg) then
             l_actual_val_msg := rpad(l_actual_val_msg , length(l_expected_msg));
diff --git a/source/core/ut_annotations.pkb b/source/core/ut_annotations.pkb
diff --git a/source/core/ut_annotations.pks b/source/core/ut_annotations.pks
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -411,6 +411,8 @@ create or replace package body ut_suite_manager is
     for i in 1 .. l_paths.count loop
       l_path   := l_paths(i);
       l_schema := regexp_substr(l_path, '^(\w+)(\.|:|$)', 1, 1, null, 1);
+      
+      l_schema := sys.dbms_assert.schema_name(upper(l_schema));
 
       l_schema_suites := get_schema_suites(upper(l_schema));
 
@@ -434,6 +436,11 @@ create or replace package body ut_suite_manager is
             l_procedure_name := regexp_substr(l_path, '^\w+\.(\w+)(\.(\w+))?$', subexpression => 3);
 
             l_temp_suite := config_package(l_schema, l_package_name);
+            
+            if l_temp_suite is null then
+              raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema||'.'||l_package_name|| ' not found');
+            end if;
+            
             l_path       := rtrim(l_schema || ':' || l_temp_suite.path || '.' || l_procedure_name, '.');
           end;
         end if;
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -49,6 +49,10 @@ create or replace package ut_utils authid definer is
   gc_invalid_path_format constant pls_integer := -20202;
   pragma exception_init(ex_invalid_path_format, -20202);
   
+  ex_suite_package_not_found exception;
+  gc_suite_package_not_found constant pls_integer := -20204;
+  pragma exception_init(ex_suite_package_not_found, -20204);
+  
   -- Reporting event time not supported
   ex_invalid_rep_event_time exception;
   gc_invalid_rep_event_time constant pls_integer := -20210;
diff --git a/source/expectations/matchers/ut_be_between.tpb b/source/expectations/matchers/ut_be_between.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_between is
 
   member procedure init(self in out nocopy ut_be_between, a_lower_bound ut_data_value, a_upper_bound ut_data_value) is
   begin
-    self.name            := lower($$plsql_unit);
+    self.name            := 'be between';
     self.lower_bound     := a_lower_bound;
     self.upper_bound     := a_upper_bound;
     self.additional_info := 'between ' || a_lower_bound.to_string || ' and ' || a_upper_bound.to_string;
diff --git a/source/expectations/matchers/ut_be_false.tpb b/source/expectations/matchers/ut_be_false.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_false as
 
   constructor function ut_be_false(self in out nocopy ut_be_false) return self as result is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be false';
     return;
   end;
 
diff --git a/source/expectations/matchers/ut_be_greater_or_equal.tpb b/source/expectations/matchers/ut_be_greater_or_equal.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_greater_or_equal AS
 
   member procedure init(self in out nocopy ut_be_greater_or_equal, a_expected ut_data_value) is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be greater or equal';
     self.expected := a_expected;
   end;
 
diff --git a/source/expectations/matchers/ut_be_greater_than.tpb b/source/expectations/matchers/ut_be_greater_than.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_greater_than AS
 
   member procedure init(self in out nocopy ut_be_greater_than, a_expected ut_data_value) is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be greater than';
     self.expected := a_expected;
   end;
 
diff --git a/source/expectations/matchers/ut_be_less_or_equal.tpb b/source/expectations/matchers/ut_be_less_or_equal.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_less_or_equal AS
 
   member procedure init(self in out nocopy ut_be_less_or_equal, a_expected ut_data_value) is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be less or equal';
     self.expected := a_expected;
   end;
 
diff --git a/source/expectations/matchers/ut_be_less_than.tpb b/source/expectations/matchers/ut_be_less_than.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_less_than as
 
   member procedure init(self in out nocopy ut_be_less_than, a_expected ut_data_value) is
   begin
-    self.name     := lower($$plsql_unit);
+    self.name     := 'be less than';
     self.expected := a_expected;
   end;
 
diff --git a/source/expectations/matchers/ut_be_like.tpb b/source/expectations/matchers/ut_be_like.tpb
@@ -8,7 +8,7 @@ create or replace type body ut_be_like as
        self.additional_info := self.additional_info ||' escape '''||a_escape_char||'''';
      end if;
     end if;
-    self.name        := lower($$plsql_unit);
+    self.name        := 'be like';
     self.mask        := a_mask;
     self.escape_char := a_escape_char;
     return;
diff --git a/source/expectations/matchers/ut_be_not_null.tpb b/source/expectations/matchers/ut_be_not_null.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_not_null as
 
   constructor function ut_be_not_null(self in out nocopy ut_be_not_null) return self as result is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be not null';
     return;
   end;
 
diff --git a/source/expectations/matchers/ut_be_null.tpb b/source/expectations/matchers/ut_be_null.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_null as
 
   constructor function ut_be_null(self in out nocopy ut_be_null) return self as result is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be null';
     return;
   end;
 
diff --git a/source/expectations/matchers/ut_be_true.tpb b/source/expectations/matchers/ut_be_true.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_true as
 
   constructor function ut_be_true(self in out nocopy ut_be_true) return self as result is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be true';
     return;
   end;
 
diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb
@@ -3,7 +3,7 @@ create or replace type body ut_equal as
   member procedure init(self in out nocopy ut_equal, a_expected ut_data_value, a_nulls_are_equal boolean) is
   begin
     self.nulls_are_equal_flag := ut_utils.boolean_to_int( coalesce(a_nulls_are_equal, ut_assert_processor.nulls_are_equal()) );
-    self.name := lower($$plsql_unit);
+    self.name := 'equal';
     self.expected := a_expected;
   end;
 
diff --git a/source/expectations/matchers/ut_match.tpb b/source/expectations/matchers/ut_match.tpb
@@ -8,7 +8,7 @@ create or replace type body ut_match as
        self.additional_info := self.additional_info ||', modifiers '''||a_modifiers||'''';
      end if;
     end if;
-    self.name      := lower($$plsql_unit);
+    self.name      := 'match';
     self.pattern   := a_pattern;
     self.modifiers := a_modifiers;
     return;
diff --git a/source/install.sql b/source/install.sql
@@ -46,8 +46,8 @@ whenever oserror exit failure rollback
 @@core/types/ut_reporters.tps
 @@core/types/ut_event_listener.tps
 --annoations
-@@core/annotations/ut_annotations.pks
-@@core/annotations/ut_annotations.pkb
+@@core/ut_annotations.pks
+@@core/ut_annotations.pkb
 
 --suite manager
 @@core/ut_suite_manager.pks
