Improving code coverage.

jgebal · jgebal · commit 4e0c70367f91 · 2022-01-31T23:30:37.000+02:00
diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb
@@ -718,44 +718,44 @@ create or replace type body ut_expectation as
     return l_result;
   end;  
   
- member function to_be_within_pct(a_dist natural) return ut_be_within_pct is
-   l_result ut_be_within_pct;
- begin
-   l_result := ut_be_within_pct(a_dist);
-   l_result.expectation := self;
-   return  l_result;
+  member function to_be_within_pct(a_dist natural) return ut_be_within_pct is
+    l_result ut_be_within_pct;
+  begin
+    l_result := ut_be_within_pct(a_dist);
+    l_result.expectation := self;
+    return l_result;
   end;  
   
   member function not_to_be_within(a_dist natural) return ut_be_within is
-    l_result ut_matcher;
+    l_result ut_be_within;
   begin
-    l_result := ut_be_within(a_dist).negated();
+    l_result := treat( ut_be_within(a_dist).negated() as ut_be_within);
     l_result.expectation := self;
-    return  treat(l_result as ut_be_within);
+    return l_result;
   end;
 
   member function not_to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is
-    l_result ut_matcher;
+    l_result ut_be_within;
   begin
-    l_result := ut_be_within(a_dist).negated();
+    l_result := treat( ut_be_within(a_dist).negated() as ut_be_within);
     l_result.expectation := self;
-    return treat(l_result as ut_be_within);
+    return l_result;
   end;
 
   member function not_to_be_within(a_dist yminterval_unconstrained) return ut_be_within is
-    l_result ut_matcher;
+    l_result ut_be_within;
   begin
-    l_result := ut_be_within(a_dist).negated();
+    l_result := treat( ut_be_within(a_dist).negated() as ut_be_within);
     l_result.expectation := self;
-    return treat(l_result as ut_be_within);
+    return l_result;
   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);
+  member function not_to_be_within_pct(a_dist natural) return ut_be_within_pct is
+    l_result ut_be_within;
+  begin
+    l_result := treat( ut_be_within_pct(a_dist).negated() as ut_be_within);
+    l_result.expectation := self;
+    return l_result;
   end;
 
 end;
diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb
@@ -336,7 +336,7 @@ create or replace package body test_expectations_cursor is
     open l_expected for select 1 as col_1, 2 as col_2 from dual;
     open l_actual   for select 2 as col_2, 1 as col_1 from dual;
     --Act
-    ut3_develop.ut.expect( l_actual ).to_equal( l_expected ).unordered_columns;
+    ut3_develop.ut.expect( l_actual ).to_( ut3_develop.equal( l_expected ).unordered_columns() );
     --Assert
     ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
   end;
@@ -350,7 +350,7 @@ create or replace package body test_expectations_cursor is
     open l_expected for select 1 as col_1, 2 as col_2 from dual;
     open l_actual   for select 2 as col_2, 1 as col_1 from dual;
     --Act
-    ut3_develop.ut.expect( l_actual ).to_equal( l_expected ).uc;
+    ut3_develop.ut.expect( l_actual ).to_( ut3_develop.equal( l_expected ).uc() );
     --Assert
     ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
   end;
@@ -592,7 +592,7 @@ create or replace package body test_expectations_cursor is
     open l_actual   for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual connect by level < 4;
     open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual connect by level < 4;
     --Act
-    ut3_develop.ut.expect(l_actual).to_equal(l_expected).include('/ROW/RN|//A_Column|//SOME_COL');
+    ut3_develop.ut.expect(l_actual).to_( ut3_develop.equal(l_expected).include('/ROW/RN|//A_Column|//SOME_COL') );
     --Assert
     ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
   end;
diff --git a/test/ut3_user/expectations/test_expectations_json.pkb b/test/ut3_user/expectations/test_expectations_json.pkb
@@ -49,7 +49,7 @@ create or replace package body test_expectations_json is
     }');
 
     --Act
-    ut3_develop.ut.expect( l_actual ).to_equal( l_actual );
+    ut3_develop.ut.expect( l_actual ).to_( ut3_develop.equal( l_actual ) );
     --Assert
     ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
   end;
