test: refactored context type err message to regex

Muhsin Abdul-Musawwir · MylesBorins · commit 8044b8307c4c · 2017-05-17T21:32:20.000-04:00
PR-URL: #12596 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/test/parallel/test-vm-context.js b/test/parallel/test-vm-context.js
@@ -25,7 +25,7 @@ assert.strictEqual('lala', context.thing);
 // Issue GH-227:
 assert.throws(function(){
 vm.runInNewContext('', null, 'some.js');
-}, TypeError);
+}, /^TypeError: sandbox must be an object$/);
 
 // Issue GH-1140:
 console.error('test runInContext signature');
@@ -41,9 +41,18 @@ assert.ok(gh1140Exception,
 'expected exception from runInContext signature test');
 
 // GH-558, non-context argument segfaults / raises assertion
-[undefined, null, 0, 0.0, '',{}, []].forEach(function(e){
- assert.throws(function(){script.runInContext(e)}, TypeError);
- assert.throws(function(){vm.runInContext('', e)}, TypeError);
+const nonContextualSandboxErrorMsg =
+ /^TypeError: contextifiedSandbox argument must be an object\.$/;
+const contextifiedSandboxErrorMsg =
+ /^TypeError: sandbox argument must have been converted to a context\.$/;
+[
+ [undefined, nonContextualSandboxErrorMsg],
+ [null, nonContextualSandboxErrorMsg], [0, nonContextualSandboxErrorMsg],
+ [0.0, nonContextualSandboxErrorMsg], ['', nonContextualSandboxErrorMsg],
+ [{}, contextifiedSandboxErrorMsg], [[], contextifiedSandboxErrorMsg]
+].forEach((e) =>{
+ assert.throws(() =>{script.runInContext(e[0])}, e[1]);
+ assert.throws(() =>{vm.runInContext('', e[0])}, e[1]);
 });
 
 // Issue GH-693:

-Original file line number
+Diff line change
 // Issue GH-227:
 assert.throws(function(){
 vm.runInNewContext('',null,'some.js');
 -},TypeError);
 +},/^TypeError:sandboxmustbeanobject$/);
 // Issue GH-1140:
 console.error('test runInContext signature');
 'expected exception from runInContext signature test');
 // GH-558, non-context argument segfaults / raises assertion
 -[undefined,null,0,0.0,'',{},[]].forEach(function(e){
 -assert.throws(function(){script.runInContext(e);},TypeError);
 -assert.throws(function(){vm.runInContext('',e);},TypeError);
 +constnonContextualSandboxErrorMsg=
 +/^TypeError:contextifiedSandboxargumentmustbeanobject\.$/;
 +constcontextifiedSandboxErrorMsg=
 +/^TypeError:sandboxargumentmusthavebeenconvertedtoacontext\.$/;
 +[
 +[undefined,nonContextualSandboxErrorMsg],
 +[null,nonContextualSandboxErrorMsg],[0,nonContextualSandboxErrorMsg],
 +[0.0,nonContextualSandboxErrorMsg],['',nonContextualSandboxErrorMsg],
 +[{},contextifiedSandboxErrorMsg],[[],contextifiedSandboxErrorMsg]
 +].forEach((e)=>{
 +assert.throws(()=>{script.runInContext(e[0]);},e[1]);
 +assert.throws(()=>{vm.runInContext('',e[0]);},e[1]);
 });
 // Issue GH-693: