Improved reporting on usage of incompatible matcher, when using 'to_'

jgebal · jgebal · commit 9fff9d09544a · 2016-10-16T23:14:34.000+01:00
diff --git a/examples/demo_expectations.pck b/examples/demo_expectations.pck
@@ -196,12 +196,16 @@ create or replace package body demo_expectations is
     ut.expect( l_null_boolean ).to_( be_true );
     ut.expect( l_null_boolean ).to_( be_true() );
 
+    ut.expect( 'a string value' ).to_( be_true() );
+
     ut.expect( true ).to_be_false;
     ut.expect( true ).to_( be_false );
     ut.expect( true ).to_( be_false() );
     ut.expect( l_null_boolean ).to_be_false;
     ut.expect( l_null_boolean ).to_( be_false );
     ut.expect( l_null_boolean ).to_( be_false() );
+
+    ut.expect( 'a string value' ).to_( be_false() );
   end;
 
   procedure demo_to_be_true_false_success is
@@ -410,6 +414,10 @@ create or replace package body demo_expectations is
     ut.expect( l_clob ).to_match('^Stephen$', 'i'); --case insensitive
     ut.expect( l_clob ).to_( match('^Stephen$') );
     ut.expect( l_clob ).to_( match('^Stephen$', 'i') ); --case insensitive
+
+    ut.expect( sysdate ).to_( match('^Stephen$', 'i') ); --case insensitive
+    ut.expect( 12345 ).to_( match('^Stephen$', 'i') ); --case insensitive
+
   end;
 
   procedure demo_to_matchl_success is
diff --git a/source/assertions/ut_assertion.tpb b/source/assertions/ut_assertion.tpb
@@ -1,12 +1,12 @@
 create or replace type body ut_assertion as
 
   final member procedure add_assert_result( self in ut_assertion,  a_assert_result boolean, a_assert_name varchar2,
-    a_expected_value_string in varchar2 := null, a_expected_data_type varchar2 := null) is
+    a_assert_info varchar2, a_expected_value_string in varchar2 := null, a_expected_data_type varchar2 := null) is
   begin
     ut_utils.debug_log('ut_assertion.add_assert_result :' || ut_utils.to_test_result(a_assert_result) || ':' || message);
     ut_assert_processor.add_assert_result(
       ut_assert_result(
-        a_assert_name, ut_utils.to_test_result(a_assert_result),
+        a_assert_name, a_assert_info, ut_utils.to_test_result(a_assert_result),
         a_expected_data_type, self.actual_data.type, a_expected_value_string, self.actual_data.to_string(), self.message
       )
     );
@@ -80,16 +80,17 @@ create or replace type body ut_assertion as
 
   member procedure to_(self in ut_assertion, a_expectation ut_expectation) is
     l_assert_result boolean;
-    l_assert_name   varchar2(250);
+    l_assert_name   varchar2(4000);
+    l_expectation   ut_expectation := a_expectation;
   begin
     ut_utils.debug_log('ut_assertion.to_(self in ut_assertion, a_expectation ut_expectation)');
 
-    l_assert_result := a_expectation.run_expectation( self.actual_data );
-    l_assert_name   := 'to '||a_expectation.name;
-    if a_expectation.expected is not null then
-      add_assert_result( l_assert_result, l_assert_name, a_expectation.expected.to_string(), a_expectation.expected.type);
+    l_assert_result := l_expectation.run_expectation( self.actual_data );
+    l_assert_name   := 'to '||l_expectation.name;
+    if l_expectation.expected is not null then
+      add_assert_result( l_assert_result, l_assert_name, l_expectation.additional_info, l_expectation.expected.to_string(), l_expectation.expected.type);
     else
-      add_assert_result( l_assert_result, l_assert_name );
+      add_assert_result( l_assert_result, l_assert_name, l_expectation.additional_info );
     end if;
   end;
 
