BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382875 )

Change subject: Hygiene: simplify assert.closeTo and assert.contains
......................................................................

Hygiene: simplify assert.closeTo and assert.contains

This is to make failure output a bit nicer and more useful
when assertions fail by showing the actual result.

Change-Id: I64bb8e6839f343e8718234a542b5fc74a0718114
---
M test/utils/assert.js
1 file changed, 4 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/75/382875/1

diff --git a/test/utils/assert.js b/test/utils/assert.js
index ec10cee..fcdd736 100644
--- a/test/utils/assert.js
+++ b/test/utils/assert.js
@@ -115,24 +115,14 @@
  * @param {?string} message
 */
 function closeTo(result, expected, delta, message) {
-    try {
-        assert.ok(_.isNumber(result) && Math.abs(result - expected) <= delta, 
message);
-    } catch (e) {
-        console.log(`Result is ${result}; expected ${expected} ± ${delta}`);
-        throw e;
-    }
+    assert.ok(_.isNumber(result) && Math.abs(result - expected) <= delta,
+        message || `Result is ${result}; expected ${expected} ± ${delta}`);
 }
 
 
 function contains(result, sub, message) {
-    try {
-        assert.ok(result.indexOf(sub) > -1, message);
-    } catch (e) {
-        console.log(`Substring:\n${sub}`);
-        console.log(`Not in result:\n${result}`);
-        throw e;
-    }
-
+    assert.ok(result.indexOf(sub) > -1,
+        message || `'${sub}' not in:\n${result}`);
 }
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/382875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64bb8e6839f343e8718234a542b5fc74a0718114
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to