Skip to content
This repository was archived by the owner on Apr 3, 2024. It is now read-only.

Commit adcf3ae

Browse files
matthewloringmatthewloring
authored
Avoid repeated indexOf checks in tests (#273)
PR-URL: #273
1 parent 53562cc commit adcf3ae

File tree

1 file changed

+23
-33
lines changed

1 file changed

+23
-33
lines changed

‎test/test-v8debugapi.js‎

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,8 @@ describe('v8debugapi', function() {
261261
assert.ok(bp.status);
262262
assert.ok(bp.status instanceof StatusMessage);
263263
assert.ok(bp.status.isError);
264-
assert(bp.status.description.format.indexOf(
265-
api.messages.INVALID_LINE_NUMBER) !== -1);
266-
assert(bp.status.description.format.indexOf(
267-
'foo.js:500') !== -1);
264+
assert(bp.status.description.format.match(
265+
`${api.messages.INVALID_LINE_NUMBER}.*foo.js:500`));
268266
done();
269267
});
270268
});
@@ -547,17 +545,15 @@ describe('v8debugapi', function() {
547545
assert.equal(topFrame.arguments.length, 1);
548546
var argsVal = bp.variableTable[topFrame.arguments[0].varTableIndex];
549547
assert(argsVal.status.isError);
550-
assert(argsVal.status.description.format.indexOf(
551-
'Locals and arguments are only displayed') !== -1);
552-
assert(argsVal.status.description.format.indexOf(
553-
'config.capture.maxExpandFrames=0') !== -1);
548+
assert(argsVal.status.description.format.match(
549+
'Locals and arguments are only displayed.*config.capture.maxExpandFrames=0'
550+
));
554551
assert.equal(topFrame.locals.length, 1);
555552
var localsVal = bp.variableTable[topFrame.locals[0].varTableIndex];
556553
assert(localsVal.status.isError);
557-
assert(localsVal.status.description.format.indexOf(
558-
'Locals and arguments are only displayed') !== -1);
559-
assert(localsVal.status.description.format.indexOf(
560-
'config.capture.maxExpandFrames=0') !== -1);
554+
assert(localsVal.status.description.format.match(
555+
'Locals and arguments are only displayed.*config.capture.maxExpandFrames=0'
556+
));
561557
api.clear(bp);
562558
config.capture.maxExpandFrames = oldCount;
563559
done();
@@ -622,7 +618,7 @@ describe('v8debugapi', function() {
622618
var processVal = bp.variableTable[watch.varTableIndex];
623619
assert.ok(processVal);
624620
assert.ok(processVal.members.some(function(m) {
625-
return m.name === 'nextTick' && m.value.indexOf('function') === 0;
621+
return m.name === 'nextTick' && m.value.match('function.*');
626622
}));
627623
assert.ok(processVal.members.some(function(m) {
628624
return m.name === 'versions' && m.varTableIndex;
@@ -730,11 +726,8 @@ describe('v8debugapi', function() {
730726
assert(stringItems.length === 1);
731727

732728
var item = stringItems[0];
733-
assert(item.status.description.format.indexOf('Only first') !== -1);
734-
assert(item.status.description.format.indexOf(
735-
'config.capture.maxStringLength=3') !== -1);
736-
assert(item.status.description.format.indexOf('of length 11.') !== -1);
737-
729+
assert(item.status.description.format.match(
730+
'Only first.*config.capture.maxStringLength=3.*of length 11.'));
738731
api.clear(bp);
739732
config.capture.maxDataSize = oldMaxData;
740733
config.capture.maxStringLength = oldMaxLength;
@@ -761,9 +754,8 @@ describe('v8debugapi', function() {
761754
var aVal = bp.variableTable[aResults[0].varTableIndex];
762755
// should have 1 element + truncation message.
763756
assert.equal(aVal.members.length, 2);
764-
assert(aVal.members[1].name.indexOf('Only first') !== -1);
765-
assert(aVal.members[1].name.indexOf(
766-
'config.capture.maxProperties=1') !== -1);
757+
assert(aVal.members[1].name.match(
758+
'Only first.*config.capture.maxProperties=1'));
767759

768760
api.clear(bp);
769761
config.capture.maxProperties = oldMax;
@@ -790,9 +782,8 @@ describe('v8debugapi', function() {
790782
var bVal = bp.variableTable[bResults[0].varTableIndex];
791783
// should have 1 element + truncation message
792784
assert.equal(bVal.members.length, 2);
793-
assert(bVal.members[1].name.indexOf('Only first') !== -1);
794-
assert(bVal.members[1].name.indexOf(
795-
'config.capture.maxProperties=1') !== -1);
785+
assert(bVal.members[1].name.match(
786+
'Only first.*config.capture.maxProperties=1'));
796787

797788
api.clear(bp);
798789
config.capture.maxProperties = oldMax;
@@ -911,8 +902,8 @@ describe('v8debugapi', function() {
911902
assert.ifError(err);
912903
var foo = bp.evaluatedExpressions[0];
913904
var fooVal = bp.variableTable[foo.varTableIndex];
914-
assert(fooVal.status.description.format.indexOf(
915-
'Max data size reached') !== -1);
905+
assert(fooVal.status.description.format.match(
906+
'Max data size reached'));
916907
assert(fooVal.status.isError);
917908

918909
api.clear(bp);
@@ -941,8 +932,8 @@ describe('v8debugapi', function() {
941932
assert.ifError(err);
942933
var foo = bp.evaluatedExpressions[0];
943934
var fooVal = bp.variableTable[foo.varTableIndex];
944-
assert(fooVal.status.description.format.indexOf(
945-
'Max data size reached') !== -1);
935+
assert(fooVal.status.description.format.match(
936+
'Max data size reached'));
946937
assert(fooVal.status.isError);
947938

948939
api.clear(bp);
@@ -978,8 +969,8 @@ describe('v8debugapi', function() {
978969

979970
var bArray = bResults[0];
980971
assert(bArray);
981-
assert(bArray.status.description.format.indexOf(
982-
'Max data size reached') !== -1);
972+
assert(bArray.status.description.format.match(
973+
'Max data size reached'));
983974
assert(bArray.status.isError);
984975

985976
api.clear(bp);
@@ -1166,9 +1157,8 @@ describe('v8debugapi', function() {
11661157
assert.equal(expr.status.description.format,
11671158
'Error Compiling Expression');
11681159
} else {
1169-
assert.notEqual(
1170-
expr.status.description.format.indexOf('Unexpected token'),
1171-
-1);
1160+
assert(
1161+
expr.status.description.format.match('Unexpected token'));
11721162
}
11731163
}
11741164

0 commit comments

Comments
 (0)