Adding contain and not contain

lwasylow · lwasylow · commit caeeb30ea4fe · 2020-06-02T21:30:05.000+01:00
diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb
@@ -66,32 +66,36 @@ create or replace type body ut_expectation_compound as
     return treat(l_result as ut_equal);
   end;
 
-  member function to_contain(a_expected sys_refcursor) return ut_expectation_compound is
-    l_result ut_expectation_compound := self;
+  member function to_contain(a_expected sys_refcursor) return ut_equal is
+    l_result ut_matcher;
   begin
-    l_result.matcher := ut_contain(a_expected);
-    return l_result;
+    l_result := ut_contain(a_expected);
+    l_result.expectation := self;
+    return treat(l_result as ut_equal);
   end;
 
-  member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound is
-    l_result ut_expectation_compound := self;
+  member function not_to_contain(a_expected sys_refcursor) return ut_equal is
+    l_result ut_matcher;
   begin
-    l_result.matcher := ut_contain(a_expected).negated();
-    return l_result;
+    l_result := ut_contain(a_expected).negated();
+    l_result.expectation := self;
+    return treat(l_result as ut_equal);
   end;
-
-  member function to_contain(a_expected anydata) return ut_expectation_compound is
-    l_result ut_expectation_compound := self;
+  
+  member function to_contain(a_expected anydata) return ut_equal is
+    l_result ut_matcher;
   begin
-    l_result.matcher := ut_contain(a_expected);
-    return l_result;
+    l_result := ut_contain(a_expected);
+    l_result.expectation := self;
+    return treat(l_result as ut_equal);
   end;
 
-  member function not_to_contain(a_expected anydata) return ut_expectation_compound is
-    l_result ut_expectation_compound := self;
+  member function not_to_contain(a_expected anydata) return ut_equal is
+    l_result ut_matcher;
   begin
-    l_result.matcher := ut_contain(a_expected).negated();
-    return l_result;
+    l_result := ut_contain(a_expected).negated();
+    l_result.expectation := self;
+    return treat(l_result as ut_equal);
   end;
 
 end;
diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps
@@ -26,10 +26,10 @@ create or replace type ut_expectation_compound under ut_expectation(
   member function  not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_equal,
   member function  to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal,
   member function  not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal,
-  member function  to_contain(a_expected sys_refcursor) return ut_expectation_compound,
-  member function  not_to_contain(a_expected sys_refcursor) return ut_expectation_compound,
-  member function  to_contain(a_expected anydata) return ut_expectation_compound,
-  member function  not_to_contain(a_expected anydata) return ut_expectation_compound
+  member function  to_contain(a_expected sys_refcursor) return ut_equal,
+  member function  not_to_contain(a_expected sys_refcursor) return ut_equal,
+  member function  to_contain(a_expected anydata) return ut_equal,
+  member function  not_to_contain(a_expected anydata) return ut_equal
 )
 /
 

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@ create or replace type ut_expectation_compound under ut_expectation(`
`26`	`26`	`member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_equal,`
`27`	`27`	`member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal,`
`28`	`28`	`member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal,`
`29`		`- member function to_contain(a_expected sys_refcursor) return ut_expectation_compound,`
`30`		`- member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound,`
`31`		`- member function to_contain(a_expected anydata) return ut_expectation_compound,`
`32`		`- member function not_to_contain(a_expected anydata) return ut_expectation_compound`
	`29`	`+ member function to_contain(a_expected sys_refcursor) return ut_equal,`
	`30`	`+ member function not_to_contain(a_expected sys_refcursor) return ut_equal,`
	`31`	`+ member function to_contain(a_expected anydata) return ut_equal,`
	`32`	`+ member function not_to_contain(a_expected anydata) return ut_equal`
`33`	`33`	`)`
`34`	`34`	`/`
`35`	`35`