diff --git a/source/assertions/ut_assertion.tps b/source/assertions/ut_assertion.tps
@@ -3,7 +3,7 @@ create or replace type ut_assertion as object
   actual_data         ut_data_value,
   message             varchar2(4000 char),
   final member procedure add_assert_result( self in ut_assertion, a_assert_result boolean, a_assert_name varchar2,
-    a_expected_value_string in varchar2 := null, a_expected_data_type varchar2 := null),
+    a_assert_info varchar2, a_expected_value_string in varchar2 := null, a_expected_data_type varchar2 := null),
   member procedure to_equal(self in ut_assertion, a_expected anydata, a_nulls_are_equal boolean := null),
   member procedure to_equal(self in ut_assertion, a_expected blob, a_nulls_are_equal boolean := null),
   member procedure to_equal(self in ut_assertion, a_expected boolean, a_nulls_are_equal boolean := null),
diff --git a/source/expectations/be_false.tpb b/source/expectations/be_false.tpb
@@ -6,7 +6,7 @@ create or replace type body be_false as
     return;
   end;
 
-  overriding member function run_expectation(a_actual ut_data_value) return boolean is
+  overriding member function run_expectation(self in out nocopy be_false, a_actual ut_data_value) return boolean is
   begin
     return
       case
diff --git a/source/expectations/be_false.tps b/source/expectations/be_false.tps
@@ -1,5 +1,5 @@
 create or replace type be_false under ut_expectation(
   constructor function be_false(self in out nocopy be_false) return self as result,
-  overriding member function run_expectation(a_actual ut_data_value) return boolean
+  overriding member function run_expectation(self in out nocopy be_false, a_actual ut_data_value) return boolean
 )
 /
diff --git a/source/expectations/be_not_null.tpb b/source/expectations/be_not_null.tpb
@@ -6,7 +6,7 @@ create or replace type body be_not_null as
     return;
   end;
 
-  overriding member function run_expectation(a_actual ut_data_value) return boolean is
+  overriding member function run_expectation(self in out nocopy be_not_null, a_actual ut_data_value) return boolean is
   begin
     return not a_actual.is_null;
   end;
diff --git a/source/expectations/be_not_null.tps b/source/expectations/be_not_null.tps
@@ -1,5 +1,5 @@
 create or replace type be_not_null under ut_expectation(
   constructor function be_not_null(self in out nocopy be_not_null) return self as result,
-  overriding member function run_expectation(a_actual ut_data_value) return boolean
+  overriding member function run_expectation(self in out nocopy be_not_null, a_actual ut_data_value) return boolean
 )
 /
diff --git a/source/expectations/be_null.tpb b/source/expectations/be_null.tpb
@@ -6,7 +6,7 @@ create or replace type body be_null as
     return;
   end;
 
-  overriding member function run_expectation(a_actual ut_data_value) return boolean is
+  overriding member function run_expectation(self in out nocopy be_null, a_actual ut_data_value) return boolean is
   begin
     return a_actual.is_null;
   end;
diff --git a/source/expectations/be_null.tps b/source/expectations/be_null.tps
@@ -1,5 +1,5 @@
 create or replace type be_null under ut_expectation(
   constructor function be_null(self in out nocopy be_null) return self as result,
-  overriding member function run_expectation(a_actual ut_data_value) return boolean
+  overriding member function run_expectation(self in out nocopy be_null, a_actual ut_data_value) return boolean
 )
 /
diff --git a/source/expectations/be_true.tpb b/source/expectations/be_true.tpb
@@ -6,7 +6,7 @@ create or replace type body be_true as
     return;
   end;
 
-  overriding member function run_expectation(a_actual ut_data_value) return boolean is
+  overriding member function run_expectation(self in out nocopy be_true, a_actual ut_data_value) return boolean is
   begin
     return
       case
diff --git a/source/expectations/be_true.tps b/source/expectations/be_true.tps
@@ -1,5 +1,5 @@
 create or replace type be_true under ut_expectation(
   constructor function be_true(self in out nocopy be_true) return self as result,
-  overriding member function run_expectation(a_actual ut_data_value) return boolean
+  overriding member function run_expectation(self in out nocopy be_true, a_actual ut_data_value) return boolean
 )
 /
