Added support code nulls_are_equal.

jgebal · jgebal · commit e6572dab36a5 · 2016-10-06T01:52:47.000+01:00
Added tests for some asserts.
Added usage of 'nulls_are_equal' functionality
diff --git a/source/assertions/ut_assert_processor.pkb b/source/assertions/ut_assert_processor.pkb
@@ -2,6 +2,18 @@ create or replace package body ut_assert_processor as
 
   g_asserts_called ut_assert_list := ut_assert_list();
 
+  g_nulls_are_equal boolean_not_null := true;
+
+  function nulls_are_equal return boolean is
+  begin
+    return g_nulls_are_equal;
+  end;
+
+  procedure nulls_are_equal(a_setting boolean_not_null) is
+  begin
+    g_nulls_are_equal := a_setting;
+  end;
+
   function get_aggregate_asserts_result return integer is
     l_result integer := ut_utils.tr_success;
   begin
diff --git a/source/assertions/ut_assert_processor.pks b/source/assertions/ut_assert_processor.pks
@@ -1,5 +1,11 @@
 create or replace package ut_assert_processor authid current_user as
 
+  subtype boolean_not_null is boolean not null;
+
+  function nulls_are_equal return boolean;
+
+  procedure nulls_are_equal(a_setting boolean_not_null);
+
   function get_aggregate_asserts_result return integer;
 
   procedure clear_asserts;
diff --git a/source/assertions/ut_assertion_varchar.tpb b/source/assertions/ut_assertion_varchar.tpb
@@ -13,7 +13,10 @@ create or replace type body ut_assertion_varchar as
   overriding member procedure to_be_equal(self in ut_assertion_varchar, a_expected varchar2) is
   begin
     ut_utils.debug_log('ut_assertion_varchar.to_be_equal(self in ut_assertion, a_expected varchar2)');
-    self.build_assert_result( (a_expected = self.actual), 'to be equal', ut_utils.to_string(a_expected));
+    self.build_assert_result(
+      ((a_expected is null and self.actual is null and ut_assert_processor.nulls_are_equal()) or (a_expected = self.actual))
+      , 'to be equal', ut_utils.to_string(a_expected)
+    );
   end;
 
   member procedure to_be_like(self in ut_assertion_varchar, a_mask in varchar2, a_escape_char in varchar2 := null) is
