test: minor fixes to test-module-loading.js

Use block scope for local variables only used in a small code block.
Fixed inverse arguments in some usages of Assert.strictEqual.

PR-URL: https://github.com/nodejs/node/pull/12728
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Walter Huang 2017-04-27 20:20:00 -04:00 committed by Rich Trott
parent c20e87a10e
commit 133fb0c3b7

View File

@ -35,59 +35,68 @@ assert.strictEqual(process.mainModule, module,
// assert that it's *not* the main module in the required module. // assert that it's *not* the main module in the required module.
require('../fixtures/not-main-module.js'); require('../fixtures/not-main-module.js');
{
// require a file with a request that includes the extension // require a file with a request that includes the extension
const a_js = require('../fixtures/a.js'); const a_js = require('../fixtures/a.js');
assert.strictEqual(42, a_js.number); assert.strictEqual(a_js.number, 42);
}
{
// require a file without any extensions // require a file without any extensions
const foo_no_ext = require('../fixtures/foo'); const foo_no_ext = require('../fixtures/foo');
assert.strictEqual('ok', foo_no_ext.foo); assert.strictEqual(foo_no_ext.foo, 'ok');
}
const a = require('../fixtures/a'); const a = require('../fixtures/a');
const c = require('../fixtures/b/c');
const d = require('../fixtures/b/d'); const d = require('../fixtures/b/d');
const d2 = require('../fixtures/b/d'); const d2 = require('../fixtures/b/d');
{
const c = require('../fixtures/b/c');
// Absolute // Absolute
const d3 = require(path.join(__dirname, '../fixtures/b/d')); const d3 = require(path.join(__dirname, '../fixtures/b/d'));
// Relative // Relative
const d4 = require('../fixtures/b/d'); const d4 = require('../fixtures/b/d');
assert.strictEqual(false, false, 'testing the test program.');
assert.ok(a.A instanceof Function); assert.ok(a.A instanceof Function);
assert.strictEqual('A', a.A()); assert.strictEqual(a.A(), 'A');
assert.ok(a.C instanceof Function); assert.ok(a.C instanceof Function);
assert.strictEqual('C', a.C()); assert.strictEqual(a.C(), 'C');
assert.ok(a.D instanceof Function); assert.ok(a.D instanceof Function);
assert.strictEqual('D', a.D()); assert.strictEqual(a.D(), 'D');
assert.ok(d.D instanceof Function); assert.ok(d.D instanceof Function);
assert.strictEqual('D', d.D()); assert.strictEqual(d.D(), 'D');
assert.ok(d2.D instanceof Function); assert.ok(d2.D instanceof Function);
assert.strictEqual('D', d2.D()); assert.strictEqual(d2.D(), 'D');
assert.ok(d3.D instanceof Function); assert.ok(d3.D instanceof Function);
assert.strictEqual('D', d3.D()); assert.strictEqual(d3.D(), 'D');
assert.ok(d4.D instanceof Function); assert.ok(d4.D instanceof Function);
assert.strictEqual('D', d4.D()); assert.strictEqual(d4.D(), 'D');
assert.ok((new a.SomeClass()) instanceof c.SomeClass); assert.ok((new a.SomeClass()) instanceof c.SomeClass);
}
{
console.error('test index.js modules ids and relative loading'); console.error('test index.js modules ids and relative loading');
const one = require('../fixtures/nested-index/one'); const one = require('../fixtures/nested-index/one');
const two = require('../fixtures/nested-index/two'); const two = require('../fixtures/nested-index/two');
assert.notStrictEqual(one.hello, two.hello); assert.notStrictEqual(one.hello, two.hello);
}
{
console.error('test index.js in a folder with a trailing slash'); console.error('test index.js in a folder with a trailing slash');
const three = require('../fixtures/nested-index/three'); const three = require('../fixtures/nested-index/three');
const threeFolder = require('../fixtures/nested-index/three/'); const threeFolder = require('../fixtures/nested-index/three/');
const threeIndex = require('../fixtures/nested-index/three/index.js'); const threeIndex = require('../fixtures/nested-index/three/index.js');
assert.strictEqual(threeFolder, threeIndex); assert.strictEqual(threeFolder, threeIndex);
assert.notStrictEqual(threeFolder, three); assert.notStrictEqual(threeFolder, three);
}
console.error('test package.json require() loading'); console.error('test package.json require() loading');
assert.throws( assert.throws(
@ -104,17 +113,20 @@ assert.strictEqual(require('../fixtures/packages/main').ok, 'ok',
assert.strictEqual(require('../fixtures/packages/main-index').ok, 'ok', assert.strictEqual(require('../fixtures/packages/main-index').ok, 'ok',
'Failed loading package with index.js in main subdir'); 'Failed loading package with index.js in main subdir');
{
console.error('test cycles containing a .. path'); console.error('test cycles containing a .. path');
const root = require('../fixtures/cycles/root'); const root = require('../fixtures/cycles/root');
const foo = require('../fixtures/cycles/folder/foo'); const foo = require('../fixtures/cycles/folder/foo');
assert.strictEqual(root.foo, foo); assert.strictEqual(root.foo, foo);
assert.strictEqual(root.sayHello(), root.hello); assert.strictEqual(root.sayHello(), root.hello);
}
console.error('test node_modules folders'); console.error('test node_modules folders');
// asserts are in the fixtures files themselves, // asserts are in the fixtures files themselves,
// since they depend on the folder structure. // since they depend on the folder structure.
require('../fixtures/node_modules/foo'); require('../fixtures/node_modules/foo');
{
console.error('test name clashes'); console.error('test name clashes');
// this one exists and should import the local module // this one exists and should import the local module
const my_path = require('../fixtures/path'); const my_path = require('../fixtures/path');
@ -122,13 +134,14 @@ assert.ok(my_path.path_func instanceof Function);
// this one does not exist and should throw // this one does not exist and should throw
assert.throws(function() { require('./utils'); }, assert.throws(function() { require('./utils'); },
/^Error: Cannot find module '\.\/utils'$/); /^Error: Cannot find module '\.\/utils'$/);
}
let errorThrown = false; let errorThrown = false;
try { try {
require('../fixtures/throws_error'); require('../fixtures/throws_error');
} catch (e) { } catch (e) {
errorThrown = true; errorThrown = true;
assert.strictEqual('blah', e.message); assert.strictEqual(e.message, 'blah');
} }
assert.strictEqual(require('path').dirname(__filename), __dirname); assert.strictEqual(require('path').dirname(__filename), __dirname);
@ -136,7 +149,7 @@ assert.strictEqual(require('path').dirname(__filename), __dirname);
console.error('load custom file types with extensions'); console.error('load custom file types with extensions');
require.extensions['.test'] = function(module, filename) { require.extensions['.test'] = function(module, filename) {
let content = fs.readFileSync(filename).toString(); let content = fs.readFileSync(filename).toString();
assert.strictEqual('this is custom source\n', content); assert.strictEqual(content, 'this is custom source\n');
content = content.replace('this is custom source', content = content.replace('this is custom source',
'exports.test = \'passed\''); 'exports.test = \'passed\'');
module._compile(content, filename); module._compile(content, filename);
@ -166,6 +179,7 @@ try {
assert.strictEqual(err.message, 'Cannot find module \'../fixtures/empty\''); assert.strictEqual(err.message, 'Cannot find module \'../fixtures/empty\'');
} }
{
// Check load order is as expected // Check load order is as expected
console.error('load order'); console.error('load order');
@ -191,17 +205,21 @@ try {
} catch (e) { } catch (e) {
assert.ok(e.message.replace(/\\/g, '/').match(/file7\/index\.node/)); assert.ok(e.message.replace(/\\/g, '/').match(/file7\/index\.node/));
} }
assert.strictEqual(require(loadOrder + 'file8').file8, 'file8/index.reg', msg); assert.strictEqual(require(loadOrder + 'file8').file8, 'file8/index.reg',
assert.strictEqual(require(loadOrder + 'file9').file9, 'file9/index.reg2', msg); msg);
assert.strictEqual(require(loadOrder + 'file9').file9, 'file9/index.reg2',
msg);
}
{
// make sure that module.require() is the same as // make sure that module.require() is the same as
// doing require() inside of that module. // doing require() inside of that module.
const parent = require('../fixtures/module-require/parent/'); const parent = require('../fixtures/module-require/parent/');
const child = require('../fixtures/module-require/child/'); const child = require('../fixtures/module-require/child/');
assert.strictEqual(child.loaded, parent.loaded); assert.strictEqual(child.loaded, parent.loaded);
}
{
// #1357 Loading JSON files with require() // #1357 Loading JSON files with require()
const json = require('../fixtures/packages/main/package.json'); const json = require('../fixtures/packages/main/package.json');
assert.deepStrictEqual(json, { assert.deepStrictEqual(json, {
@ -209,8 +227,10 @@ assert.deepStrictEqual(json, {
version: '1.2.3', version: '1.2.3',
main: 'package-main-module' main: 'package-main-module'
}); });
}
{
// now verify that module.children contains all the different // now verify that module.children contains all the different
// modules that we've required, and that all of them contain // modules that we've required, and that all of them contain
// the appropriate children, and so on. // the appropriate children, and so on.
@ -274,6 +294,7 @@ assert.deepStrictEqual(children, {
}, },
'fixtures/packages/main/package.json': {} 'fixtures/packages/main/package.json': {}
}); });
}
// require() must take string, and must be truthy // require() must take string, and must be truthy
@ -289,29 +310,29 @@ assert.throws(function() {
process.on('exit', function() { process.on('exit', function() {
assert.ok(a.A instanceof Function); assert.ok(a.A instanceof Function);
assert.strictEqual('A done', a.A()); assert.strictEqual(a.A(), 'A done');
assert.ok(a.C instanceof Function); assert.ok(a.C instanceof Function);
assert.strictEqual('C done', a.C()); assert.strictEqual(a.C(), 'C done');
assert.ok(a.D instanceof Function); assert.ok(a.D instanceof Function);
assert.strictEqual('D done', a.D()); assert.strictEqual(a.D(), 'D done');
assert.ok(d.D instanceof Function); assert.ok(d.D instanceof Function);
assert.strictEqual('D done', d.D()); assert.strictEqual(d.D(), 'D done');
assert.ok(d2.D instanceof Function); assert.ok(d2.D instanceof Function);
assert.strictEqual('D done', d2.D()); assert.strictEqual(d2.D(), 'D done');
assert.strictEqual(true, errorThrown); assert.strictEqual(errorThrown, true);
console.log('exit'); console.log('exit');
}); });
// #1440 Loading files with a byte order marker. // #1440 Loading files with a byte order marker.
assert.strictEqual(42, require('../fixtures/utf8-bom.js')); assert.strictEqual(require('../fixtures/utf8-bom.js'), 42);
assert.strictEqual(42, require('../fixtures/utf8-bom.json')); assert.strictEqual(require('../fixtures/utf8-bom.json'), 42);
// Error on the first line of a module should // Error on the first line of a module should
// have the correct line number // have the correct line number