diff --git a/source/expectations/equal.tpb b/source/expectations/equal.tpb
@@ -79,7 +79,7 @@ create or replace type body equal as
     return;
   end;
 
-  overriding member function run_expectation(a_actual ut_data_value) return boolean is
+  overriding member function run_expectation(self in out nocopy equal, a_actual ut_data_value) return boolean is
     l_result boolean;
   begin
     if self.expected is of (ut_data_value_anydata) and a_actual is of (ut_data_value_anydata) then
diff --git a/source/expectations/equal.tps b/source/expectations/equal.tps
@@ -13,6 +13,6 @@ create or replace type equal under ut_expectation(
   constructor function equal(self in out nocopy equal, a_expected timestamp_tz_unconstrained, a_nulls_are_equal boolean := null) return self as result,
   constructor function equal(self in out nocopy equal, a_expected timestamp_ltz_unconstrained, a_nulls_are_equal boolean := null) return self as result,
   constructor function equal(self in out nocopy equal, a_expected varchar2, a_nulls_are_equal boolean := null) return self as result,
-  overriding member function run_expectation(a_actual ut_data_value) return boolean
+  overriding member function run_expectation(self in out nocopy equal, a_actual ut_data_value) return boolean
 )
 /
diff --git a/source/expectations/match.tpb b/source/expectations/match.tpb
@@ -1,21 +1,20 @@
 create or replace type body match as
 
   constructor function match(self in out nocopy match, a_pattern in varchar2, a_modifiers in varchar2 default null) return self as result is
-    l_matcher_expression varchar2(4000);
   begin
     if a_pattern is not null then
