Added equal expectation support for date and timestamp.

jgebal · jgebal · commit c991dd4230e5 · 2016-10-09T02:06:34.000+01:00
Cleanup of design leftovers for clob and blob.
Fixed blob to_string conversion.
diff --git a/examples/RunExpectations.sql b/examples/RunExpectations.sql
@@ -15,5 +15,5 @@ end;
 /
 
 drop type ut_custom_reporter;
---drop package demo_expectations;
+drop package demo_expectations;
 
diff --git a/examples/demo_expectations.pck b/examples/demo_expectations.pck
@@ -1,5 +1,3 @@
-drop package demo_expectations;
-
 create or replace package demo_expectations is
 
   -- %suite(Demoing asserts)
@@ -55,6 +53,19 @@ create or replace package demo_expectations is
 
   -- %test(expectation using ut.expect('value').to_(equal('value'));)
   procedure test17;
+
+  -- %test(expectation using ut.expect(1).to_(equal(2));)
+  procedure test18;
+
+  -- %test(expectation using ut.expect(sysdate).to_(equal(sysdate));)
+  procedure test19;
+
+  -- %test(expectation using ut.expect(to_clob('a') ).to_(equal(to_clob('b')));)
+  procedure test20;
+
+  -- %test(expectation using ut.expect(to_blob('ffaa') ).to_(equal(to_blob('FFAA')));)
+  procedure test21;
+
 end;
 /
 
@@ -184,5 +195,30 @@ create or replace package body demo_expectations is
     ut.expect('value').to_(equal('value'));
   end;
 
+
+  -- %test(expectation using ut.expect(1).to_(equal(2));)
+  procedure test18 is
+  begin
+    ut.expect(1).to_(equal(2));
+  end;
+
+  -- %test(expectation using ut.expect(sysdate).to_(equal(sysdate));)
+  procedure test19 is
+  begin
+    ut.expect(sysdate).to_(equal(sysdate-1));
+  end;
+
+  -- %test(expectation using ut.expect(to_clob('a') ).to_(equal(to_clob('a')));)
+  procedure test20 is
+  begin
+    ut.expect(to_clob('a') ).to_(equal(to_clob('b')));
+  end;
+
+  -- %test(expectation using ut.expect(to_blob('ffaa') ).to_(equal(to_blob('FFAA')));)
+  procedure test21 is
+  begin
+    ut.expect(to_blob('ffaa') ).to_(equal(to_blob('FFAABB')));
+  end;
+
 end;
 /
diff --git a/source/assertions/ut.pkb b/source/assertions/ut.pkb
@@ -25,17 +25,16 @@ create or replace package body ut is
     return ut_assertion_blob(a_actual);
   end;
 
+  function expect(a_actual in date, a_message varchar2 := null) return ut_assertion_date is
+  begin
+    return ut_assertion_date(a_actual);
+  end;
+
+  function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_assertion_timestamp is
+  begin
+    return ut_assertion_timestamp(a_actual);
+  end;
 
---  function expect(a_actual in date, a_message varchar2 := null) return ut_assertion_date is
---  begin
---    return ut_assertion_date(a_actual);
---  end;
---
---  function expect(a_actual in timestamp_tz_unconstrained, a_message varchar2 := null) return ut_assertion_timestamp is
---  begin
---    return ut_assertion_timestamp(a_actual);
---  end;
---
 --  function expect(a_actual in anydata, a_message varchar2 := null) return ut_assertion_anydata;
 --
 --  function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_assertion_cursor;
diff --git a/source/assertions/ut.pks b/source/assertions/ut.pks
@@ -12,11 +12,10 @@ create or replace package ut authid current_user as
   function expect(a_actual in blob, a_message varchar2 := null) return ut_assertion_blob;
 
 
