Fixed return code of data-comparison.

jgebal · jgebal · commit 72261e130551 · 2018-01-02T18:12:14.000Z
Fixed failing tests fro 11g (record types in SQL) as well as old_test.
Refactored the comparison a little bit.
diff --git a/old_tests/lib/RunTest.sql b/old_tests/lib/RunTest.sql
@@ -21,8 +21,10 @@ begin
 end;
 /
 
+rollback;
 begin
   ut_expectation_processor.clear_expectations;
+  ut_utils.cleanup_temp_tables;                                            
 end;
 /
 
diff --git a/old_tests/ut_expectations/ut.expect.to_equal.cursor.ReturnsCursorDataForFailure.sql b/old_tests/ut_expectations/ut.expect.to_equal.cursor.ReturnsCursorDataForFailure.sql
@@ -1,4 +1,4 @@
-PROMPT Gives a success when comparing values of different cursors
+PROMPT Returns differing rows when compared cursor data is different
 --Arrange
 declare
   l_actual   sys_refcursor;
@@ -14,13 +14,11 @@ begin
 --Assert
   if nvl(:test_result, ut_utils.tr_success) = ut_utils.tr_success
      and l_result.message like q'[Actual:%
-    <ROW>%</ROW>
-    <ROW>%</ROW>
+    (rows: 2, mismatched: 1)
  (refcursor)%
 was expected to equal:%
-    <ROW>%</ROW>
-    <ROW>%</ROW>
-    <ROW>%</ROW>
+    (rows: 3, mismatched: 1)
+    row_no: 3     <ROW>%</ROW>
  (refcursor)%]' then
     :test_result := ut_utils.tr_success;
   else
diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb
@@ -103,6 +103,7 @@ create or replace type body ut_data_value_refcursor as
     type t_clob_tab is table of clob;
     l_results       t_clob_tab;
     c_max_rows      constant integer := 50;
+    c_pad_depth     constant integer := 5;
     l_result        clob;
     l_result_xml    xmltype;
     l_result_string varchar2(32767);
@@ -113,16 +114,15 @@ create or replace type body ut_data_value_refcursor as
     -- First tell how many rows are different
     execute immediate 'select count(*) from ' || l_ut_owner || '.ut_cursor_data_diff' into l_diff_row_count;
 
-    ut_utils.append_to_clob(l_result,'Rows: ' || to_char(self.ROW_COUNT) 
-      || ', different: ' || to_char(l_diff_row_count) || chr(10));
+    ut_utils.append_to_clob(l_result,'(rows: ' || to_char(self.row_count)|| ', mismatched: ' || to_char(l_diff_row_count) ||')'|| chr(10));
 
     --return rows which were previously marked as different
-    execute immediate 'select xmlserialize( content ucd.row_data no indent)
-                        from ' || l_ut_owner || '.ut_cursor_data ucd
+    execute immediate q'[select 'row_no: '||rpad( ucd.row_no, :c_pad_depth )||' '||xmlserialize( content ucd.row_data no indent)
+                        from ]' || l_ut_owner || '.ut_cursor_data ucd
                        where ucd.cursor_data_guid = :self_guid
                           and ucd.row_no in (select row_no from ' || l_ut_owner || '.ut_cursor_data_diff ucdc)
                           and rownum <= :max_rows'
-      bulk collect into l_results using in self.data_value, c_max_rows;
+      bulk collect into l_results using c_pad_depth, self.data_value, c_max_rows;
 
     for i in 1 .. l_results.count loop
       dbms_lob.append(l_result,l_results(i));
@@ -167,7 +167,7 @@ create or replace type body ut_data_value_refcursor as
       if ( sql%rowcount > 0 ) then
         l_result := 1;
       else
-        l_result := 1;
+        l_result := 0;
       end if;
     else
       raise value_error;
diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb
@@ -17,21 +17,6 @@ create or replace package body test_expectations_cursor is
     execute immediate 'drop table gtt_test_table';
   end;
 
-  /** Just returns a pre-made expected object
-  */
-  function get_expected_obj return t_test_table
-  as
-    l_expected_obj t_test_table;
-  begin
-    
-    l_expected_obj(1).my_num := 1;
-    l_expected_obj(1).my_string := 'This is my test string';
-    l_expected_obj(1).my_clob := 'This is an even longer test clob';
-    l_expected_obj(1).my_date := to_date('1984-09-05', 'YYYY-MM-DD');
-
-    return l_expected_obj;
-  end;
-
   procedure test_cursor_w_temp_table
   as
     pragma autonomous_transaction;
@@ -60,18 +45,24 @@ create or replace package body test_expectations_cursor is
 
   procedure test_cursor_success
   as
-    l_expected_obj t_test_table;
-    l_actual_obj t_test_table;
     l_expected sys_refcursor;
     l_actual sys_refcursor;
   begin
     
     -- Arrange
-    l_expected_obj := get_expected_obj();
-    l_actual_obj := get_expected_obj();
-
-    open l_expected for select * from table(l_expected_obj);
-    open l_actual for select * from table(l_actual_obj);
+    open l_expected for
+    select 1 as my_num,
+           'This is my test string' as my_string,
+           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;
+
+    open l_actual for
+    select 1 as my_num,
+           'This is my test string' as my_string,
+           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;
 
     --Act - execute the expectation on cursor opened on GTT
     ut3.ut.expect( l_actual ).to_equal( l_expected );
@@ -84,18 +75,15 @@ create or replace package body test_expectations_cursor is
 
   end;
 
