Fixed failing test.

jgebal · jgebal · commit f3ae164683ed · 2017-07-15T02:38:21.000+01:00
Refactored ut_data_value_anydata to be not instantiable.
diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb
@@ -16,13 +16,6 @@ create or replace type body ut_data_value_anydata as
   limitations under the License.
   */
 
-  constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata) return self as result is
-  begin
-    self.self_type  := $$plsql_unit;
-    self.data_type  := 'undefined';
-    return;
-  end;
-
   overriding member function is_null return boolean is
   begin
     return true;
@@ -81,7 +74,7 @@ create or replace type body ut_data_value_anydata as
   end;
 
   static function get_instance(a_data_value anydata) return ut_data_value_anydata is
-    l_result    ut_data_value_anydata := ut_data_value_anydata();
+    l_result    ut_data_value_anydata := ut_data_value_object(null);
     l_type      anytype;
     l_type_code integer;
   begin
@@ -99,15 +92,15 @@ create or replace type body ut_data_value_anydata as
   end;
 
   static function get_instance(a_data_value anydata, a_exclude varchar2) return ut_data_value_anydata is
-    l_result    ut_data_value_anydata := ut_data_value_anydata();
+    l_result    ut_data_value_anydata;
   begin
     l_result := ut_data_value_anydata.get_instance(a_data_value);
     l_result.exclude_xpath := ut_utils.to_xpath(a_exclude);
     return l_result;
   end;
 
   static function get_instance(a_data_value anydata, a_exclude ut_varchar2_list) return ut_data_value_anydata is
-    l_result    ut_data_value_anydata := ut_data_value_anydata();
+    l_result    ut_data_value_anydata;
   begin
     l_result := ut_data_value_anydata.get_instance(a_data_value);
     l_result.exclude_xpath := ut_utils.to_xpath(a_exclude);
diff --git a/source/expectations/data_values/ut_data_value_anydata.tps b/source/expectations/data_values/ut_data_value_anydata.tps
@@ -21,13 +21,12 @@ create or replace type ut_data_value_anydata under ut_data_value(
     Holds xpath (list of columns) to exclude when comparing cursor
   */
   exclude_xpath   varchar2(32767),
-  constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata) return self as result,
   overriding member function is_null return boolean,
   overriding member function to_string return varchar2,
   overriding member function compare_implementation( a_other ut_data_value ) return integer,
   final member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata, a_self_type varchar2),
   static function get_instance(a_data_value anydata) return ut_data_value_anydata,
   static function get_instance(a_data_value anydata, a_exclude varchar2) return ut_data_value_anydata,
   static function get_instance(a_data_value anydata, a_exclude ut_varchar2_list) return ut_data_value_anydata
-) not final
+) not final not instantiable
 /
diff --git a/tests/ut_expectations/ut.expect.to_equal.anydata.GivesSuccessWithExcludedCollectionAttributes.sql b/tests/ut_expectations/ut.expect.to_equal.anydata.GivesSuccessWithExcludedCollectionAttributes.sql
@@ -9,7 +9,7 @@ begin
   l_actual   := ut_key_value_pairs(ut_key_value_pair(key=>'A',value=>'1'), ut_key_value_pair(key=>'B',value=>'2'));
   l_expected := ut_key_value_pairs(ut_key_value_pair(key=>'A',value=>'0'), ut_key_value_pair(key=>'B',value=>'1'));
 
-  ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected), a_exclude=>'VALUE');
+  ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected), a_exclude=>ut_varchar2_list('VALUE'));
   l_result :=  ut_expectation_processor.get_status();
   l_results_details := ut_expectation_processor.get_expectations_results();
 --Assert
