From 3ea3c089cbdc5338b15b542e3fdd73a774c6d31b Mon Sep 17 00:00:00 2001
From: Rob Adelmann <adelmann@adobe.com>
Date: Sun, 8 Oct 2017 09:26:48 -0700
Subject: [PATCH] async_hooks: replace concat w template literals

updated test/async-hooks/init-hooks.js

PR-URL: https://github.com/nodejs/node/pull/15968
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/async-hooks/init-hooks.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/test/async-hooks/init-hooks.js b/test/async-hooks/init-hooks.js
index a5f835cdff3aaa..e43761df623dc4 100644
--- a/test/async-hooks/init-hooks.js
+++ b/test/async-hooks/init-hooks.js
@@ -65,28 +65,31 @@ class ActivityCollector {
     }
 
     const violations = [];
+    let tempActivityString;
+
     function v(msg) { violations.push(msg); }
     for (const a of this._activities.values()) {
+      tempActivityString = activityString(a);
       if (types != null && !types.includes(a.type)) continue;
 
       if (a.init && a.init.length > 1) {
-        v('Activity inited twice\n' + activityString(a) +
+        v(`Activity inited twice\n${tempActivityString}` +
           '\nExpected "init" to be called at most once');
       }
       if (a.destroy && a.destroy.length > 1) {
-        v('Activity destroyed twice\n' + activityString(a) +
+        v(`Activity destroyed twice\n${tempActivityString}` +
           '\nExpected "destroy" to be called at most once');
       }
       if (a.before && a.after) {
         if (a.before.length < a.after.length) {
           v('Activity called "after" without calling "before"\n' +
-            activityString(a) +
+            `${tempActivityString}` +
             '\nExpected no "after" call without a "before"');
         }
         if (a.before.some((x, idx) => x > a.after[idx])) {
           v('Activity had an instance where "after" ' +
             'was invoked before "before"\n' +
-            activityString(a) +
+            `${tempActivityString}` +
             '\nExpected "after" to be called after "before"');
         }
       }
@@ -94,7 +97,7 @@ class ActivityCollector {
         if (a.before.some((x, idx) => x > a.destroy[idx])) {
           v('Activity had an instance where "destroy" ' +
             'was invoked before "before"\n' +
-            activityString(a) +
+            `${tempActivityString}` +
             '\nExpected "destroy" to be called after "before"');
         }
       }
@@ -102,12 +105,12 @@ class ActivityCollector {
         if (a.after.some((x, idx) => x > a.destroy[idx])) {
           v('Activity had an instance where "destroy" ' +
             'was invoked before "after"\n' +
-            activityString(a) +
+            `${tempActivityString}` +
             '\nExpected "destroy" to be called after "after"');
         }
       }
       if (!a.handleIsObject) {
-        v('No resource object\n' + activityString(a) +
+        v(`No resource object\n${tempActivityString}` +
           '\nExpected "init" to be called with a resource object');
       }
     }
@@ -125,7 +128,7 @@ class ActivityCollector {
       Array.from(this._activities.values()) :
       this.activitiesOfTypes(types);
 
-    if (stage != null) console.log('\n%s', stage);
+    if (stage != null) console.log(`\n${stage}`);
     console.log(util.inspect(activities, false, depth, true));
   }
 
@@ -206,7 +209,7 @@ class ActivityCollector {
   _maybeLog(uid, type, name) {
     if (this._logid &&
       (type == null || this._logtype == null || this._logtype === type)) {
-      print(this._logid + '.' + name + '.uid-' + uid);
+      print(`${this._logid}.${name}.uid-${uid}`);
     }
   }
 }