---  function expect(a_message varchar2 := null, a_actual in date) return ut_assertion_date;
---
---  function expect(a_message varchar2 := null, a_actual in timestamp_tz_unconstrained) return ut_assertion_timestamp;
---
---
+  function expect(a_actual in date, a_message varchar2 := null) return ut_assertion_date;
+
+  function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_assertion_timestamp;
+
 --  function expect(a_message varchar2 := null, a_actual in anydata) return ut_assertion_anydata;
 --
 --  function expect(a_message varchar2 := null, a_actual in sys_refcursor) return ut_assertion_cursor;
diff --git a/source/assertions/ut_assertion.tpb b/source/assertions/ut_assertion.tpb
@@ -35,6 +35,18 @@ create or replace type body ut_assertion as
     self.build_assert_result( false, 'to equal', ut_utils.to_string(a_expected), 'blob');
   end;
 
+  member procedure to_equal(self in ut_assertion, a_expected date, a_nulls_are_equal boolean := null) is
+  begin
+    ut_utils.debug_log('ut_assertion.to_equal(self in ut_assertion, a_expected date, a_nulls_are_equal boolean := null)');
+    self.build_assert_result( false, 'to equal', ut_utils.to_string(a_expected), 'date');
+  end;
+
+  member procedure to_equal(self in ut_assertion, a_expected timestamp_unconstrained, a_nulls_are_equal boolean := null) is
+  begin
+    ut_utils.debug_log('ut_assertion.to_equal(self in ut_assertion, a_expected timestamp_tz_unconstrained, a_nulls_are_equal boolean := null)');
+    self.build_assert_result( false, 'to equal', ut_utils.to_string(a_expected), 'timestamp');
+  end;
+
   member procedure to_(self in ut_assertion, a_expectation ut_expectation) is
     l_assert_result ut_assert_result;
   begin
@@ -45,6 +57,7 @@ create or replace type body ut_assertion as
         when self.actual_data is of (ut_data_value_number) then a_expectation.run_expectation( treat(self.actual_data as ut_data_value_number) )
         when self.actual_data is of (ut_data_value_blob) then a_expectation.run_expectation( treat(self.actual_data as ut_data_value_blob) )
         when self.actual_data is of (ut_data_value_clob) then a_expectation.run_expectation( treat(self.actual_data as ut_data_value_clob) )
+        when self.actual_data is of (ut_data_value_date) then a_expectation.run_expectation( treat(self.actual_data as ut_data_value_date) )
       end;
     l_assert_result.message := self.message;
     l_assert_result.name    := 'to '||l_assert_result.name;
diff --git a/source/assertions/ut_assertion.tps b/source/assertions/ut_assertion.tps
@@ -8,6 +8,8 @@ create or replace type ut_assertion as object
   member procedure to_equal(self in ut_assertion, a_expected number, a_nulls_are_equal boolean := null),
   member procedure to_equal(self in ut_assertion, a_expected clob, 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 date, a_nulls_are_equal boolean := null),
+  member procedure to_equal(self in ut_assertion, a_expected timestamp_unconstrained, a_nulls_are_equal boolean := null),
   member procedure to_(self in ut_assertion, a_expectation ut_expectation),
   final member procedure to_be_null,
   final member procedure to_be_not_null
diff --git a/source/assertions/ut_assertion_blob.tps b/source/assertions/ut_assertion_blob.tps
@@ -1,6 +1,5 @@
 create or replace type ut_assertion_blob under ut_assertion
 (
-  actual blob,
   constructor function ut_assertion_blob(self in out nocopy ut_assertion_blob, a_actual blob, a_message varchar2 default null) return self as result,
   overriding member procedure to_equal(self in ut_assertion_blob, a_expected blob, a_nulls_are_equal boolean := null)
 )
