1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

async_hooks: replace concat w template literals

Browse Source 
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>
This commit is contained in:
Rob Adelmann 2017-10-08 09:26:48 -07:00 committed by James M Snell
parent 0229e6746c
commit 3ea3c089cb
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/async-hooks/init-hooks.js
View File

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