Skip to content

Commit 9d5e7f5

Browse files
bnoordhuisMyles Borins
authored and
Myles Borins
committedNov 22, 2016
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 6d742b3 commit 9d5e7f5

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,10 +123,10 @@ 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
assert.throws(function() {
131132
require.paths;
@@ -135,7 +136,7 @@ assert.throws(function() {
135136
try {
136137
require('../fixtures/empty');
137138
} catch (err) {
138-
assert.equal(err.message, 'Cannot find module \'../fixtures/empty\'');
139+
assert.strictEqual(err.message, 'Cannot find module \'../fixtures/empty\'');
139140
}
140141

141142
// Check load order is as expected
@@ -147,31 +148,31 @@ const msg = 'Load order incorrect.';
147148
require.extensions['.reg'] = require.extensions['.js'];
148149
require.extensions['.reg2'] = require.extensions['.js'];
149150

150-
assert.equal(require(loadOrder + 'file1').file1, 'file1', msg);
151-
assert.equal(require(loadOrder + 'file2').file2, 'file2.js', msg);
151+
assert.strictEqual(require(loadOrder + 'file1').file1, 'file1', msg);
152+
assert.strictEqual(require(loadOrder + 'file2').file2, 'file2.js', msg);
152153
try {
153154
require(loadOrder + 'file3');
154155
} catch (e) {
155156
// Not a real .node module, but we know we require'd the right thing.
156157
assert.ok(e.message.replace(/\\/g, '/').match(/file3\.node/));
157158
}
158-
assert.equal(require(loadOrder + 'file4').file4, 'file4.reg', msg);
159-
assert.equal(require(loadOrder + 'file5').file5, 'file5.reg2', msg);
160-
assert.equal(require(loadOrder + 'file6').file6, 'file6/index.js', msg);
159+
assert.strictEqual(require(loadOrder + 'file4').file4, 'file4.reg', msg);
160+
assert.strictEqual(require(loadOrder + 'file5').file5, 'file5.reg2', msg);
161+
assert.strictEqual(require(loadOrder + 'file6').file6, 'file6/index.js', msg);
161162
try {
162163
require(loadOrder + 'file7');
163164
} catch (e) {
164165
assert.ok(e.message.replace(/\\/g, '/').match(/file7\/index\.node/));
165166
}
166-
assert.equal(require(loadOrder + 'file8').file8, 'file8/index.reg', msg);
167-
assert.equal(require(loadOrder + 'file9').file9, 'file9/index.reg2', msg);
167+
assert.strictEqual(require(loadOrder + 'file8').file8, 'file8/index.reg', msg);
168+
assert.strictEqual(require(loadOrder + 'file9').file9, 'file9/index.reg2', msg);
168169

169170

170171
// make sure that module.require() is the same as
171172
// doing require() inside of that module.
172173
var parent = require('../fixtures/module-require/parent/');
173174
var child = require('../fixtures/module-require/child/');
174-
assert.equal(child.loaded, parent.loaded);
175+
assert.strictEqual(child.loaded, parent.loaded);
175176

176177

177178
// #1357 Loading JSON files with require()
@@ -260,29 +261,29 @@ assert.throws(function() {
260261

261262
process.on('exit', function() {
262263
assert.ok(a.A instanceof Function);
263-
assert.equal('A done', a.A());
264+
assert.strictEqual('A done', a.A());
264265

265266
assert.ok(a.C instanceof Function);
266-
assert.equal('C done', a.C());
267+
assert.strictEqual('C done', a.C());
267268

268269
assert.ok(a.D instanceof Function);
269-
assert.equal('D done', a.D());
270+
assert.strictEqual('D done', a.D());
270271

271272
assert.ok(d.D instanceof Function);
272-
assert.equal('D done', d.D());
273+
assert.strictEqual('D done', d.D());
273274

274275
assert.ok(d2.D instanceof Function);
275-
assert.equal('D done', d2.D());
276+
assert.strictEqual('D done', d2.D());
276277

277-
assert.equal(true, errorThrown);
278+
assert.strictEqual(true, errorThrown);
278279

279280
console.log('exit');
280281
});
281282

282283

283284
// #1440 Loading files with a byte order marker.
284-
assert.equal(42, require('../fixtures/utf8-bom.js'));
285-
assert.equal(42, require('../fixtures/utf8-bom.json'));
285+
assert.strictEqual(42, require('../fixtures/utf8-bom.js'));
286+
assert.strictEqual(42, require('../fixtures/utf8-bom.json'));
286287

287288
// Error on the first line of a module should
288289
// have the correct line number

0 commit comments

Comments
 (0)
Please sign in to comment.