utPLSQL · jgebal · Feb 4, 2022 · Jun 1, 2020 · Jun 2, 2020 · Jun 2, 2020
diff --git a/source/api/be_within.syn b/source/api/be_within.syn
@@ -0,0 +1 @@
+create synonym be_within for ut_be_within;
diff --git a/source/create_grants.sql b/source/create_grants.sql
@@ -87,6 +87,7 @@ grant execute on &&ut3_owner..ut_be_like to &ut3_user;
 grant execute on &&ut3_owner..ut_be_not_null to &ut3_user;
 grant execute on &&ut3_owner..ut_be_null to &ut3_user;
 grant execute on &&ut3_owner..ut_be_true to &ut3_user;
+grant execute on &&ut3_owner..ut_be_within to &ut3_user;
 grant execute on &&ut3_owner..ut_contain to &ut3_user;
 grant execute on &&ut3_owner..ut_equal to &ut3_user;
 grant execute on &&ut3_owner..ut_have_count to &ut3_user;

diff --git a/source/create_synonyms.sql b/source/create_synonyms.sql
@@ -103,6 +103,7 @@ create &action_type. synonym &ut3_user.be_like for &&ut3_owner..be_like;
 create &action_type. synonym &ut3_user.be_not_null for &&ut3_owner..be_not_null;
 create &action_type. synonym &ut3_user.be_null for &&ut3_owner..be_null;
 create &action_type. synonym &ut3_user.be_true for &&ut3_owner..be_true;
+create &action_type. synonym &ut3_user.be_within for &&ut3_owner..be_within;
 create &action_type. synonym &ut3_user.contain for &&ut3_owner..contain;
 create &action_type. synonym &ut3_user.equal for &&ut3_owner..equal;
 create &action_type. synonym &ut3_user.have_count for &&ut3_owner..have_count;

diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb
@@ -16,28 +16,27 @@ create or replace type body ut_be_within as
   limitations under the License.
   */
 
- member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value, a_is_pct number , a_self_type varchar2 := null) is
+ member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value) is
   begin
     self.distance_from_expected  := a_distance_from_expected;
-    self.is_pct := nvl(a_is_pct,0);
-    self.self_type := nvl( a_self_type, $$plsql_unit );
+    self.self_type := $$plsql_unit;
   end;
 
-  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number, a_is_pct number) return self as result is
+  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number) return self as result is
   begin
-    init(ut_data_value_number(a_distance_from_expected),a_is_pct);
+    init(ut_data_value_number(a_distance_from_expected));
     return;
   end;
 
-  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained, a_is_pct number) return self as result is
+  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained) return self as result is
   begin
-    init(ut_data_value_dsinterval(a_distance_from_expected),a_is_pct); 
+    init(ut_data_value_dsinterval(a_distance_from_expected));
     return;
   end;
 
-  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained, a_is_pct number) return self as result is
+  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained) return self as result is
   begin
-    init(ut_data_value_yminterval(a_distance_from_expected),a_is_pct);
+    init(ut_data_value_yminterval(a_distance_from_expected));
     return;
   end;
 
@@ -62,20 +61,29 @@ create or replace type body ut_be_within as
       l_result.expectation.to_(l_result );
     end if;
   end;
-
+
+  member function of_(self in ut_be_within, a_expected number) return ut_be_within is
+    l_result ut_be_within := self;
+  begin
+    l_result.expected := ut_data_value_number(a_expected);
+    return l_result;
+  end;
+
+  member function of_(self in ut_be_within, a_expected date)  return ut_be_within is
+    l_result ut_be_within := self;
+  begin
+    l_result.expected := ut_data_value_date(a_expected);
+    return l_result;
+  end;
+
   overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean is
     l_result boolean;
   begin
     if self.expected.data_type = a_actual.data_type then
-      if self.expected is of (ut_data_value_number) and self.is_pct = 0 then
+      if self.expected is of (ut_data_value_number) then
         l_result := abs((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value)) <= 
                     treat(self.distance_from_expected as ut_data_value_number).data_value;
