Merge branch 'develop' into feature/md5_on_release

Pazus · web-flow · commit 7cf7725ca8f3 · 2017-06-14T20:46:08.000+03:00
diff --git a/source/expectations/matchers/ut_be_greater_or_equal.tps b/source/expectations/matchers/ut_be_greater_or_equal.tps
@@ -1,4 +1,4 @@
-create or replace type ut_be_greater_or_equal under ut_matcher(
+create or replace type ut_be_greater_or_equal under ut_comparison_matcher(
   /*
   utPLSQL - Version X.X.X.X
   Copyright 2016 - 2017 utPLSQL Project
@@ -15,7 +15,6 @@ create or replace type ut_be_greater_or_equal under ut_matcher(
   See the License for the specific language governing permissions and
   limitations under the License.
   */
-  expected        ut_data_value,
   member procedure init(self in out nocopy ut_be_greater_or_equal, a_expected ut_data_value),
   constructor function ut_be_greater_or_equal(self in out nocopy ut_be_greater_or_equal, a_expected date) return self as result,
   constructor function ut_be_greater_or_equal(self in out nocopy ut_be_greater_or_equal, a_expected number) return self as result,
diff --git a/source/expectations/matchers/ut_be_greater_than.tps b/source/expectations/matchers/ut_be_greater_than.tps
@@ -1,4 +1,4 @@
-create or replace type ut_be_greater_than under ut_matcher(
+create or replace type ut_be_greater_than under ut_comparison_matcher(
   /*
   utPLSQL - Version X.X.X.X
   Copyright 2016 - 2017 utPLSQL Project
@@ -15,7 +15,6 @@ create or replace type ut_be_greater_than under ut_matcher(
   See the License for the specific language governing permissions and
   limitations under the License.
   */
-  expected        ut_data_value,
   member procedure init(self in out nocopy ut_be_greater_than, a_expected ut_data_value),
   constructor function ut_be_greater_than(self in out nocopy ut_be_greater_than, a_expected date) return self as result,
   constructor function ut_be_greater_than(self in out nocopy ut_be_greater_than, a_expected number) return self as result,
diff --git a/source/expectations/matchers/ut_be_less_or_equal.tps b/source/expectations/matchers/ut_be_less_or_equal.tps
@@ -1,4 +1,4 @@
-create or replace type ut_be_less_or_equal under ut_matcher(
+create or replace type ut_be_less_or_equal under ut_comparison_matcher(
   /*
   utPLSQL - Version X.X.X.X
   Copyright 2016 - 2017 utPLSQL Project
@@ -15,7 +15,6 @@ create or replace type ut_be_less_or_equal under ut_matcher(
   See the License for the specific language governing permissions and
   limitations under the License.
   */
-  expected        ut_data_value,
   member procedure init(self in out nocopy ut_be_less_or_equal, a_expected ut_data_value),
   constructor function ut_be_less_or_equal(self in out nocopy ut_be_less_or_equal, a_expected date) return self as result,
   constructor function ut_be_less_or_equal(self in out nocopy ut_be_less_or_equal, a_expected number) return self as result,
diff --git a/source/expectations/matchers/ut_be_less_than.tps b/source/expectations/matchers/ut_be_less_than.tps
@@ -1,4 +1,4 @@
-create or replace type ut_be_less_than under ut_matcher(
+create or replace type ut_be_less_than under ut_comparison_matcher(
   /*
   utPLSQL - Version X.X.X.X
   Copyright 2016 - 2017 utPLSQL Project
@@ -15,7 +15,6 @@ create or replace type ut_be_less_than under ut_matcher(
   See the License for the specific language governing permissions and
   limitations under the License.
   */
-  expected        ut_data_value,
   member procedure init(self in out nocopy ut_be_less_than, a_expected ut_data_value),
   constructor function ut_be_less_than(self in out nocopy ut_be_less_than, a_expected date) return self as result,
   constructor function ut_be_less_than(self in out nocopy ut_be_less_than, a_expected number) return self as result,
diff --git a/source/expectations/matchers/ut_comparison_matcher.tpb b/source/expectations/matchers/ut_comparison_matcher.tpb
@@ -0,0 +1,29 @@
+create or replace type body ut_comparison_matcher as
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 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.
+  */
+
+  overriding member function error_message(a_actual ut_data_value) return varchar2 is
+    l_result varchar2(32767);
+  begin
+    if ut_utils.int_to_boolean(self.is_errored) then
+      l_result := 'Actual ('||a_actual.data_type||') cannot be compared to Expected ('||expected.data_type||') using matcher '''||self.name()||'''.';
+    end if;
+    return l_result;
+  end;
+
+end;
+/
diff --git a/source/expectations/matchers/ut_comparison_matcher.tps b/source/expectations/matchers/ut_comparison_matcher.tps
@@ -0,0 +1,22 @@
+create or replace type ut_comparison_matcher under ut_matcher(
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 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.
+  */
+
+  expected             ut_data_value,
+  overriding member function error_message(a_actual ut_data_value) return varchar2
+) not final not instantiable
+/
diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps
@@ -1,4 +1,4 @@
-create or replace type ut_equal under ut_matcher(
+create or replace type ut_equal under ut_comparison_matcher(
   /*
   utPLSQL - Version X.X.X.X
   Copyright 2016 - 2017 utPLSQL Project
@@ -15,7 +15,6 @@ create or replace type ut_equal under ut_matcher(
   See the License for the specific language governing permissions and
   limitations under the License.
   */
-  expected             ut_data_value,
   nulls_are_equal_flag number(1,0),
   member procedure init(self in out nocopy ut_equal, a_expected ut_data_value, a_nulls_are_equal boolean),
   member function equal_with_nulls( self in ut_equal, a_assert_result boolean, a_actual ut_data_value) return boolean,
diff --git a/source/install.sql b/source/install.sql
@@ -139,6 +139,7 @@ whenever sqlerror exit failure rollback
 @@expectations/data_values/ut_data_value_varchar2.tps
 @@expectations/data_values/ut_data_value_yminterval.tps
 @@expectations/matchers/ut_matcher.tps
+@@expectations/matchers/ut_comparison_matcher.tps
 @@expectations/matchers/ut_be_false.tps
 @@expectations/matchers/ut_be_greater_or_equal.tps
 @@expectations/matchers/ut_be_greater_than.tps
@@ -183,6 +184,7 @@ whenever sqlerror exit failure rollback
 @@expectations/data_values/ut_data_value_varchar2.tpb
 @@expectations/data_values/ut_data_value_yminterval.tpb
 @@expectations/matchers/ut_matcher.tpb
+@@expectations/matchers/ut_comparison_matcher.tpb
 @@expectations/matchers/ut_be_false.tpb
 @@expectations/matchers/ut_be_greater_or_equal.tpb
 @@expectations/matchers/ut_be_greater_than.tpb
diff --git a/source/uninstall.sql b/source/uninstall.sql
@@ -133,6 +133,8 @@ drop type ut_be_less_than;
 
 drop type ut_be_false;
 
+drop type ut_comparison_matcher;
+
 drop type ut_matcher;
 
 drop type ut_data_value_yminterval;
diff --git a/tests/RunAll.sql b/tests/RunAll.sql
@@ -463,6 +463,8 @@ begin
     'source/expectations/matchers/ut_match.tps',
     'source/expectations/matchers/ut_matcher.tpb',
     'source/expectations/matchers/ut_matcher.tps',
+    'source/expectations/matchers/ut_comparison_matcher.tpb',
+    'source/expectations/matchers/ut_comparison_matcher.tps',
     'source/reporters/ut_ansiconsole_helper.pkb',
     'source/reporters/ut_ansiconsole_helper.pks',
     'source/reporters/ut_coverage_html_reporter.tpb',
diff --git a/tests/ut_expectations/common/ut.expect.to_equal.different_scalars.common.sql b/tests/ut_expectations/common/ut.expect.to_equal.different_scalars.common.sql
@@ -3,12 +3,15 @@ declare
   l_actual   &&1 := &&3;
   l_expected &&2 := &&4;
   l_result   integer;
+  l_message  varchar2(32767);
 begin
 --Act
   ut.expect(l_actual).&&5.to_equal(l_expected);
   l_result :=  ut_expectation_processor.get_status();
+  l_message := ut_expectation_processor.get_expectations_results()(1).get_result_clob;
 --Assert
-  if nvl(:test_result, ut_utils.tr_success) = ut_utils.tr_success and l_result = ut_utils.tr_failure then
+  if nvl(:test_result, ut_utils.tr_success) = ut_utils.tr_success and l_result = ut_utils.tr_failure
+    and l_message like 'Actual (%) cannot be compared to Expected (%) using matcher%' then
     :test_result := ut_utils.tr_success;
   else
     dbms_output.put_line('expected: '''||ut_utils.tr_failure||''', got: '''||l_result||'''' );
