From 3927c6f64e541d5c93541b76bb06f772156ab86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Thu, 28 Dec 2017 19:47:09 +0100
Subject: [PATCH] test: improve readability of some crypto tests

PR-URL: https://github.com/nodejs/node/pull/17904
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
---
 test/parallel/test-crypto-authenticated.js  |  4 +--
 test/parallel/test-crypto-binary-default.js | 39 ++++++++++-----------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/test/parallel/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js
index df6b4316390594..4f7a1ad3fd5d93 100644
--- a/test/parallel/test-crypto-authenticated.js
+++ b/test/parallel/test-crypto-authenticated.js
@@ -343,9 +343,7 @@ common.expectWarning('Warning', (common.hasFipsCrypto ? [] : [
             'deprecated. Valid GCM tag lengths are 4, 8, 12, 13, 14, 15, 16.')
 ));
 
-for (const i in TEST_CASES) {
-  const test = TEST_CASES[i];
-
+for (const test of TEST_CASES) {
   if (!ciphers.includes(test.algo)) {
     common.printSkipMessage(`unsupported ${test.algo} test`);
     continue;
diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js
index f9b2d80823a220..75820a97634576 100644
--- a/test/parallel/test-crypto-binary-default.js
+++ b/test/parallel/test-crypto-binary-default.js
@@ -216,18 +216,17 @@ const rfc4231 = [
   }
 ];
 
-for (let i = 0, l = rfc4231.length; i < l; i++) {
-  for (const hash in rfc4231[i]['hmac']) {
-    let result = crypto.createHmac(hash, rfc4231[i]['key'])
-                     .update(rfc4231[i]['data'])
+for (const testCase of rfc4231) {
+  for (const hash in testCase.hmac) {
+    let result = crypto.createHmac(hash, testCase.key)
+                     .update(testCase.data)
                      .digest('hex');
-    if (rfc4231[i]['truncate']) {
+    if (testCase.truncate) {
       result = result.substr(0, 32); // first 128 bits == 32 hex chars
     }
     assert.strictEqual(
-      rfc4231[i]['hmac'][hash],
-      result,
-      `Test HMAC-${hash}: Test case ${i + 1} rfc 4231`
+      testCase.hmac[hash],
+      result
     );
   }
 }
@@ -341,24 +340,22 @@ const rfc2202_sha1 = [
   }
 ];
 
-for (let i = 0, l = rfc2202_md5.length; i < l; i++) {
-  if (!common.hasFipsCrypto) {
+if (!common.hasFipsCrypto) {
+  for (const testCase of rfc2202_md5) {
     assert.strictEqual(
-      rfc2202_md5[i]['hmac'],
-      crypto.createHmac('md5', rfc2202_md5[i]['key'])
-        .update(rfc2202_md5[i]['data'])
-        .digest('hex'),
-      `Test HMAC-MD5 : Test case ${i + 1} rfc 2202`
+      testCase.hmac,
+      crypto.createHmac('md5', testCase.key)
+        .update(testCase.data)
+        .digest('hex')
     );
   }
 }
-for (let i = 0, l = rfc2202_sha1.length; i < l; i++) {
+for (const testCase of rfc2202_sha1) {
   assert.strictEqual(
-    rfc2202_sha1[i]['hmac'],
-    crypto.createHmac('sha1', rfc2202_sha1[i]['key'])
-      .update(rfc2202_sha1[i]['data'])
-      .digest('hex'),
-    `Test HMAC-SHA1 : Test case ${i + 1} rfc 2202`
+    testCase.hmac,
+    crypto.createHmac('sha1', testCase.key)
+      .update(testCase.data)
+      .digest('hex')
   );
 }