-      elsif self.expected is of (ut_data_value_number) and self.is_pct = 1 then
-        l_result := treat(self.distance_from_expected as ut_data_value_number).data_value >= 
-                    (
-                     ((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ) /
-                    (treat(self.expected as ut_data_value_number).data_value)) ;      
-      elsif self.expected is of (ut_data_value_date) and self.distance_from_expected is of ( ut_data_value_yminterval) then      
+      elsif self.expected is of (ut_data_value_date) and self.distance_from_expected is of ( ut_data_value_yminterval) then
         l_result := treat(a_actual as ut_data_value_date).data_value 
                     between 
                      (treat(self.expected as ut_data_value_date).data_value) - treat(self.distance_from_expected as ut_data_value_yminterval).data_value

diff --git a/source/expectations/matchers/ut_be_within.tps b/source/expectations/matchers/ut_be_within.tps
@@ -21,15 +21,15 @@ create or replace type ut_be_within under ut_comparison_matcher(
   * Holds information about mather options
   */
   distance_from_expected ut_data_value,
-  is_pct number(1,0),
-
-  member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value, a_is_pct number , a_self_type varchar2 := null),
-  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number, a_is_pct number) return self as result,
-  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained, a_is_pct number) return self as result,
-  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained, a_is_pct number) return self as result,
+  member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value),
+  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number) return self as result,
+  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained) return self as result,
+  constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained) return self as result,
   member procedure of_(self in ut_be_within, a_expected number),
   member procedure of_(self in ut_be_within, a_expected date),
-
+  member function of_(self in ut_be_within, a_expected number) return ut_be_within,
+  member function of_(self in ut_be_within, a_expected date)  return ut_be_within,
+
   overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean,
   overriding member function failure_message(a_actual ut_data_value) return varchar2,
   overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2

