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

test: use strict assertions in module loader test

Browse Source 
Replace calls to assert.equal() and assert.notEqual() with
assert.strictEqual() and assert.strictNotEqual() respectively.

PR-URL: https://github.com/nodejs/node/pull/9263
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Ben Noordhuis 2016-10-24 22:54:30 +02:00 committed by James M Snell
parent 611c50bded
commit 443e218544
1 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
test/sequential/test-module-loading.js
View File

@ -7,20 +7,20 @@ var fs = require('fs');
console.error('load test-module-loading.js'); console.error('load test-module-loading.js');
// assert that this is the main module. // assert that this is the main module.
assert.equal(require.main.id, '.', 'main module should have id of \'.\''); assert.strictEqual(require.main.id, '.', 'main module should have id of \'.\'');
assert.equal(require.main, module, 'require.main should === module'); assert.strictEqual(require.main, module, 'require.main should === module');
assert.equal(process.mainModule, module, assert.strictEqual(process.mainModule, module,
'process.mainModule should === module'); 'process.mainModule should === 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
var a_js = require('../fixtures/a.js'); var a_js = require('../fixtures/a.js');
assert.equal(42, a_js.number); assert.strictEqual(42, a_js.number);
// require a file without any extensions // require a file without any extensions
var foo_no_ext = require('../fixtures/foo'); var foo_no_ext = require('../fixtures/foo');
assert.equal('ok', foo_no_ext.foo); assert.strictEqual('ok', foo_no_ext.foo);
var a = require('../fixtures/a'); var a = require('../fixtures/a');
var c = require('../fixtures/b/c'); var c = require('../fixtures/b/c');
@ -31,56 +31,56 @@ var d3 = require(path.join(__dirname, '../fixtures/b/d'));
// Relative // Relative
var d4 = require('../fixtures/b/d'); var d4 = require('../fixtures/b/d');
assert.equal(false, false, 'testing the test program.'); assert.strictEqual(false, false, 'testing the test program.');
assert.ok(a.A instanceof Function); assert.ok(a.A instanceof Function);
assert.equal('A', a.A()); assert.strictEqual('A', a.A());
assert.ok(a.C instanceof Function); assert.ok(a.C instanceof Function);
assert.equal('C', a.C()); assert.strictEqual('C', a.C());
assert.ok(a.D instanceof Function); assert.ok(a.D instanceof Function);
assert.equal('D', a.D()); assert.strictEqual('D', a.D());
assert.ok(d.D instanceof Function); assert.ok(d.D instanceof Function);
assert.equal('D', d.D()); assert.strictEqual('D', d.D());
assert.ok(d2.D instanceof Function); assert.ok(d2.D instanceof Function);
assert.equal('D', d2.D()); assert.strictEqual('D', d2.D());
assert.ok(d3.D instanceof Function); assert.ok(d3.D instanceof Function);
assert.equal('D', d3.D()); assert.strictEqual('D', d3.D());
assert.ok(d4.D instanceof Function); assert.ok(d4.D instanceof Function);
assert.equal('D', d4.D()); assert.strictEqual('D', d4.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.notEqual(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.equal(threeFolder, threeIndex); assert.strictEqual(threeFolder, threeIndex);
assert.notEqual(threeFolder, three); assert.notStrictEqual(threeFolder, three);
console.error('test package.json require() loading'); console.error('test package.json require() loading');
assert.equal(require('../fixtures/packages/index').ok, 'ok', assert.strictEqual(require('../fixtures/packages/index').ok, 'ok',
'Failed loading package'); 'Failed loading package');
assert.equal(require('../fixtures/packages/main').ok, 'ok', assert.strictEqual(require('../fixtures/packages/main').ok, 'ok',
'Failed loading package'); 'Failed loading package');
assert.equal(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.equal(root.foo, foo); assert.strictEqual(root.foo, foo);
assert.equal(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,
@ -99,23 +99,24 @@ try {
require('../fixtures/throws_error'); require('../fixtures/throws_error');
} catch (e) { } catch (e) {
errorThrown = true; errorThrown = true;
assert.equal('blah', e.message); assert.strictEqual('blah', e.message);
} }
assert.equal(require('path').dirname(__filename), __dirname); 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) {
var content = fs.readFileSync(filename).toString(); var content = fs.readFileSync(filename).toString();
assert.equal('this is custom source\n', content); assert.strictEqual('this is custom source\n', content);
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);
}; };
assert.equal(require('../fixtures/registerExt').test, 'passed'); assert.strictEqual(require('../fixtures/registerExt').test, 'passed');
// unknown extension, load as .js // unknown extension, load as .js
assert.equal(require('../fixtures/registerExt.hello.world').test, 'passed'); assert.strictEqual(require('../fixtures/registerExt.hello.world').test,
'passed');
console.error('load custom file types that return non-strings'); console.error('load custom file types that return non-strings');
require.extensions['.test'] = function(module, filename) { require.extensions['.test'] = function(module, filename) {
@ -124,16 +125,16 @@ require.extensions['.test'] = function(module, filename) {
}; };
}; };
assert.equal(require('../fixtures/registerExt2').custom, 'passed'); assert.strictEqual(require('../fixtures/registerExt2').custom, 'passed');
assert.equal(require('../fixtures/foo').foo, 'ok', assert.strictEqual(require('../fixtures/foo').foo, 'ok',
'require module with no extension'); 'require module with no extension');
// Should not attempt to load a directory // Should not attempt to load a directory
try { try {
require('../fixtures/empty'); require('../fixtures/empty');
} catch (err) { } catch (err) {
assert.equal(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
@ -145,31 +146,31 @@ const msg = 'Load order incorrect.';
require.extensions['.reg'] = require.extensions['.js']; require.extensions['.reg'] = require.extensions['.js'];
require.extensions['.reg2'] = require.extensions['.js']; require.extensions['.reg2'] = require.extensions['.js'];
assert.equal(require(loadOrder + 'file1').file1, 'file1', msg); assert.strictEqual(require(loadOrder + 'file1').file1, 'file1', msg);
assert.equal(require(loadOrder + 'file2').file2, 'file2.js', msg); assert.strictEqual(require(loadOrder + 'file2').file2, 'file2.js', msg);
try { try {
require(loadOrder + 'file3'); require(loadOrder + 'file3');
} catch (e) { } catch (e) {
// Not a real .node module, but we know we require'd the right thing. // Not a real .node module, but we know we require'd the right thing.
assert.ok(e.message.replace(/\\/g, '/').match(/file3\.node/)); assert.ok(e.message.replace(/\\/g, '/').match(/file3\.node/));
} }
assert.equal(require(loadOrder + 'file4').file4, 'file4.reg', msg); assert.strictEqual(require(loadOrder + 'file4').file4, 'file4.reg', msg);
assert.equal(require(loadOrder + 'file5').file5, 'file5.reg2', msg); assert.strictEqual(require(loadOrder + 'file5').file5, 'file5.reg2', msg);
assert.equal(require(loadOrder + 'file6').file6, 'file6/index.js', msg); assert.strictEqual(require(loadOrder + 'file6').file6, 'file6/index.js', msg);
try { try {
require(loadOrder + 'file7'); require(loadOrder + 'file7');
} 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.equal(require(loadOrder + 'file8').file8, 'file8/index.reg', msg); assert.strictEqual(require(loadOrder + 'file8').file8, 'file8/index.reg', msg);
assert.equal(require(loadOrder + 'file9').file9, 'file9/index.reg2', 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.
var parent = require('../fixtures/module-require/parent/'); var parent = require('../fixtures/module-require/parent/');
var child = require('../fixtures/module-require/child/'); var child = require('../fixtures/module-require/child/');
assert.equal(child.loaded, parent.loaded); assert.strictEqual(child.loaded, parent.loaded);
// #1357 Loading JSON files with require() // #1357 Loading JSON files with require()
@ -259,29 +260,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.equal('A done', a.A()); assert.strictEqual('A done', a.A());
assert.ok(a.C instanceof Function); assert.ok(a.C instanceof Function);
assert.equal('C done', a.C()); assert.strictEqual('C done', a.C());
assert.ok(a.D instanceof Function); assert.ok(a.D instanceof Function);
assert.equal('D done', a.D()); assert.strictEqual('D done', a.D());
assert.ok(d.D instanceof Function); assert.ok(d.D instanceof Function);
assert.equal('D done', d.D()); assert.strictEqual('D done', d.D());
assert.ok(d2.D instanceof Function); assert.ok(d2.D instanceof Function);
assert.equal('D done', d2.D()); assert.strictEqual('D done', d2.D());
assert.equal(true, errorThrown); assert.strictEqual(true, errorThrown);
console.log('exit'); console.log('exit');
}); });
// #1440 Loading files with a byte order marker. // #1440 Loading files with a byte order marker.
assert.equal(42, require('../fixtures/utf8-bom.js')); assert.strictEqual(42, require('../fixtures/utf8-bom.js'));
assert.equal(42, require('../fixtures/utf8-bom.json')); assert.strictEqual(42, require('../fixtures/utf8-bom.json'));
// 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