diff --git a/tests/asssertions/common/ut.expect.to_be_equal.scalar.common.sql b/tests/asssertions/common/ut.expect.to_be_equal.scalar.common.sql
@@ -0,0 +1,17 @@
+--Arrange
+declare
+  l_actual   &&1 := &&2;
+  l_expected &&1 := &&3;
+  l_result   integer;
+begin
+--Act
+  ut.expect(l_actual).to_be_equal(l_expected);
+  l_result :=  ut_assert_processor.get_aggregate_asserts_result();
+--Assert
+  if l_result = &&4 then
+    :test_result := ut_utils.tr_success;
+  else
+    dbms_output.put_line('expected: '''||&&4||''', got: '''||l_result||'''' );
+  end if;
+end;
+/
diff --git a/tests/asssertions/common/ut.expect.to_be_equal.scalar.with_message.common.sql b/tests/asssertions/common/ut.expect.to_be_equal.scalar.with_message.common.sql
@@ -0,0 +1,18 @@
+--Arrange
+declare
+  l_expected     &&1 := &&2;
+  l_actual       &&1 := &&3;
+  l_results      ut_objects_list;
+  l_test_message varchar2(30) := 'A test message';
+begin
+--Act
+  ut.expect(l_actual, l_test_message).to_be_equal(l_expected);
+  l_results :=  ut_assert_processor.get_asserts_results();
+--Assert
+  if treat(l_results(1) as ut_assert_result).message like ''||l_test_message||'' then
+    :test_result := ut_utils.tr_success;
+  else
+    dbms_output.put_line('expected: '''||treat(l_results(1) as ut_assert_result).message||''' to match ''%'||l_test_message||'%''' );
+  end if;
+end;
+/
diff --git a/tests/asssertions/ut.expect.to_be_equal.varchar.GivesFailureForDifferentValues.sql b/tests/asssertions/ut.expect.to_be_equal.varchar.GivesFailureForDifferentValues.sql
@@ -0,0 +1,3 @@
+PROMPT Gives a failure when comparing different varchar2 values
+
+@@asssertions/common/ut.expect.to_be_equal.scalar.common.sql 'varchar2(4000)' '''Abc''' '''abc''' 'ut_utils.tr_failure'
diff --git a/tests/asssertions/ut.expect.to_be_equal.varchar.GivesFailureWhenActualIsNull.sql b/tests/asssertions/ut.expect.to_be_equal.varchar.GivesFailureWhenActualIsNull.sql
@@ -0,0 +1,3 @@
+PROMPT Gives failure when actual is null
+
+@@asssertions/common/ut.expect.to_be_equal.scalar.common.sql 'varchar2(4000)' 'NULL' '''abc''' 'ut_utils.tr_failure'
diff --git a/tests/asssertions/ut.expect.to_be_equal.varchar.GivesFailureWhenExpectedIsNull.sql b/tests/asssertions/ut.expect.to_be_equal.varchar.GivesFailureWhenExpectedIsNull.sql
@@ -0,0 +1,3 @@
+PROMPT Gives failure when expected is null
+
+@@asssertions/common/ut.expect.to_be_equal.scalar.common.sql 'varchar2(4000)' '''abc''' 'NULL' 'ut_utils.tr_failure'
diff --git a/tests/asssertions/ut.expect.to_be_equal.varchar.GivesSuccessForEqualValues.sql b/tests/asssertions/ut.expect.to_be_equal.varchar.GivesSuccessForEqualValues.sql
@@ -0,0 +1,3 @@
+PROMPT Gives a success when comparing equal varchar2 values
+
+@@asssertions/common/ut.expect.to_be_equal.scalar.common.sql 'varchar2(4000)' '''Abc''' '''Abc''' 'ut_utils.tr_success'
diff --git a/tests/asssertions/ut.expect.to_be_equal.varchar.GivesSuccessWhenBothValuesAreNull.sql b/tests/asssertions/ut.expect.to_be_equal.varchar.GivesSuccessWhenBothValuesAreNull.sql
@@ -0,0 +1,3 @@
+PROMPT Gives a success when both varchar2 values are null
+
+@@asssertions/common/ut.expect.to_be_equal.scalar.common.sql 'varchar2(4000)' 'NULL' 'NULL' 'ut_utils.tr_success'
diff --git a/tests/asssertions/ut.expect.to_be_equal.varchar.PutsNullIntoStringValueWhenActualIsNull.sql b/tests/asssertions/ut.expect.to_be_equal.varchar.PutsNullIntoStringValueWhenActualIsNull.sql
@@ -0,0 +1,18 @@
+PROMPT Puts 'NULL' into assert results when actual value is null
+
+--Arrange
+declare
+  l_results      ut_objects_list;
+begin
+--Act
+  ut.expect(to_char(NULL)).to_be_equal('abc');
+  l_results :=  ut_assert_processor.get_asserts_results();
+--Assert
+  if treat(l_results(1) as ut_assert_result).actual_value_string = 'NULL' then
+    :test_result := ut_utils.tr_success;
+  else
+    dbms_output.put_line('expected: actual_value_string to be NULL, but got '''||treat(l_results(1) as ut_assert_result).actual_value_string||'''' );
+  end if;
+end;
+/
+
diff --git a/tests/asssertions/ut.expect.to_be_equal.varchar.PutsNullIntoStringValueWhenExpectedIsNull.sql b/tests/asssertions/ut.expect.to_be_equal.varchar.PutsNullIntoStringValueWhenExpectedIsNull.sql
@@ -0,0 +1,3 @@
+PROMPT Gives failure when actual is null
+
+@@asssertions/common/ut.expect.to_be_equal.scalar.common.sql 'varchar2(4000)' 'NULL' '''abc''' 'ut_utils.tr_failure'
diff --git a/tests/lib/RunTest.sql b/tests/lib/RunTest.sql
@@ -22,5 +22,6 @@ end;
 
 begin
   ut_assert.clear_asserts;
+  ut_assert_processor.clear_asserts;
 end;
 /

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+PROMPT Gives a failure when comparing different varchar2 values`
	`2`	`+`
	`3`	`+@@asssertions/common/ut.expect.to_be_equal.scalar.common.sql 'varchar2(4000)' '''Abc''' '''abc''' 'ut_utils.tr_failure'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+PROMPT Gives failure when actual is null`
	`2`	`+`
	`3`	`+@@asssertions/common/ut.expect.to_be_equal.scalar.common.sql 'varchar2(4000)' 'NULL' '''abc''' 'ut_utils.tr_failure'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+PROMPT Gives failure when expected is null`
	`2`	`+`
	`3`	`+@@asssertions/common/ut.expect.to_be_equal.scalar.common.sql 'varchar2(4000)' '''abc''' 'NULL' 'ut_utils.tr_failure'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+PROMPT Gives a success when comparing equal varchar2 values`
	`2`	`+`
	`3`	`+@@asssertions/common/ut.expect.to_be_equal.scalar.common.sql 'varchar2(4000)' '''Abc''' '''Abc''' 'ut_utils.tr_success'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+PROMPT Gives a success when both varchar2 values are null`
	`2`	`+`
	`3`	`+@@asssertions/common/ut.expect.to_be_equal.scalar.common.sql 'varchar2(4000)' 'NULL' 'NULL' 'ut_utils.tr_success'`