diff --git a/source/assertions/ut_assertion_clob.tpb b/source/assertions/ut_assertion_clob.tpb
@@ -18,17 +18,17 @@ create or replace type body ut_assertion_clob as
     l_escape_msg varchar2(100) := case when a_escape_char is not null then ' using escape '''||a_escape_char||'''' end;
   begin
     if a_escape_char is not null then
-      l_condition := self.actual like a_mask escape a_escape_char;
+      l_condition := treat(self.actual_data as ut_data_value_clob).value like a_mask escape a_escape_char;
     else
-      l_condition := self.actual like a_mask;
+      l_condition := treat(self.actual_data as ut_data_value_clob).value like a_mask;
     end if;
     self.build_assert_result(l_condition, 'to be like', ut_utils.to_string(a_mask)||l_escape_msg);
   end;
 
   member procedure to_match(self in ut_assertion_clob, a_pattern in varchar2, a_modifier in varchar2 default null) is
     l_modifiers_msg varchar2(100) := case when a_modifier is not null then ' using modifiers '''||a_modifier||'''' end;
   begin
-    self.build_assert_result((regexp_like(self.actual, a_pattern, a_modifier)), 'to be matching', ut_utils.to_string(a_pattern)||l_modifiers_msg);
+    self.build_assert_result((regexp_like(treat(self.actual_data as ut_data_value_clob).value, a_pattern, a_modifier)), 'to be matching', ut_utils.to_string(a_pattern)||l_modifiers_msg);
   end;
 
 end;
diff --git a/source/assertions/ut_assertion_clob.tps b/source/assertions/ut_assertion_clob.tps
@@ -1,6 +1,5 @@
 create or replace type ut_assertion_clob under ut_assertion
 (
-  actual clob,
   constructor function ut_assertion_clob(self in out nocopy ut_assertion_clob, a_actual clob, a_message varchar2 default null) return self as result,
   overriding member procedure to_equal(self in ut_assertion_clob, a_expected clob, a_nulls_are_equal boolean := null),
   member procedure to_be_like(self in ut_assertion_clob, a_mask in varchar2, a_escape_char in varchar2 := null),
diff --git a/source/assertions/ut_assertion_date.tpb b/source/assertions/ut_assertion_date.tpb
@@ -0,0 +1,17 @@
+create or replace type body ut_assertion_date as
+
+  constructor function ut_assertion_date(self in out nocopy ut_assertion_date, a_actual date, a_message varchar2 default null) return self as result is
+  begin
+    self.message := a_message;
+    self.actual_data := ut_data_value_date('date', ut_utils.boolean_to_int( (a_actual is null) ), ut_utils.to_string(a_actual), a_actual);
+    return;
+  end;
+
+  overriding member procedure to_equal(self in ut_assertion_date, a_expected date, a_nulls_are_equal boolean := null) is
+  begin
+    ut_utils.debug_log('ut_assertion_date.to_equal(self in ut_assertion, a_expected date, a_nulls_are_equal boolean := null)');
+    self.to_( equal(a_expected, a_nulls_are_equal) );
+  end;
+
+end;
+/
diff --git a/source/assertions/ut_assertion_date.tps b/source/assertions/ut_assertion_date.tps
@@ -0,0 +1,6 @@
+create or replace type ut_assertion_date under ut_assertion
+(
+  constructor function ut_assertion_date(self in out nocopy ut_assertion_date, a_actual date, a_message varchar2 default null) return self as result,
+  overriding member procedure to_equal(self in ut_assertion_date, a_expected date, a_nulls_are_equal boolean := null)
+)
+/
diff --git a/source/assertions/ut_assertion_timestamp.tpb b/source/assertions/ut_assertion_timestamp.tpb
@@ -0,0 +1,17 @@
+create or replace type body ut_assertion_timestamp as
+
+  constructor function ut_assertion_timestamp(self in out nocopy ut_assertion_timestamp, a_actual timestamp_unconstrained, a_message varchar2 default null) return self as result is
+  begin
+    self.message := a_message;
+    self.actual_data := ut_data_value_timestamp('timestamp', ut_utils.boolean_to_int( (a_actual is null) ), ut_utils.to_string(a_actual), a_actual);
+    return;
+  end;
+
+  overriding member procedure to_equal(self in ut_assertion_timestamp, a_expected timestamp_unconstrained, a_nulls_are_equal boolean := null) is
+  begin
+    ut_utils.debug_log('ut_assertion_timestamp.to_equal(self in ut_assertion, a_expected timestamp_unconstrained, a_nulls_are_equal boolean := null)');
+    self.to_( equal(a_expected, a_nulls_are_equal) );
+  end;
+
+end;
+/
diff --git a/source/assertions/ut_assertion_timestamp.tps b/source/assertions/ut_assertion_timestamp.tps
@@ -0,0 +1,6 @@
+create or replace type ut_assertion_timestamp under ut_assertion
+(
+  constructor function ut_assertion_timestamp(self in out nocopy ut_assertion_timestamp, a_actual timestamp_unconstrained, a_message varchar2 default null) return self as result,
+  overriding member procedure to_equal(self in ut_assertion_timestamp, a_expected timestamp_unconstrained, a_nulls_are_equal boolean := null)
+)
+/
diff --git a/source/expectations/equal.tpb b/source/expectations/equal.tpb
@@ -31,6 +31,22 @@ create or replace type body equal as
     return;
   end;
 
+  constructor function equal(self in out nocopy equal, a_expected date, a_nulls_are_equal boolean := null) return self as result is
+  begin
+    self.nulls_are_equal := ut_utils.boolean_to_int( coalesce(a_nulls_are_equal, ut_assert_processor.nulls_are_equal()) );
+    self.assert_name := lower($$plsql_unit);
+    self.expected := ut_data_value_date('date', ut_utils.boolean_to_int(a_expected is null), ut_utils.to_string(a_expected), a_expected);
+    return;
+  end;
+
+  constructor function equal(self in out nocopy equal, a_expected timestamp_unconstrained, a_nulls_are_equal boolean := null) return self as result is
+  begin
+    self.nulls_are_equal := ut_utils.boolean_to_int( coalesce(a_nulls_are_equal, ut_assert_processor.nulls_are_equal()) );
+    self.assert_name := lower($$plsql_unit);
+    self.expected := ut_data_value_date('timestamp', ut_utils.boolean_to_int(a_expected is null), ut_utils.to_string(a_expected), a_expected);
+    return;
+  end;
+
   overriding member function run_expectation(self in equal, a_actual ut_data_value_varchar2) return ut_assert_result is
     l_expected varchar2(32767 char);
   begin
@@ -87,5 +103,33 @@ create or replace type body equal as
       );
   end;
 
+  overriding member function run_expectation(self in equal, a_actual ut_data_value_date) return ut_assert_result is
+    l_expected date;
+  begin
+    l_expected :=
+      case
+        when self.expected is of (ut_data_value_date) then treat(self.expected as ut_data_value_date).value
+      end;
+    return
+      self.build_assert_result(
+        ((l_expected = a_actual.value) or (a_actual.value is null and l_expected is null and ut_utils.int_to_boolean(self.nulls_are_equal)) )
+        , a_actual
+      );
+  end;
+
+  overriding member function run_expectation(self in equal, a_actual ut_data_value_timestamp) return ut_assert_result is
+    l_expected timestamp_tz_unconstrained;
+  begin
+    l_expected :=
+      case
+        when self.expected is of (ut_data_value_timestamp) then treat(self.expected as ut_data_value_timestamp).value
+      end;
+    return
+      self.build_assert_result(
+        ((l_expected = a_actual.value) or (a_actual.value is null and l_expected is null and ut_utils.int_to_boolean(self.nulls_are_equal)) )
+        , a_actual
+      );
+  end;
+
 end;
 /
diff --git a/source/expectations/equal.tps b/source/expectations/equal.tps
@@ -4,9 +4,13 @@ create or replace type equal under ut_expectation(
   constructor function equal(self in out nocopy equal, a_expected number, a_nulls_are_equal boolean := null) return self as result,
   constructor function equal(self in out nocopy equal, a_expected clob, a_nulls_are_equal boolean := null) return self as result,
   constructor function equal(self in out nocopy equal, a_expected blob, a_nulls_are_equal boolean := null) return self as result,
+  constructor function equal(self in out nocopy equal, a_expected date, a_nulls_are_equal boolean := null) return self as result,
+  constructor function equal(self in out nocopy equal, a_expected timestamp_unconstrained, a_nulls_are_equal boolean := null) return self as result,
   overriding member function run_expectation(self in equal, a_actual ut_data_value_varchar2) return ut_assert_result,
   overriding member function run_expectation(self in equal, a_actual ut_data_value_number) return ut_assert_result,
   overriding member function run_expectation(self in equal, a_actual ut_data_value_clob) return ut_assert_result,
-  overriding member function run_expectation(self in equal, a_actual ut_data_value_blob) return ut_assert_result
+  overriding member function run_expectation(self in equal, a_actual ut_data_value_blob) return ut_assert_result,
+  overriding member function run_expectation(self in equal, a_actual ut_data_value_date) return ut_assert_result,
+  overriding member function run_expectation(self in equal, a_actual ut_data_value_timestamp) return ut_assert_result
 )
 /
diff --git a/source/expectations/ut_data_value_date.tps b/source/expectations/ut_data_value_date.tps
@@ -0,0 +1,4 @@
+create or replace type ut_data_value_date under ut_data_value(
+  value date
+)
+/
diff --git a/source/expectations/ut_data_value_timestamp.tps b/source/expectations/ut_data_value_timestamp.tps
@@ -0,0 +1,4 @@
+create or replace type ut_data_value_timestamp under ut_data_value(
+  value timestamp(9)
+)
+/
diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps
@@ -5,6 +5,8 @@ create or replace type ut_expectation as object(
   not instantiable member function run_expectation(self in ut_expectation, a_actual ut_data_value_number) return ut_assert_result,
   not instantiable member function run_expectation(self in ut_expectation, a_actual ut_data_value_clob) return ut_assert_result,
   not instantiable member function run_expectation(self in ut_expectation, a_actual ut_data_value_blob) return ut_assert_result,
+  not instantiable member function run_expectation(self in ut_expectation, a_actual ut_data_value_date) return ut_assert_result,
+  not instantiable member function run_expectation(self in ut_expectation, a_actual ut_data_value_timestamp) return ut_assert_result,
   final member function build_assert_result(self in ut_expectation, a_assert_result boolean, a_actual ut_data_value) return ut_assert_result
 ) not final not instantiable
 /
diff --git a/source/install.sql b/source/install.sql
@@ -24,6 +24,8 @@ whenever oserror exit failure rollback
 @@expectations/ut_data_value_clob.tps
 @@expectations/ut_data_value_blob.tps
 @@expectations/ut_data_value_number.tps
+@@expectations/ut_data_value_date.tps
+@@expectations/ut_data_value_timestamp.tps
 @@expectations/ut_expectation.tps
 @@expectations/equal.tps
 @@assertions/ut_assert_processor.pks
@@ -32,6 +34,8 @@ whenever oserror exit failure rollback
 @@assertions/ut_assertion_varchar2.tps
 @@assertions/ut_assertion_clob.tps
 @@assertions/ut_assertion_blob.tps
+@@assertions/ut_assertion_date.tps
+@@assertions/ut_assertion_timestamp.tps
 @@assertions/ut.pks
 @@ut_assert.pks
 @@ut_annotations.pks
@@ -57,6 +61,8 @@ whenever oserror exit failure rollback
 @@assertions/ut_assertion_varchar2.tpb
 @@assertions/ut_assertion_clob.tpb
 @@assertions/ut_assertion_blob.tpb
+@@assertions/ut_assertion_date.tpb
+@@assertions/ut_assertion_timestamp.tpb
 @@assertions/ut.pkb
 @@ut_assert.pkb
 @@ut_annotations.pkb
diff --git a/source/uninstall.sql b/source/uninstall.sql
@@ -4,6 +4,10 @@ drop package ut_assert;
 
 drop package ut;
 
+drop type ut_assertion_timestamp;
+
+drop type ut_assertion_date;
+
 drop type ut_assertion_blob;
 
 drop type ut_assertion_clob;
@@ -28,6 +32,10 @@ drop type ut_data_value_clob;
 
 drop type ut_data_value_blob;
 
+drop type ut_data_value_date;
+
+drop type ut_data_value_timestamp;
+
 drop type ut_data_value;
 
 drop package ut_annotations;
diff --git a/source/ut_utils.pkb b/source/ut_utils.pkb
@@ -59,8 +59,8 @@ create or replace package body ut_utils is
   begin
     return
       case
-        when l_len <= gc_max_input_string_length then quote_string(utl_raw.cast_to_varchar2(a_value))
-        else quote_string(utl_raw.cast_to_varchar2(dbms_lob.substr(a_value, gc_overflow_substr_len))) || gc_more_data_string
+        when l_len <= gc_max_input_string_length then quote_string(rawtohex(a_value))
+        else to_string( rawtohex(dbms_lob.substr(a_value, gc_overflow_substr_len)) )
       end;
   end;
 
diff --git a/tests/ut_utils/ut_utils.to_string.Blob.sql b/tests/ut_utils/ut_utils.to_string.Blob.sql
@@ -4,7 +4,7 @@ PROMPT Returns a blob converted to varchar and eclosed in quotes
 declare
   l_text     varchar2(32767) := 'A test char';
   l_value    blob := utl_raw.cast_to_raw(l_text);
-  l_expected varchar2(32767) := ''''||l_text||'''';
+  l_expected varchar2(32767) := ''''||rawtohex(l_value)||'''';
   l_result   varchar2(32767);
   l_delimiter varchar2(1);
 begin
diff --git a/tests/ut_utils/ut_utils.to_string.veryBigBlob.sql b/tests/ut_utils/ut_utils.to_string.veryBigBlob.sql
@@ -36,7 +36,7 @@ begin
   if length(l_result) != ut_utils.gc_max_output_string_length then
     dbms_output.put_line('expected: length(l_result)='||ut_utils.gc_max_output_string_length||', got: '||length(l_result) );
   elsif l_result not like '%'||ut_utils.gc_more_data_string then
-    dbms_output.put_line('expected: l_result to match %'||ut_utils.gc_more_data_string||', got: '||substr(l_result,-10) );
+    dbms_output.put_line('expected: l_result to match %'''||ut_utils.gc_more_data_string||', got: '||substr(l_result,-10) );
   else
     :test_result := ut_utils.tr_success;
   end if;

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ end;`
`15`	`15`	`/`
`16`	`16`
`17`	`17`	`drop type ut_custom_reporter;`
`18`		`---drop package demo_expectations;`
	`18`	`+drop package demo_expectations;`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`create or replace type ut_assertion_blob under ut_assertion`
`2`	`2`	`(`
`3`		`- actual blob,`
`4`	`3`	`constructor function ut_assertion_blob(self in out nocopy ut_assertion_blob, a_actual blob, a_message varchar2 default null) return self as result,`
`5`	`4`	`overriding member procedure to_equal(self in ut_assertion_blob, a_expected blob, a_nulls_are_equal boolean := null)`
`6`	`5`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`create or replace type ut_assertion_clob under ut_assertion`
`2`	`2`	`(`
`3`		`- actual clob,`
`4`	`3`	`constructor function ut_assertion_clob(self in out nocopy ut_assertion_clob, a_actual clob, a_message varchar2 default null) return self as result,`
`5`	`4`	`overriding member procedure to_equal(self in ut_assertion_clob, a_expected clob, a_nulls_are_equal boolean := null),`
`6`	`5`	`member procedure to_be_like(self in ut_assertion_clob, a_mask in varchar2, a_escape_char in varchar2 := null),`