Fixed support for different DATE NLS settings.

jgebal · jgebal · commit 898bec2bdc57 · 2019-03-15T01:33:44.000Z
diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md
@@ -1004,7 +1004,7 @@ Due to the way Oracle handles DATE data type when converting from cursor data to
 The NLS_DATE_FORMAT setting from the moment the cursor was opened determines the formatting of dates used for cursor data comparison.
 By default, Oracle NLS_DATE_FORMAT is timeless, so data of DATE datatype, will be compared ignoring the time component.
 
-You should use procedures `ut.set_nls`, `ut.reset_nls` around cursors that you want to compare in your tests.
+You should surround cursors and expectations with procedures `ut.set_nls`, `ut.reset_nls`.
 This way, the DATE data in cursors will be properly formatted for comparison using date-time format.
 
 The example below makes use of `ut.set_nls`, `ut.reset_nls`, so that the date in `l_expected` and `l_actual` is compared using date-time formatting.  
@@ -1048,9 +1048,9 @@ create or replace package body test_get_events is
     open l_expected_bad_date for select gc_description as description, gc_event_date + gc_second as event_date from dual;
     --Act
     l_actual := get_events();
-    ut.reset_nls(); -- Change the NLS settings after cursors were opened
     --Assert
     ut.expect( l_actual ).not_to_equal( l_expected_bad_date );
+    ut.reset_nls(); -- Change the NLS settings after cursors were opened
   end;
 
   procedure bad_test is
diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb
@@ -96,7 +96,8 @@ create or replace package body ut_expectation_processor as
       bulk collect into l_session_params
      from nls_session_parameters nsp
     where parameter
-       in ( 'NLS_DATE_FORMAT', 'NLS_TIMESTAMP_FORMAT', 'NLS_TIMESTAMP_TZ_FORMAT');
+       in ( 'NLS_DATE_FORMAT', 'NLS_TIMESTAMP_FORMAT', 'NLS_TIMESTAMP_TZ_FORMAT')
+    order by 1;
 
     return l_session_params;
   end;
@@ -113,7 +114,6 @@ create or replace package body ut_expectation_processor as
       when insuf_privs then NULL;
     end;
 
-    execute immediate 'alter session set nls_date_format = '''||ut_utils.gc_date_format||'''';
     execute immediate 'alter session set nls_timestamp_format = '''||ut_utils.gc_timestamp_format||'''';
     execute immediate 'alter session set nls_timestamp_tz_format = '''||ut_utils.gc_timestamp_tz_format||'''';
   end;
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
@@ -207,7 +207,7 @@ create or replace package body ut_compound_data_helper is
     if a_data_info.is_sql_diffable = 0 then 
       l_col_syntax :=  l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ;
     elsif a_data_info.is_sql_diffable = 1  and a_data_info.column_type = 'DATE' then
-      l_col_syntax :=  'to_date('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_date_format||''') as '|| a_data_info.transformed_name;
+      l_col_syntax :=  'to_date('||l_alias||a_data_info.transformed_name||') as '|| a_data_info.transformed_name;
     elsif  a_data_info.is_sql_diffable = 1  and a_data_info.column_type in ('TIMESTAMP') then
       l_col_syntax :=  'to_timestamp('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_format||''') as '|| a_data_info.transformed_name;
     elsif a_data_info.is_sql_diffable = 1  and a_data_info.column_type in ('TIMESTAMP WITH TIME ZONE') then
diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb
@@ -305,18 +305,12 @@ create or replace type body ut_data_value_refcursor as
     begin
       l_diff_id       := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id);
       
-      --Set NLS settings to handle extract of date from xml
-      ut_expectation_processor.set_xml_nls_params();
-      
       begin
         open l_cursor for a_diff_cursor_text using a_self.data_id, a_other.data_id;
         --fetch and save rows for display of diff
         fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows;
       
-        --Reset parameters back
-        ut_expectation_processor.reset_nls_params();
       exception when others then
-        ut_expectation_processor.reset_nls_params();
         if l_cursor%isopen then
           close l_cursor;
         end if;
diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb
@@ -62,7 +62,7 @@ create or replace package body test_expectations_cursor is
     l_actual   sys_refcursor;
   begin
     -- Arrange
-    ut.set_nls;
+    ut3.ut.set_nls;
     open l_expected for
       select 1 as my_num,
              'This is my test string' as my_string,
@@ -75,11 +75,11 @@ create or replace package body test_expectations_cursor is
              to_clob('This is an even longer test clob') as my_clob,
              to_date('1984-09-05', 'YYYY-MM-DD') as my_date
       from dual;
-    ut.reset_nls;
     --Act
     ut3.ut.expect( l_actual ).to_equal( l_expected );
     --Assert
     ut.expect(expectations.failed_expectations_data()).to_be_empty();
+    ut3.ut.reset_nls;
   end;
 
   procedure success_on_empty
@@ -404,11 +404,11 @@ create or replace package body test_expectations_cursor is
     ut3.ut.set_nls;
     open l_actual for select l_date as some_date from dual;
     open l_expected for select l_date-l_second some_date from dual;
-    ut3.ut.reset_nls;
     --Act
     ut3.ut.expect( l_actual ).to_equal( l_expected );
     --Assert
     ut.expect(expectations.failed_expectations_data()).not_to_be_empty();
+    ut3.ut.reset_nls;
   end;
 
   procedure uses_default_nls_for_date
