Skip to content

Commit 88e60c2

Browse files
bnoordhuisMyles Borins
authored and
Myles Borins
committed
test: use strict assertions in module loader test
Replace calls to assert.equal() and assert.notEqual() with assert.strictEqual() and assert.strictNotEqual() respectively. PR-URL: #9263 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Evan Lucas <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent 0c32b03 commit 88e60c2

File tree

1 file changed

+49
-48
lines changed

1 file changed

+49
-48
lines changed

test/sequential/test-module-loading.js

+49-48
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ var fs = require('fs');
77
console.error('load test-module-loading.js');
88

99
// assert that this is the main module.
10-
assert.equal(require.main.id, '.', 'main module should have id of \'.\'');
11-
assert.equal(require.main, module, 'require.main should === module');
12-
assert.equal(process.mainModule, module,
13-
'process.mainModule should === module');
10+
assert.strictEqual(require.main.id, '.', 'main module should have id of \'.\'');
11+
assert.strictEqual(require.main, module, 'require.main should === module');
12+
assert.strictEqual(process.mainModule, module,
13+
'process.mainModule should === module');
1414
// assert that it's *not* the main module in the required module.
1515
require('../fixtures/not-main-module.js');
1616

1717
// require a file with a request that includes the extension
1818
var a_js = require('../fixtures/a.js');
19-
assert.equal(42, a_js.number);
19+
assert.strictEqual(42, a_js.number);
2020

2121
// require a file without any extensions
2222
var foo_no_ext = require('../fixtures/foo');
23-
assert.equal('ok', foo_no_ext.foo);
23+
assert.strictEqual('ok', foo_no_ext.foo);
2424

2525
var a = require('../fixtures/a');
2626
var c = require('../fixtures/b/c');
@@ -31,54 +31,54 @@ var d3 = require(path.join(__dirname, '../fixtures/b/d'));
3131
// Relative
3232
var d4 = require('../fixtures/b/d');
3333

34-
assert.equal(false, false, 'testing the test program.');
34+
assert.strictEqual(false, false, 'testing the test program.');
3535

3636
assert.ok(a.A instanceof Function);
37-
assert.equal('A', a.A());
37+
assert.strictEqual('A', a.A());
3838

3939
assert.ok(a.C instanceof Function);
40-
assert.equal('C', a.C());
40+
assert.strictEqual('C', a.C());
4141

4242
assert.ok(a.D instanceof Function);
43-
assert.equal('D', a.D());
43+
assert.strictEqual('D', a.D());
4444

4545
assert.ok(d.D instanceof Function);
46-
assert.equal('D', d.D());
46+
assert.strictEqual('D', d.D());
4747

4848
assert.ok(d2.D instanceof Function);
49-
assert.equal('D', d2.D());
49+
assert.strictEqual('D', d2.D());
5050

5151
assert.ok(d3.D instanceof Function);
52-
assert.equal('D', d3.D());
52+
assert.strictEqual('D', d3.D());
5353

5454
assert.ok(d4.D instanceof Function);
55-
assert.equal('D', d4.D());
55+
assert.strictEqual('D', d4.D());
5656

5757
assert.ok((new a.SomeClass()) instanceof c.SomeClass);
5858

5959
console.error('test index.js modules ids and relative loading');
6060
const one = require('../fixtures/nested-index/one');
6161
const two = require('../fixtures/nested-index/two');
62-
assert.notEqual(one.hello, two.hello);
62+
assert.notStrictEqual(one.hello, two.hello);
6363

6464
console.error('test index.js in a folder with a trailing slash');
6565
const three = require('../fixtures/nested-index/three');
6666
const threeFolder = require('../fixtures/nested-index/three/');
6767
const threeIndex = require('../fixtures/nested-index/three/index.js');
68-
assert.equal(threeFolder, threeIndex);
69-
assert.notEqual(threeFolder, three);
68+
assert.strictEqual(threeFolder, threeIndex);
69+
assert.notStrictEqual(threeFolder, three);
7070

7171
console.error('test package.json require() loading');
72-
assert.equal(require('../fixtures/packages/main').ok, 'ok',
73-
'Failed loading package');
74-
assert.equal(require('../fixtures/packages/main-index').ok, 'ok',
75-
'Failed loading package with index.js in main subdir');
72+
assert.strictEqual(require('../fixtures/packages/main').ok, 'ok',
73+
'Failed loading package');
74+
assert.strictEqual(require('../fixtures/packages/main-index').ok, 'ok',
75+
'Failed loading package with index.js in main subdir');
7676

7777
console.error('test cycles containing a .. path');
7878
const root = require('../fixtures/cycles/root');
7979
const foo = require('../fixtures/cycles/folder/foo');
80-
assert.equal(root.foo, foo);
81-
assert.equal(root.sayHello(), root.hello);
80+
assert.strictEqual(root.foo, foo);
81+
assert.strictEqual(root.sayHello(), root.hello);
8282

8383
console.error('test node_modules folders');
8484
// asserts are in the fixtures files themselves,
@@ -97,23 +97,24 @@ try {
9797
require('../fixtures/throws_error');
9898
} catch (e) {
9999
errorThrown = true;
100-
assert.equal('blah', e.message);
100+
assert.strictEqual('blah', e.message);
101101
}
102102

103-
assert.equal(require('path').dirname(__filename), __dirname);
103+
assert.strictEqual(require('path').dirname(__filename), __dirname);
104104

