First code corrections

lwasylow · lwasylow · commit a660208acc59 · 2020-06-14T20:02:49.000+01:00
diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md
@@ -1126,22 +1126,6 @@ end;
 
 **Example 3.**
 ```sql
-begin
-  ut.expect(sysdate).to_be_within_pct(interval '1' day).of_(sysdate + 1);
-end;
-/
-```
-
-**Example 4.**
-```sql
-begin
-  ut.expect(sysdate).to_be_within_pct(interval '1' month).of_(add_months(sysdate,1));
-end;
-/
-```
-
-**Example 5.**
-```sql
 begin
   ut.expect(3).to_be_within(1).of_(5);
 end;
@@ -1158,7 +1142,7 @@ Failures:
       at "UT3_DEVELOP.TEST_BETWNSTR.WIHTIN_TEST", line 5
 ```
 
-**Example 6.**
+**Example 4.**
 ```sql
 begin
   ut.expect(sysdate).to_be_within(interval '1' day).of_(sysdate+2);
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -887,25 +887,18 @@ create or replace package body ut_utils is
     l_result := case 
                   when l_day = 1 then l_day ||' day' 
                   when l_day > 1 then l_day ||' days' 
-                  else null 
-                end;
-    l_result := l_result || 
+                end || 
                 case 
                   when l_hour = 1 then ' '|| l_hour ||' hour' 
                   when l_hour > 1 then ' '|| l_hour ||' hours' 
-                  else null 
-                end;
-    l_result := l_result || 
+                end || 
                 case 
                   when l_minute = 1 then ' '||l_minute ||' minute' 
                   when l_minute > 1 then ' '||l_minute ||' minutes' 
-                  else null 
-                end; 
-    l_result := l_result || 
+                end || 
                 case 
                   when l_second = 1 then ' '||l_second ||' second' 
                   when l_second > 1 then ' '||l_second ||' seconds' 
-                  else null 
                 end;    
     return trim(leading ' ' from l_result);
   end;
@@ -918,13 +911,10 @@ create or replace package body ut_utils is
     l_result := case 
                   when l_year = 1 then l_year ||' year' 
                   when l_year > 1 then l_year ||' years'
-                  else null 
-                end;
-    l_result := l_result || 
+                end || 
                 case 
                   when l_month = 1 then  ' '||l_month ||' month' 
                   when l_month > 1 then  ' '||l_month ||' months' 
-                  else null 
                 end;   
     return trim(leading ' ' from l_result);
   end;
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -440,6 +440,9 @@ create or replace package ut_utils authid definer is
   */  
   function interval_to_text(a_interval dsinterval_unconstrained) return varchar2;
   
+  /*
+  * Return value of interval in plain english
+  */    
   function interval_to_text(a_interval yminterval_unconstrained) return varchar2;
   
 end ut_utils;
diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb
@@ -16,28 +16,28 @@ create or replace type body ut_be_within as
   limitations under the License.
   */
 
- member procedure init(self in out nocopy ut_be_within, a_dist 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, a_is_pct number , a_self_type varchar2 := null) is
   begin
-    self.dist  := a_dist;
+    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 );
   end;
 
-  constructor function ut_be_within(self in out nocopy ut_be_within, a_dist 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, a_is_pct number) return self as result is
   begin
-    init(ut_data_value_number(a_dist),a_is_pct);
+    init(ut_data_value_number(a_distance_from_expected),a_is_pct);
     return;
   end;
   
-  constructor function ut_be_within(self in out nocopy ut_be_within, a_dist 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, a_is_pct number) return self as result is
   begin
-    init(ut_data_value_dsinterval(a_dist),a_is_pct); 
+    init(ut_data_value_dsinterval(a_distance_from_expected),a_is_pct); 
     return;
   end;
   
-  constructor function ut_be_within(self in out nocopy ut_be_within, a_dist 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, a_is_pct number) return self as result is
   begin
-    init(ut_data_value_yminterval(a_dist),a_is_pct);
+    init(ut_data_value_yminterval(a_distance_from_expected),a_is_pct);
     return;
   end;
   
@@ -61,24 +61,24 @@ create or replace type body ut_be_within as
     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
         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.dist 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.dist as ut_data_value_number).data_value >= 
+        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.dist 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.dist as ut_data_value_yminterval).data_value
+                     (treat(self.expected as ut_data_value_date).data_value) - treat(self.distance_from_expected as ut_data_value_yminterval).data_value
                      and 
-                     (treat(self.expected as ut_data_value_date).data_value) + treat(self.dist as ut_data_value_yminterval).data_value;
-      elsif self.expected is of (ut_data_value_date) and self.dist is of ( ut_data_value_dsinterval) then      
+                     (treat(self.expected as ut_data_value_date).data_value) + treat(self.distance_from_expected as ut_data_value_yminterval).data_value;
+      elsif self.expected is of (ut_data_value_date) and self.distance_from_expected is of ( ut_data_value_dsinterval) 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.dist as ut_data_value_dsinterval).data_value
+                      (treat(self.expected as ut_data_value_date).data_value) - treat(self.distance_from_expected as ut_data_value_dsinterval).data_value
                       and 
-                      (treat(self.expected as ut_data_value_date).data_value) + treat(self.dist as ut_data_value_dsinterval).data_value;
+                      (treat(self.expected as ut_data_value_date).data_value) + treat(self.distance_from_expected as ut_data_value_dsinterval).data_value;
       end if;
     else
       l_result := (self as ut_matcher).run_matcher(a_actual);
@@ -87,20 +87,20 @@ create or replace type body ut_be_within as
   end;
 
   overriding member function failure_message(a_actual ut_data_value) return varchar2 is
-    l_distance varchar2(32767);
+    l_distance_from_expected varchar2(32767);
   begin
-    l_distance := case 
-                    when self.dist is of (ut_data_value_number) then
-                      treat(self.dist as ut_data_value_number).to_string
-                    when self.dist is of (ut_data_value_yminterval) then
-                      treat(self.dist as ut_data_value_yminterval).to_string 
-                    when self.dist is of (ut_data_value_dsinterval) then
-                      treat(self.dist as ut_data_value_dsinterval).to_string 
+    l_distance_from_expected := case 
+                    when self.distance_from_expected is of (ut_data_value_number) then
+                      treat(self.distance_from_expected as ut_data_value_number).to_string
+                    when self.distance_from_expected is of (ut_data_value_yminterval) then
+                      treat(self.distance_from_expected as ut_data_value_yminterval).to_string 
+                    when self.distance_from_expected is of (ut_data_value_dsinterval) then
+                      treat(self.distance_from_expected as ut_data_value_dsinterval).to_string 
                     else
                       null
                     end;
                     
-    return (self as ut_matcher).failure_message(a_actual) || ' '||l_distance ||' of '|| expected.to_string_report();
+    return (self as ut_matcher).failure_message(a_actual) || ' '||l_distance_from_expected ||' of '|| expected.to_string_report();
   end;
 
   overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 is
@@ -110,4 +110,4 @@ create or replace type body ut_be_within as
   end;  
   
 end;
-/
+/
diff --git a/source/expectations/matchers/ut_be_within.tps b/source/expectations/matchers/ut_be_within.tps
@@ -20,13 +20,13 @@ create or replace type ut_be_within under ut_comparison_matcher(
   /**
   * Holds information about mather options
   */
-  dist ut_data_value,
+  distance_from_expected ut_data_value,
   is_pct number(1,0),
   
-  member procedure init(self in out nocopy ut_be_within, a_dist 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_dist number, a_is_pct number) return self as result,
-  constructor function ut_be_within(self in out nocopy ut_be_within, a_dist dsinterval_unconstrained, a_is_pct number) return self as result,
-  constructor function ut_be_within(self in out nocopy ut_be_within, a_dist 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, 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 of_(self in ut_be_within, a_expected number),
   member procedure of_(self in ut_be_within, a_expected date),
   
@@ -35,4 +35,4 @@ create or replace type ut_be_within under ut_comparison_matcher(
   overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2
 )
 not final
-/
+/
diff --git a/source/expectations/matchers/ut_matcher_base.tps b/source/expectations/matchers/ut_matcher_base.tps
@@ -2,4 +2,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_base.tpb b/source/expectations/ut_expectation_base.tpb
@@ -41,4 +41,4 @@ create or replace type body ut_expectation_base as
     ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) );
   end;
 end;
-/  
+/  
diff --git a/source/expectations/ut_expectation_base.tps b/source/expectations/ut_expectation_base.tps
@@ -21,5 +21,5 @@ create or replace type ut_expectation_base force authid current_user as object(
   --base matcher executors
   member procedure to_(self in ut_expectation_base, a_matcher ut_matcher_base),
   member procedure not_to(self in ut_expectation_base, a_matcher ut_matcher_base)
-) not final
-/
+) not final not instantiable
+/

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ create or replace type ut_matcher_base force authid current_user as object(`
`2`	`2`	`self_type varchar2(250)`
`3`	`3`	`)`
`4`	`4`	`not final not instantiable`
`5`		`-/`
	`5`	`+/`
-Original file line number
+Diff line change
     ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) );
   end;
 end;
 -/
 +/