Fixed error with NULL objects passed to ANYDATA for comparison.

jgebal · jgebal · commit 3677fb1e110a · 2017-01-08T02:18:18.000Z
diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb
@@ -3,7 +3,7 @@ create or replace type body ut_data_value_anydata as
   constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result is
   begin
     self.datavalue := a_value;
-    self.datatype := 'anydata';
+    self.datatype  := a_value.gettypename;
     return;
   end;
 
@@ -15,9 +15,9 @@ create or replace type body ut_data_value_anydata as
   begin
     if self.datavalue is null then
       l_is_null := true;
-    elsif self.datavalue.gettypename like '%.%' then
-    --XMLTYPE doesn't like the null beeing passed to ANYDATA so we need to check if anydata holds null Object/collection
     --check if typename is a schema based object
+    elsif self.datavalue.gettypename like '%.%' then
+      --XMLTYPE doesn't like the null beeing passed to ANYDATA so we need to check if anydata holds null Object/collection
       l_anydata_accessor :=
         case when self.datavalue.gettype(l_type) = dbms_types.typecode_object then 'getObject' else 'getCollection' end;
       execute immediate '
@@ -37,12 +37,14 @@ create or replace type body ut_data_value_anydata as
 
   overriding member function to_string return varchar2 is
     l_result varchar2(32767);
+    l_clob   clob;
   begin
     if self.is_null() then
       l_result := ut_utils.to_string( to_char(null) );
     else
       ut_assert_processor.set_xml_nls_params();
-      l_result := ut_utils.to_string( xmltype(self.datavalue).getclobval() );
+      select xmlserialize(content xmltype(self.datavalue) indent) into l_clob from dual;
+      l_result := ut_utils.to_string( l_clob );
       ut_assert_processor.reset_nls_params();
     end if;
     return l_result;
diff --git a/source/expectations/matchers/equal.tpb b/source/expectations/matchers/equal.tpb
@@ -78,19 +78,19 @@ create or replace type body equal as
     init(ut_data_value_varchar2(a_expected), a_nulls_are_equal);
     return;
   end;
-  
+
   constructor function equal(self in out nocopy equal, a_expected yminterval_unconstrained, a_nulls_are_equal boolean := null) return self as result is
   begin
     init(ut_data_value_yminterval(a_expected), a_nulls_are_equal);
-    return;  
+    return;
   end;
-  
+
   constructor function equal(self in out nocopy equal, a_expected dsinterval_unconstrained, a_nulls_are_equal boolean := null) return self as result is
   begin
     init(ut_data_value_dsinterval(a_expected), a_nulls_are_equal);
-    return;  
+    return;
   end;
-  
+
   overriding member function run_matcher(self in out nocopy equal, a_actual ut_data_value) return boolean is
     l_result boolean;
   begin
@@ -100,7 +100,15 @@ create or replace type body equal as
         l_actual   ut_data_value_anydata := treat(a_actual as ut_data_value_anydata);
       begin
         ut_assert_processor.set_xml_nls_params();
-        l_result := equal_with_nulls((xmltype(l_expected.datavalue).getclobval() = xmltype(l_actual.datavalue).getclobval()), a_actual);
+        --XMLTYPE doesn't like the null being passed from anydata or object types, so we need to check if anydata holds null Object/collection
+        --This is why equal_with_nulls cannot be used here
+        if ut_utils.int_to_boolean( nulls_are_equal_flag ) and self.expected.is_null() and a_actual.is_null() then
+            l_result := true;
+        elsif self.expected.is_null() or a_actual.is_null() then
+          l_result := false;
+        else
+          l_result := xmltype(l_expected.datavalue).getclobval() = xmltype(l_actual.datavalue).getclobval();
+        end if;
         ut_assert_processor.reset_nls_params();
       end;
     elsif self.expected is of (ut_data_value_blob) and a_actual is of (ut_data_value_blob) then
