Making tests below 21 compilation conditional so it wont fail.

lwasylow · lwasylow · commit 9002fbce6826 · 2022-02-01T00:14:40.000Z
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
@@ -781,6 +781,17 @@ create or replace package body ut_compound_data_helper is
     return l_diffs;
   end;
   
+  function get_json_object(a_json_t json) return json_element_t is
+    l_json JSON;
+    l_obj json_element_t;
+  begin
+     $if dbms_db_version.version >= 21 $then
+       l_obj := case when a_json_t is null then cast (null as json_element_t ) else json_element_t.parse(json_query(a_value, '$' returning clob)) end;
+     $else
+       l_obj := null;
+     $end
+  end;
+  
 begin
   g_anytype_name_map(dbms_types.typecode_date)             := 'DATE';
   g_anytype_name_map(dbms_types.typecode_number)           := 'NUMBER';
diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks
@@ -134,5 +134,7 @@ create or replace package ut_compound_data_helper authid definer is
   
   function get_json_diffs_type(a_diff_id raw) return tt_json_diff_type_tab;
   
+  function get_json_object(a_json_t json) return json_element_t;
+  
 end;
 /
diff --git a/source/expectations/data_values/ut_data_value_json.tpb b/source/expectations/data_values/ut_data_value_json.tpb
@@ -33,7 +33,7 @@ create or replace type body ut_data_value_json as
   end;
 
   constructor function ut_data_value_json(self in out nocopy ut_data_value_json, a_value json) return self as result is
-    l_value json_element_t := case when a_value is null then cast (null as json_element_t ) else json_element_t.parse(json_query(a_value, '$' returning clob)) end;
+    l_value json_element_t := ut_compound_data_helper.get_json_object(a_value);
   begin 
     init(l_value);
     return;
diff --git a/test/ut3_user/expectations/test_expectations_json.pkb b/test/ut3_user/expectations/test_expectations_json.pkb
@@ -1607,7 +1607,8 @@ create or replace package body test_expectations_json is
     ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
   end;
 
- 
+  $if dbms_db_version.version >= 21 $then
+  
   procedure success_on_same_data_njson
   as
     l_actual   json;
@@ -1781,6 +1782,7 @@ create or replace package body test_expectations_json is
     --Assert
     ut.expect(l_actual_message).to_be_like(l_expected_message);
   end; 
- 
+  
+  $end
 end;
 /
diff --git a/test/ut3_user/expectations/test_expectations_json.pks b/test/ut3_user/expectations/test_expectations_json.pks
@@ -75,6 +75,8 @@ create or replace package test_expectations_json is
   --%test( Compare two json arrays )
   procedure check_json_arrays;
  
+  $if dbms_db_version.version >= 21 $then
+  
   --%test(Gives success for identical data using native json for 21c and above)
   procedure success_on_same_data_njson;
 
@@ -95,6 +97,7 @@ create or replace package test_expectations_json is
   
   --%test( Fail Json object not to have count using native json for 21c and above)
   procedure fail_not_to_have_count_njson;
-
+  
+  $end
 end;
 /

Original file line number	Diff line number	Diff line change
`@@ -134,5 +134,7 @@ create or replace package ut_compound_data_helper authid definer is`
`134`	`134`
`135`	`135`	`function get_json_diffs_type(a_diff_id raw) return tt_json_diff_type_tab;`
`136`	`136`
	`137`	`+ function get_json_object(a_json_t json) return json_element_t;`
	`138`	`+`
`137`	`139`	`end;`
`138`	`140`	`/`