From 1766db0f07098a4fc19271b00dda2cebab2c6f16 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 29 Jul 2017 09:04:00 -0700
Subject: [PATCH] test: refactor test-vm-new-script-new-context

* block scope test cases
* clean up global leaks in individual test cases
* enable global variable leak checking
* remove console.error() statements
---
 .../test-vm-new-script-new-context.js         | 123 ++++++++++--------
 1 file changed, 70 insertions(+), 53 deletions(-)

diff --git a/test/parallel/test-vm-new-script-new-context.js b/test/parallel/test-vm-new-script-new-context.js
index a345c3e54d661b..045c37ce335199 100644
--- a/test/parallel/test-vm-new-script-new-context.js
+++ b/test/parallel/test-vm-new-script-new-context.js
@@ -20,71 +20,88 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-const common = require('../common');
+require('../common');
+
 const assert = require('assert');
+
 const Script = require('vm').Script;
 
-common.globalCheck = false;
+{
+  const script = new Script('\'passed\';');
+  const result1 = script.runInNewContext();
+  const result2 = script.runInNewContext();
+  assert.strictEqual('passed', result1);
+  assert.strictEqual('passed', result2);
+}
 
-console.error('run a string');
-let script = new Script('\'passed\';');
-console.error('script created');
-const result1 = script.runInNewContext();
-const result2 = script.runInNewContext();
-assert.strictEqual('passed', result1);
-assert.strictEqual('passed', result2);
+{
+  const script = new Script('throw new Error(\'test\');');
+  assert.throws(function() {
+    script.runInNewContext();
+  }, /^Error: test$/);
+}
 
-console.error('thrown error');
-script = new Script('throw new Error(\'test\');');
-assert.throws(function() {
-  script.runInNewContext();
-}, /^Error: test$/);
+{
+  const script = new Script('foo.bar = 5;');
+  assert.throws(function() {
+    script.runInNewContext();
+  }, /^ReferenceError: foo is not defined$/);
+}
 
-
-console.error('undefined reference');
-script = new Script('foo.bar = 5;');
-assert.throws(function() {
+{
+  global.hello = 5;
+  const script = new Script('hello = 2');
   script.runInNewContext();
-}, /^ReferenceError: foo is not defined$/);
+  assert.strictEqual(5, global.hello);
 
+  // cleanup
+  delete global.hello;
+}
 
-global.hello = 5;
-script = new Script('hello = 2');
-script.runInNewContext();
-assert.strictEqual(5, global.hello);
+{
+  global.code = 'foo = 1;' +
+                'bar = 2;' +
+                'if (baz !== 3) throw new Error(\'test fail\');';
+  global.foo = 2;
+  global.obj = { foo: 0, baz: 3 };
+  const script = new Script(global.code);
+  /* eslint-disable no-unused-vars */
+  const baz = script.runInNewContext(global.obj);
+  /* eslint-enable no-unused-vars */
+  assert.strictEqual(1, global.obj.foo);
+  assert.strictEqual(2, global.obj.bar);
+  assert.strictEqual(2, global.foo);
 
+  //cleanup
+  delete global.code;
+  delete global.foo;
+  delete global.obj;
+}
 
-console.error('pass values in and out');
-global.code = 'foo = 1;' +
-              'bar = 2;' +
-              'if (baz !== 3) throw new Error(\'test fail\');';
-global.foo = 2;
-global.obj = { foo: 0, baz: 3 };
-script = new Script(global.code);
-/* eslint-disable no-unused-vars */
-const baz = script.runInNewContext(global.obj);
-/* eslint-enable no-unused-vars */
-assert.strictEqual(1, global.obj.foo);
-assert.strictEqual(2, global.obj.bar);
-assert.strictEqual(2, global.foo);
+{
+  const script = new Script('f()');
+  function changeFoo() { global.foo = 100; }
+  script.runInNewContext({ f: changeFoo });
+  assert.strictEqual(global.foo, 100);
 
-console.error('call a function by reference');
-script = new Script('f()');
-function changeFoo() { global.foo = 100; }
-script.runInNewContext({ f: changeFoo });
-assert.strictEqual(global.foo, 100);
+  // cleanup
+  delete global.foo;
+}
 
-console.error('modify an object by reference');
-script = new Script('f.a = 2');
-const f = { a: 1 };
-script.runInNewContext({ f: f });
-assert.strictEqual(f.a, 2);
+{
+  const script = new Script('f.a = 2');
+  const f = { a: 1 };
+  script.runInNewContext({ f: f });
+  assert.strictEqual(f.a, 2);
 
-assert.throws(function() {
-  script.runInNewContext();
-}, /^ReferenceError: f is not defined$/);
+  assert.throws(function() {
+    script.runInNewContext();
+  }, /^ReferenceError: f is not defined$/);
+}
 
-console.error('invalid this');
-assert.throws(function() {
-  script.runInNewContext.call('\'hello\';');
-}, /^TypeError: this\.runInContext is not a function$/);
+{
+  const script = new Script('');
+  assert.throws(function() {
+    script.runInNewContext.call('\'hello\';');
+  }, /^TypeError: this\.runInContext is not a function$/);
+}