-  --%test(Test cursor comparison success when both empty)
   procedure test_cursor_success_on_empty
   as
-    l_expected_obj t_test_table;
-    l_actual_obj t_test_table;
     l_expected sys_refcursor;
     l_actual sys_refcursor;
   begin
     
     -- Arrange
-    open l_expected for select * from table(l_expected_obj);
-    open l_actual for select * from table(l_actual_obj);
+    open l_expected for select * from dual where 1=0;
+    open l_actual for select * from dual where 1=0;
 
     --Act - execute the expectation on cursor opened on GTT
     ut3.ut.expect( l_actual ).to_equal( l_expected );
@@ -111,20 +99,14 @@ create or replace package body test_expectations_cursor is
   --%test(Test cursor comparison fails on different content)
   procedure test_cursor_fail_on_difference
   as
-    l_expected_obj t_test_table;
-    l_actual_obj t_test_table;
     l_expected sys_refcursor;
     l_actual sys_refcursor;
   begin
     
     -- Arrange
-    l_expected_obj := get_expected_obj();
-    l_actual_obj := get_expected_obj();
-    l_actual_obj(1).my_clob := 'Another totally different story';
+    open l_expected for select to_clob('This is an even longer test clob') as my_clob from dual;
+    open l_actual for select to_clob('Another totally different story') as my_clob from dual;
 
-    open l_expected for select * from table(l_expected_obj);
-    open l_actual for select * from table(l_actual_obj);
-      
     --Act - execute the expectation on cursor opened on GTT
     ut3.ut.expect( l_actual ).to_equal( l_expected );
 
@@ -136,22 +118,16 @@ create or replace package body test_expectations_cursor is
 
   end;
 
-  procedure test_cursor_fail_on_expected_missing
+  procedure fail_on_expected_missing
   as
-    l_expected_obj t_test_table;
-    l_actual_obj t_test_table;
     l_expected sys_refcursor;
     l_actual sys_refcursor;
   begin
     
     -- Arrange
-    l_expected_obj := get_expected_obj();
-    l_actual_obj := get_expected_obj();
-    l_actual_obj(2).my_num := 2;
+    open l_expected for select 1 as my_num from dual;
+    open l_actual   for select 1 as my_num from dual union all select 1 as my_num from dual;
 
-    open l_expected for select * from table(l_expected_obj);
-    open l_actual for select * from table(l_actual_obj);
-      
     --Act - execute the expectation on cursor opened on GTT
     ut3.ut.expect( l_actual ).to_equal( l_expected );
 
@@ -163,22 +139,16 @@ create or replace package body test_expectations_cursor is
 
   end;
 
-  procedure test_cursor_fail_on_actual_missing
+  procedure fail_on_actual_missing
   as
-    l_expected_obj t_test_table;
-    l_actual_obj t_test_table;
     l_expected sys_refcursor;
     l_actual sys_refcursor;
   begin
     
     -- Arrange
-    l_expected_obj := get_expected_obj();
-    l_expected_obj(2).my_num := 2;
-    l_actual_obj := get_expected_obj();
+    open l_expected for select 1 as my_num from dual union all select 1 as my_num from dual;
+    open l_actual   for select 1 as my_num from dual;
 
-    open l_expected for select * from table(l_expected_obj);
-    open l_actual for select * from table(l_actual_obj);
-      
     --Act - execute the expectation on cursor opened on GTT
     ut3.ut.expect( l_actual ).to_equal( l_expected );
 
diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks
@@ -3,36 +3,27 @@ create or replace package test_expectations_cursor is
   --%suite(expectations - cursor)
   --%suitepath(utplsql.core.expectations.cursor)
 
-  type t_test_record is record ( 
-     my_num number(9,0),
-     my_string varchar2(4000),
-     my_clob clob,
-     my_date date);
-
-  type t_test_table is table of t_test_record index by binary_integer;
-
-
   procedure setup_temp_table_test;
   procedure cleanup_temp_table_test;
-  
-  --%test(Test cursor on temporary table)
+
+  --%test(Compares data from cursor on temporary table)
   --%beforetest(setup_temp_table_test)
   --%aftertest(cleanup_temp_table_test)
   procedure test_cursor_w_temp_table;
 
-  --%test(Test cursor comparison success)
+  --%test(Returns success for identical data)
   procedure test_cursor_success;
 
-  --%test(Test cursor comparison success when both empty)
+  --%test(Returns success when both cursors are empty)
   procedure test_cursor_success_on_empty;
 
-  --%test(Test cursor comparison fails on different content)
+  --%test(Returns failure when different data present in one of rows)
   procedure test_cursor_fail_on_difference;
 
-  --%test(Test cursor comparison fails on missing row in expected cursor)
-  procedure test_cursor_fail_on_expected_missing;
+  --%test(Returns failure when more rows exist in actual)
+  procedure fail_on_expected_missing;
 
-  --%test(Test cursor comparison fails on missing row in actual cursor)
-  procedure test_cursor_fail_on_actual_missing;
+  --%test(Returns failure when more rows exist in expected)
+  procedure fail_on_actual_missing;
 end;
 /

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,10 @@ begin`
`21`	`21`	`end;`
`22`	`22`	`/`
`23`	`23`
	`24`	`+rollback;`
`24`	`25`	`begin`
`25`	`26`	`ut_expectation_processor.clear_expectations;`
	`27`	`+ ut_utils.cleanup_temp_tables;`
`26`	`28`	`end;`
`27`	`29`	`/`
`28`	`30`