105105
console.error('load custom file types with extensions');
106106
require.extensions['.test'] = function(module, filename) {
107107
var content = fs.readFileSync(filename).toString();
108-
assert.equal('this is custom source\n', content);
108+
assert.strictEqual('this is custom source\n', content);
109109
content = content.replace('this is custom source',
110110
'exports.test = \'passed\'');
111111
module._compile(content, filename);
112112
};
113113

114-
assert.equal(require('../fixtures/registerExt').test, 'passed');
114+
assert.strictEqual(require('../fixtures/registerExt').test, 'passed');
115115
// unknown extension, load as .js
116-
assert.equal(require('../fixtures/registerExt.hello.world').test, 'passed');
116+
assert.strictEqual(require('../fixtures/registerExt.hello.world').test,
117+
'passed');
117118

118119
console.error('load custom file types that return non-strings');
119120
require.extensions['.test'] = function(module, filename) {
@@ -122,16 +123,16 @@ require.extensions['.test'] = function(module, filename) {
122123
};
123124
};
124125

125-
assert.equal(require('../fixtures/registerExt2').custom, 'passed');
126+
assert.strictEqual(require('../fixtures/registerExt2').custom, 'passed');
126127

127-
assert.equal(require('../fixtures/foo').foo, 'ok',
128-
'require module with no extension');
128+
assert.strictEqual(require('../fixtures/foo').foo, 'ok',
129+
'require module with no extension');
129130

130131
// Should not attempt to load a directory
131132
try {
132133
require('../fixtures/empty');
133134
} catch (err) {
134-
assert.equal(err.message, 'Cannot find module \'../fixtures/empty\'');
135+
assert.strictEqual(err.message, 'Cannot find module \'../fixtures/empty\'');
135136
}
136137

137138
// Check load order is as expected
@@ -143,31 +144,31 @@ const msg = 'Load order incorrect.';
143144
require.extensions['.reg'] = require.extensions['.js'];
144145
require.extensions['.reg2'] = require.extensions['.js'];
145146

146-
assert.equal(require(loadOrder + 'file1').file1, 'file1', msg);
147-
assert.equal(require(loadOrder + 'file2').file2, 'file2.js', msg);
147+
assert.strictEqual(require(loadOrder + 'file1').file1, 'file1', msg);
148+
assert.strictEqual(require(loadOrder + 'file2').file2, 'file2.js', msg);
148149
try {
149150
require(loadOrder + 'file3');
150151
} catch (e) {
151152
// Not a real .node module, but we know we require'd the right thing.
152153
assert.ok(e.message.replace(/\\/g, '/').match(/file3\.node/));
153154
}
154-
assert.equal(require(loadOrder + 'file4').file4, 'file4.reg', msg);
155-
assert.equal(require(loadOrder + 'file5').file5, 'file5.reg2', msg);
156-
assert.equal(require(loadOrder + 'file6').file6, 'file6/index.js', msg);
155+
assert.strictEqual(require(loadOrder + 'file4').file4, 'file4.reg', msg);
156+
assert.strictEqual(require(loadOrder + 'file5').file5, 'file5.reg2', msg);
157+
assert.strictEqual(require(loadOrder + 'file6').file6, 'file6/index.js', msg);
157158
try {
158159
require(loadOrder + 'file7');
159160
} catch (e) {
160161
assert.ok(e.message.replace(/\\/g, '/').match(/file7\/index\.node/));
161162
}
162-
assert.equal(require(loadOrder + 'file8').file8, 'file8/index.reg', msg);
163-
assert.equal(require(loadOrder + 'file9').file9, 'file9/index.reg2', msg);
163+
assert.strictEqual(require(loadOrder + 'file8').file8, 'file8/index.reg', msg);
164+
assert.strictEqual(require(loadOrder + 'file9').file9, 'file9/index.reg2', msg);
164165

165166

166167
// make sure that module.require() is the same as
167168
// doing require() inside of that module.
168169
var parent = require('../fixtures/module-require/parent/');
169170
var child = require('../fixtures/module-require/child/');
170-
assert.equal(child.loaded, parent.loaded);
171+
assert.strictEqual(child.loaded, parent.loaded);
171172

172173

173174
// #1357 Loading JSON files with require()
@@ -256,29 +257,29 @@ assert.throws(function() {
256257

257258
process.on('exit', function() {
258259
assert.ok(a.A instanceof Function);
259-
assert.equal('A done', a.A());
260+
assert.strictEqual('A done', a.A());
260261

261262
assert.ok(a.C instanceof Function);
262-
assert.equal('C done', a.C());
263+
assert.strictEqual('C done', a.C());
263264

264265
assert.ok(a.D instanceof Function);
265-
assert.equal('D done', a.D());
266+
assert.strictEqual('D done', a.D());
266267

267268
assert.ok(d.D instanceof Function);
268-
assert.equal('D done', d.D());
269+
assert.strictEqual('D done', d.D());
269270

270271
assert.ok(d2.D instanceof Function);
271-
assert.equal('D done', d2.D());
272+
assert.strictEqual('D done', d2.D());
272273

273-
assert.equal(true, errorThrown);
274+
assert.strictEqual(true, errorThrown);
274275

275276
console.log('exit');
276277
});
277278

278279

279280
// #1440 Loading files with a byte order marker.
280-
assert.equal(42, require('../fixtures/utf8-bom.js'));
281-
assert.equal(42, require('../fixtures/utf8-bom.json'));
281+
assert.strictEqual(42, require('../fixtures/utf8-bom.js'));
282+
assert.strictEqual(42, require('../fixtures/utf8-bom.json'));
282283

283284
// Error on the first line of a module should
284285
// have the correct line number

0 commit comments

Comments
 (0)