Numerical improvements to matcher

diff --git a/test/mockContext.js b/test/mockContext.js
index 08d6101aa9e376bd4708f6b17bd51c02d9910a22..14cd1eec9adbb76bab41c6888f958e52ff9dff75 100644 (file)
--- a/test/mockContext.js
+++ b/test/mockContext.js
@@ -126,9 +126,15 @@
        function toBeCloseToPixel() {
                return {
                        compare: function(actual, expected) {
-                               var result = (!isNaN(actual) && !isNaN(expected))?
-                                       Math.abs(actual - expected) < 2 :       // 2 pixels tolerance
-                                       false;
+                               var result = false;
+
+                               if (!isNaN(actual) && !isNaN(expected)) {
+                                       var diff = Math.abs(actual - expected);
+                                       var A = Math.abs(actual);
+                                       var B = Math.abs(expected);
+                                       var percentDiff = 0.005; // 0.5% diff
+                                       result = (diff <= (A > B ? A : B) * percentDiff) || diff < 2; // 2 pixels is fine
+                               }
 
                                return { pass: result };
                        }
@@ -137,7 +143,7 @@
 
        window.addDefaultMatchers = function(jasmine) {
                jasmine.addMatchers({
-                       toBeCloseToPixel: toBeCloseToPixel
+                       toBeCloseToPixel: toBeCloseToPixel,
                });
        }