Initial checkin

utPLSQL · jgebal · Feb 4, 2022 · Jun 1, 2020 · Jun 2, 2020 · Jun 2, 2020
commit 48abf1a83c36ca44c2f395eceea5473ac99a0221
diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb
@@ -172,6 +172,13 @@ create or replace type body ut_equal as
     return l_result;
   end;
 
+  member procedure include(self in ut_equal, a_items varchar2) is
+    --l_result ut_equal := self;
+  begin
+    null;
+    --l_result.expectation.to_(l_result );
+  end;
+
   member function exclude(a_items varchar2) return ut_equal is
     l_result ut_equal := self;
   begin

diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps
@@ -43,6 +43,7 @@ create or replace type ut_equal force under ut_comparison_matcher(
   constructor function ut_equal(self in out nocopy ut_equal, a_expected dsinterval_unconstrained, a_nulls_are_equal boolean := null) return self as result,
   constructor function ut_equal(self in out nocopy ut_equal, a_expected json_element_t, a_nulls_are_equal boolean := null) return self as result,
   member function include(a_items varchar2) return ut_equal,
+  member procedure include(self in ut_equal, a_items varchar2),
   member function include(a_items ut_varchar2_list) return ut_equal,
   member function exclude(a_items varchar2) return ut_equal,
   member function exclude(a_items ut_varchar2_list) return ut_equal,
@@ -56,4 +57,4 @@ create or replace type ut_equal force under ut_comparison_matcher(
   member function uc return ut_equal
 )
 not final
-/
+
diff --git a/source/expectations/matchers/ut_matcher.tps b/source/expectations/matchers/ut_matcher.tps
@@ -1,4 +1,4 @@
-create or replace type ut_matcher authid current_user as object(
+create or replace type ut_matcher force under ut_matcher_base(
   /*
   utPLSQL - Version 3
   Copyright 2016 - 2019 utPLSQL Project
@@ -15,10 +15,9 @@ create or replace type ut_matcher authid current_user as object(
   See the License for the specific language governing permissions and
   limitations under the License.
   */
-  self_type       varchar2(250),
   is_errored      integer,
   is_negated_flag number(1,0),
-
+  expectation     ut_expectation,
   /*
     function: run_matcher
 
@@ -41,4 +40,4 @@ create or replace type ut_matcher authid current_user as object(
   member function negated return ut_matcher,
   member function is_negated return boolean
 ) not final not instantiable
-/
+
diff --git a/source/expectations/matchers/ut_matcher_base.tpb b/source/expectations/matchers/ut_matcher_base.tpb
@@ -0,0 +1,20 @@
+create or replace type body ut_matcher_base as
+  /*
+  utPLSQL - Version 3
+  Copyright 2016 - 2019 utPLSQL Project
+
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
+
+end;
+/
diff --git a/source/expectations/matchers/ut_matcher_base.tps b/source/expectations/matchers/ut_matcher_base.tps
@@ -0,0 +1,4 @@
+create or replace type ut_matcher_base force authid current_user as object(
+  self_type       varchar2(250)
+)
+not final not instantiable
diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb
@@ -15,12 +15,12 @@ create or replace type body ut_expectation as
   See the License for the specific language governing permissions and
   limitations under the License.
   */
-  member procedure to_(self in ut_expectation, a_matcher ut_matcher) is
+  member procedure to_(self in ut_expectation, a_matcher ut_matcher_base) is
     l_expectation_result boolean;
-    l_matcher       ut_matcher := a_matcher;
+    l_matcher       ut_matcher := treat(a_matcher as ut_matcher);
     l_message       varchar2(32767);
   begin
-    if a_matcher.is_negated() then
+    if l_matcher.is_negated() then
       self.not_to( a_matcher );
     else
       l_expectation_result := l_matcher.run_matcher( self.actual_data );
@@ -30,9 +30,9 @@ create or replace type body ut_expectation as
     end if;
   end;
 
-  member procedure not_to(self in ut_expectation, a_matcher ut_matcher) is
+  member procedure not_to(self in ut_expectation, a_matcher ut_matcher_base) is
     l_expectation_result boolean;
-    l_matcher       ut_matcher := a_matcher;
+    l_matcher       ut_matcher := treat(a_matcher as ut_matcher);
     l_message       varchar2(32767);
   begin
     l_expectation_result := coalesce( l_matcher.run_matcher_negated( self.actual_data ), false );

diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps
@@ -1,4 +1,4 @@
-create or replace type ut_expectation authid current_user as object(
+create or replace type ut_expectation force authid current_user as object(
   /*
   utPLSQL - Version 3
   Copyright 2016 - 2019 utPLSQL Project
@@ -19,8 +19,8 @@ create or replace type ut_expectation authid current_user as object(
   description         varchar2(4000 char),
 
   --base matcher executors
-  member procedure to_(self in ut_expectation, a_matcher ut_matcher),
-  member procedure not_to(self in ut_expectation, a_matcher ut_matcher),
+  member procedure to_(self in ut_expectation, a_matcher ut_matcher_base),
+  member procedure not_to(self in ut_expectation, a_matcher ut_matcher_base),
 
   --shortcuts
   member procedure to_be_null(self in ut_expectation),
@@ -172,4 +172,4 @@ create or replace type ut_expectation authid current_user as object(
 
 )
 not final
-/
+
diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb
@@ -48,11 +48,12 @@ create or replace type body ut_expectation_compound as
     return l_result;
   end;
 
-   member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound is
+   member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal is
     l_result ut_expectation_compound := self;
   begin
     l_result.matcher := ut_equal(a_expected, a_nulls_are_equal);
-    return l_result;
+    l_result.matcher.expectation := l_result;
+    return treat(l_result.matcher as ut_equal);
   end;
 
   member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound is

diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps
@@ -24,7 +24,7 @@ create or replace type ut_expectation_compound force under ut_expectation(
 
   member function  to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound,
   member function  not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound,
-  member function  to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound,
+  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_expectation_compound,
   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,
@@ -51,4 +51,4 @@ create or replace type ut_expectation_compound force under ut_expectation(
   member function  uc return ut_expectation_compound,
   member procedure uc(self in ut_expectation_compound)
 )
-/
+