-     l_matcher_expression := ' pattern '''||a_pattern||'''';
+     self.additional_info := 'pattern '''||a_pattern||'''';
      if a_modifiers is not null then
-       l_matcher_expression := l_matcher_expression ||', modifiers '''||a_modifiers||'''';
+       self.additional_info := self.additional_info ||', modifiers '''||a_modifiers||'''';
      end if;
     end if;
-    self.name      := lower($$plsql_unit) || l_matcher_expression;
+    self.name      := lower($$plsql_unit);
     self.pattern   := a_pattern;
     self.modifiers := a_modifiers;
     return;
   end;
 
-  overriding member function run_expectation(a_actual ut_data_value) return boolean is
+  overriding member function run_expectation(self in out nocopy match, a_actual ut_data_value) return boolean is
   begin
     return
       case
diff --git a/source/expectations/match.tps b/source/expectations/match.tps
@@ -2,6 +2,6 @@ create or replace type match under ut_expectation(
   pattern varchar2(4000),
   modifiers varchar2(4000),
   constructor function match(self in out nocopy match, a_pattern in varchar2, a_modifiers in varchar2 default null) return self as result,
-  overriding member function run_expectation(a_actual ut_data_value) return boolean
+  overriding member function run_expectation(self in out nocopy match, a_actual ut_data_value) return boolean
 )
 /
diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb
@@ -1,8 +1,9 @@
 create or replace type body ut_expectation as
 
-  member function run_expectation(a_actual ut_data_value) return boolean is
+  member function run_expectation(self in out nocopy ut_expectation, a_actual ut_data_value) return boolean is
   begin
     ut_utils.debug_log('Failure - ut_expectation.run_expectation'||'(a_actual '||a_actual.type||')');
+    self.additional_info := self.additional_info ||'. The matcher '''||self.name||''' cannot be used with data type ('||a_actual.type||')';
     return false;
   end;
 
diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps
@@ -1,6 +1,7 @@
 create or replace type ut_expectation as object(
-  name        varchar2(4000),
-  expected    ut_data_value,
-  member function run_expectation(a_actual ut_data_value) return boolean
+  name            varchar2(250),
+  additional_info varchar2(4000),
+  expected        ut_data_value,
+  member function run_expectation(self in out nocopy ut_expectation, a_actual ut_data_value) return boolean
 ) not final not instantiable
 /
diff --git a/source/types/ut_assert_result.tpb b/source/types/ut_assert_result.tpb
@@ -10,11 +10,12 @@ create or replace type body ut_assert_result is
     return;
   end ut_assert_result;
 
-  constructor function ut_assert_result(a_name varchar2, a_result integer, a_expected_type varchar2, a_actual_type varchar2,
+  constructor function ut_assert_result(a_name varchar2, a_additional_info varchar2, a_result integer, a_expected_type varchar2, a_actual_type varchar2,
     a_expected_value_string varchar2, a_actual_value_string varchar2, a_message varchar2 default null)
     return self as result is
   begin
     self.name                  := a_name;
+    self.additional_info       := a_additional_info;
     self.object_type           := 0;
     self.result                := a_result;
     self.message               := a_message;
diff --git a/source/types/ut_assert_result.tps b/source/types/ut_assert_result.tps
@@ -1,13 +1,14 @@
 create or replace type ut_assert_result force under ut_object
 (
-  message               varchar2(4000 char),
-  expected_type         varchar2(250 char),
-  actual_type           varchar2(250 char),
+  additional_info       varchar2(4000 char),
+  expected_type         varchar2(250  char),
+  actual_type           varchar2(250  char),
   expected_value_string varchar2(4000 char),
   actual_value_string   varchar2(4000 char),
+  message               varchar2(4000 char),
   constructor function ut_assert_result(a_result integer, a_message varchar2, a_name varchar2 default null)
     return self as result,
-  constructor function ut_assert_result(a_name varchar2, a_result integer, a_expected_type varchar2, a_actual_type varchar2,
+  constructor function ut_assert_result(a_name varchar2, a_additional_info varchar2, a_result integer, a_expected_type varchar2, a_actual_type varchar2,
     a_expected_value_string varchar2, a_actual_value_string varchar2, a_message varchar2 default null)
     return self as result
 )
diff --git a/source/types/ut_dbms_output_suite_reporter.tpb b/source/types/ut_dbms_output_suite_reporter.tpb
@@ -43,7 +43,7 @@ create or replace type body ut_dbms_output_suite_reporter is
       if l_assert.result != ut_utils.tr_success then
         print('expected: ' || l_assert.actual_value_string||'('||l_assert.actual_type||')');
         print(
-          l_assert.name
+          l_assert.name || ' ' ||l_assert.additional_info
           || case
                when l_assert.expected_value_string is not null or l_assert.expected_type is not null
                then ': '||l_assert.expected_value_string||'('||l_assert.expected_type||')'

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`create or replace type be_false under ut_expectation(`
`2`	`2`	`constructor function be_false(self in out nocopy be_false) return self as result,`
`3`		`- overriding member function run_expectation(a_actual ut_data_value) return boolean`
	`3`	`+ overriding member function run_expectation(self in out nocopy be_false, a_actual ut_data_value) return boolean`
`4`	`4`	`)`
`5`	`5`	`/`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`create or replace type be_not_null under ut_expectation(`
`2`	`2`	`constructor function be_not_null(self in out nocopy be_not_null) return self as result,`
`3`		`- overriding member function run_expectation(a_actual ut_data_value) return boolean`
	`3`	`+ overriding member function run_expectation(self in out nocopy be_not_null, a_actual ut_data_value) return boolean`
`4`	`4`	`)`
`5`	`5`	`/`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`create or replace type be_null under ut_expectation(`
`2`	`2`	`constructor function be_null(self in out nocopy be_null) return self as result,`
`3`		`- overriding member function run_expectation(a_actual ut_data_value) return boolean`
	`3`	`+ overriding member function run_expectation(self in out nocopy be_null, a_actual ut_data_value) return boolean`
`4`	`4`	`)`
`5`	`5`	`/`