diff --git a/source/expectations/matchers/ut_be_within_pct.tpb b/source/expectations/matchers/ut_be_within_pct.tpb
@@ -0,0 +1,42 @@
+create or replace type body ut_be_within_pct 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.
+  */
+
+  constructor function ut_be_within_pct(self in out nocopy ut_be_within_pct, a_distance_from_expected number) return self as result is
+  begin
+    self.init(ut_data_value_number(a_distance_from_expected));
+    return;
+  end;
+
+  overriding member function run_matcher(self in out nocopy ut_be_within_pct, a_actual ut_data_value) return boolean is
+    l_result boolean;
+  begin
+    if self.expected.data_type = a_actual.data_type then
+      if self.expected is of (ut_data_value_number) then
+        l_result := treat(self.distance_from_expected as ut_data_value_number).data_value >= 
+                    (
+                     ((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ) /
+                    (treat(self.expected as ut_data_value_number).data_value)) ;      
+      end if;
+    else
+      l_result := (self as ut_matcher).run_matcher(a_actual);
+    end if;
+    return l_result;
+  end;
+
+end;
+/
diff --git a/source/expectations/matchers/ut_be_within_pct.tps b/source/expectations/matchers/ut_be_within_pct.tps
@@ -0,0 +1,24 @@
+create or replace type ut_be_within_pct under ut_be_within(
+  /*
+  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.
+  */
+
+
+  constructor function ut_be_within_pct(self in out nocopy ut_be_within_pct, a_distance_from_expected number) return self as result,
+  overriding member function run_matcher(self in out nocopy ut_be_within_pct, a_actual ut_data_value) return boolean
+)
+not final
+/
diff --git a/source/expectations/matchers/ut_matcher.tpb b/source/expectations/matchers/ut_matcher.tpb
@@ -20,11 +20,6 @@ create or replace type body ut_matcher as
   begin
     ut_utils.debug_log('Failure - ut_matcher.run_matcher'||'(a_actual '||a_actual.data_type||')');
     self.is_errored := ut_utils.boolean_to_int(true);
---     self.error_message := 'The matcher '''||name()||''' cannot be used';
---     if self.expected is not null then
---       self.error_message := self.error_message ||' for comparison of data type ('||self.expected.data_type||')';
---     end if;
---     self.error_message := self.error_message ||' with data type ('||a_actual.data_type||').';
     return null;
   end;
 

diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb
@@ -694,70 +694,70 @@ create or replace type body ut_expectation as
     self.not_to( ut_contain(a_expected).negated() );
   end;
 
-  member function  to_be_within(a_dist natural) return ut_be_within is
+  member function to_be_within(a_dist natural) return ut_be_within is
     l_result ut_matcher;
   begin
-    l_result := ut_be_within(a_dist,0);
+    l_result := ut_be_within(a_dist);
     l_result.expectation := self;
     return treat(l_result as ut_be_within);
   end;  
 
-  member function  to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is
+  member function to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is
     l_result ut_matcher;
   begin
-    l_result := ut_be_within(a_dist,0);
+    l_result := ut_be_within(a_dist);
     l_result.expectation := self;
     return treat(l_result as ut_be_within);
   end;  
 
-  member function  to_be_within(a_dist yminterval_unconstrained) return ut_be_within is
+  member function to_be_within(a_dist yminterval_unconstrained) return ut_be_within is
     l_result ut_matcher;
   begin
-    l_result := ut_be_within(a_dist,0);
+    l_result := ut_be_within(a_dist);
     l_result.expectation := self;
     return treat(l_result as ut_be_within);
   end;  
 
- member function  to_be_within_pct(a_dist natural) return ut_be_within is 
-    l_result ut_matcher;
-  begin
-    l_result := ut_be_within(a_dist,1);
-    l_result.expectation := self;
-    return treat(l_result as ut_be_within);
+ member function to_be_within_pct(a_dist natural) return ut_be_within_pct is
+   l_result ut_matcher;
+ begin
+   l_result := ut_be_within_pct(a_dist);
+   l_result.expectation := self;
+   return treat(l_result as ut_be_within_pct);
   end;  
-
-  member function  not_to_be_within(a_dist natural) return ut_be_within is
-    l_result ut_matcher;
-  begin
-    l_result := ut_be_within(a_dist,0).negated;
-    l_result.expectation := self;
-    return treat(l_result as ut_be_within);
-  end; 
 
-  member function  not_to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is
+  member function not_to_be_within(a_dist natural) return ut_be_within is
     l_result ut_matcher;
   begin
-    l_result := ut_be_within(a_dist,0).negated;
+    l_result := ut_be_within(a_dist).negated();
     l_result.expectation := self;
     return treat(l_result as ut_be_within);
-  end;  
-  
-  member function  not_to_be_within(a_dist yminterval_unconstrained) return ut_be_within is
+  end;
+
+  member function not_to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is
     l_result ut_matcher;
   begin
-    l_result := ut_be_within(a_dist,0).negated;
+    l_result := ut_be_within(a_dist).negated();
     l_result.expectation := self;
     return treat(l_result as ut_be_within);
-  end;  
-  
-  member function  not_to_be_within_pct(a_dist natural) return ut_be_within is
+  end;
+
+  member function not_to_be_within(a_dist yminterval_unconstrained) return ut_be_within is
     l_result ut_matcher;
   begin
-    l_result := ut_be_within(a_dist,0).negated;
+    l_result := ut_be_within(a_dist).negated();
     l_result.expectation := self;
     return treat(l_result as ut_be_within);
-  end; 
-
+  end;
+
+ member function not_to_be_within_pct(a_dist natural) return ut_be_within_pct is
+   l_result ut_matcher;
+ begin
+   l_result := ut_be_within_pct(a_dist).negated();
+   l_result.expectation := self;
+   return treat(l_result as ut_be_within_pct);
+  end;
+
 end;
 /
 
diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps
@@ -167,13 +167,11 @@ create or replace type ut_expectation under ut_expectation_base(
   member function  to_be_within(a_dist natural) return ut_be_within,
   member function  to_be_within(a_dist dsinterval_unconstrained) return ut_be_within,
   member function  to_be_within(a_dist yminterval_unconstrained) return ut_be_within,
-  member function  to_be_within_pct(a_dist natural) return ut_be_within,
-
+  member function  to_be_within_pct(a_dist natural) return ut_be_within_pct,
   member function  not_to_be_within(a_dist natural) return ut_be_within,
   member function  not_to_be_within(a_dist dsinterval_unconstrained) return ut_be_within,
   member function  not_to_be_within(a_dist yminterval_unconstrained) return ut_be_within,
-  member function  not_to_be_within_pct(a_dist natural) return ut_be_within  
-
+  member function  not_to_be_within_pct(a_dist natural) return ut_be_within_pct
 )
 not final
 /
diff --git a/source/install.sql b/source/install.sql
@@ -241,6 +241,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
 @@install_component.sql 'expectations/matchers/ut_matcher.tps'
 @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps'
 @@install_component.sql 'expectations/matchers/ut_be_within.tps'
+@@install_component.sql 'expectations/matchers/ut_be_within_pct.tps'
 @@install_component.sql 'expectations/ut_expectation.tps'
 @@install_component.sql 'expectations/matchers/ut_be_false.tps'
 @@install_component.sql 'expectations/matchers/ut_be_greater_or_equal.tps'
@@ -297,6 +298,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
 @@install_component.sql 'expectations/matchers/ut_be_true.tpb'
 @@install_component.sql 'expectations/matchers/ut_equal.tpb'
 @@install_component.sql 'expectations/matchers/ut_be_within.tpb'
+@@install_component.sql 'expectations/matchers/ut_be_within_pct.tpb'
 @@install_component.sql 'expectations/matchers/ut_contain.tpb'
 @@install_component.sql 'expectations/matchers/ut_have_count.tpb'
 @@install_component.sql 'expectations/matchers/ut_be_between.tpb'
@@ -360,6 +362,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
 @@install_component.sql 'api/be_not_null.syn'
 @@install_component.sql 'api/be_null.syn'
 @@install_component.sql 'api/be_true.syn'
+@@install_component.sql 'api/be_within.syn'
 @@install_component.sql 'api/equal.syn'
 @@install_component.sql 'api/have_count.syn'
 @@install_component.sql 'api/match.syn'

diff --git a/test/ut3_tester_helper/expectations_helper.pkb b/test/ut3_tester_helper/expectations_helper.pkb
@@ -53,29 +53,5 @@ create or replace package body expectations_helper is
     return l_execute;
   end;
 
-  function be_within_expectation_block(
-    a_matcher_name       varchar2,
-    a_actual_data_type   varchar2,
-    a_actual_data        varchar2,
-    a_expected_data_type varchar2,
-    a_expected_data      varchar2,
-    a_distance           varchar2,
-    a_distance_data_type varchar2
-  ) return varchar2
-  is
-    l_execute varchar2(32000);
-  begin
-    l_execute := '
-      declare
-        l_actual   '||a_actual_data_type||' := '||a_actual_data||';
-        l_expected '||a_expected_data_type||' := '||a_expected_data||';
-        l_distance '||a_distance_data_type||' := '||a_distance||';
-      begin
-        --act - execute the expectation
-        ut3_develop.ut.expect( l_actual ).'||a_matcher_name||'(l_distance).of_(l_expected);
-      end;';
-    return l_execute;
-  end;
-
 end;
 /
diff --git a/test/ut3_tester_helper/expectations_helper.pks b/test/ut3_tester_helper/expectations_helper.pks
@@ -21,15 +21,5 @@ create or replace package expectations_helper is
     a_expected_data      varchar2
   ) return varchar2;
 
-  function be_within_expectation_block(
-    a_matcher_name       varchar2,
-    a_actual_data_type   varchar2,
-    a_actual_data        varchar2,
-    a_expected_data_type varchar2,
-    a_expected_data      varchar2,
-    a_distance           varchar2,
-    a_distance_data_type varchar2
-  ) return varchar2;  
-
 end;
 /