Adding negated matcher

lwasylow · lwasylow · commit 6193ff3ca604 · 2018-10-11T14:04:36.000+01:00
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
@@ -606,11 +606,6 @@ create or replace package body ut_compound_data_helper is
                         tmp';
     return l_sql;
   end;
-  
-  function get_inclusion_matcher_not_sql(a_owner in varchar2) return varchar2 is
-  begin
-    null;
-  end;  
    
   function get_refcursor_matcher_sql(a_owner in varchar2,a_inclusion_matcher boolean := false, a_negated_match boolean := false) return varchar2  is
     l_sql varchar2(32767);
diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb
@@ -36,12 +36,24 @@ create or replace type body ut_include as
    return true;
   end;
   
+  member function negated return ut_include is
+    l_result ut_include := self;
+  begin
+    l_result.is_negated := ut_utils.boolean_to_int(true);
+    return l_result;
+  end;
+  
   overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean is
     l_result boolean;
   begin
     if self.expected.data_type = a_actual.data_type then
-      l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(),
-                            true,get_inclusion_compare());
+      if nvl(self.is_negated,0) = 0 then
+        l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(),
+                              true,get_inclusion_compare());
+      else
+        l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(),
+                              true,get_inclusion_compare());
+      end if;
     else
       l_result := (self as ut_matcher).run_matcher(a_actual);
     end if;
diff --git a/source/expectations/matchers/ut_include.tps b/source/expectations/matchers/ut_include.tps
@@ -16,9 +16,18 @@ create or replace type ut_include under ut_equal(
   limitations under the License.
   */
     
+  /**
+  * Due to nature of inclusion compare the not is bit diffrente than standard.
+  * Result is false when even one element belongs which can cause overlap.
+  * e.g. set can fail at same time not_include and include. By that we mean
+  * that false include not necessary mean true not include.
+  */
+  is_negated number(1,0),  
+    
   member procedure init(self in out nocopy ut_include, a_expected ut_data_value),
   constructor function ut_include(self in out nocopy ut_include, a_expected sys_refcursor) return self as result,
   member function get_inclusion_compare return boolean,
+  member function negated return ut_include,
   overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean,
   overriding member function failure_message(a_actual ut_data_value) return varchar2
 )
diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb
@@ -32,7 +32,6 @@ create or replace type body ut_expectation as
     l_matcher       ut_matcher := a_matcher;
     l_message       varchar2(32767);
   begin
-    
     l_expectation_result := l_matcher.run_matcher_negated( self.actual_data );
     l_expectation_result := coalesce(l_expectation_result,false);
     l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message_when_negated( self.actual_data ) );
@@ -691,12 +690,12 @@ create or replace type body ut_expectation as
   
   member procedure not_to_include(self in ut_expectation, a_expected sys_refcursor) is
   begin
-   self.not_to( ut_include(a_expected) );
+   self.not_to( ut_include(a_expected).negated );
   end;
   
   member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) is
   begin
-    self.not_to( ut_include(a_expected) );
+    self.not_to( ut_include(a_expected).negated );
   end;
 
 end;
diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb
@@ -92,15 +92,15 @@ create or replace type body ut_expectation_compound as
   member function not_to_include(a_expected sys_refcursor) return ut_expectation_compound is
     l_result ut_expectation_compound := self;
   begin
-    l_result.matcher := ut_include(a_expected);
+    l_result.matcher := ut_include(a_expected).negated;
     l_result.negated := ut_utils.boolean_to_int(true);
     return l_result;
   end;
 
   member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound is
     l_result ut_expectation_compound := self;
   begin
-    l_result.matcher := ut_include(a_expected);
+    l_result.matcher := ut_include(a_expected).negated;
     l_result.negated := ut_utils.boolean_to_int(true);
     return l_result;
   end;
diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps
@@ -51,4 +51,4 @@ create or replace type ut_expectation_compound under ut_expectation(
   member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list)
 )
 final
-/
+/

Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,4 @@ create or replace type ut_expectation_compound under ut_expectation(`
`51`	`51`	`member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list)`
`52`	`52`	`)`
`53`	`53`	`final`
`54`		`-/`
	`54`	`+/`