FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

test: use strict assertions in module loader test · nodejs/node@f39eb05 · GitHub

/ node Public

Commit f39eb05

Browse files
bnoordhuis
authored and
evanlucas
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 <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>
1 parent fc9e6a3 commit f39eb05

1 file changed

Lines changed: 51 additions & 50 deletions

File tree

‎test/sequential/test-module-loading.js‎

Lines changed: 51 additions & 50 deletions
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,56 +31,56 @@ 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/index').ok, 'ok',
73-
'Failed loading package');
74-
assert.equal(require('../fixtures/packages/main').ok, 'ok',
75-
'Failed loading package');
76-
assert.equal(require('../fixtures/packages/main-index').ok, 'ok',
77-
'Failed loading package with index.js in main subdir');
72+
assert.strictEqual(require('../fixtures/packages/index').ok, 'ok',
73+
'Failed loading package');
74+
assert.strictEqual(require('../fixtures/packages/main').ok, 'ok',
75+
'Failed loading package');
76+
assert.strictEqual(require('../fixtures/packages/main-index').ok, 'ok',
77+
'Failed loading package with index.js in main subdir');
7878

7979
console.error('test cycles containing a .. path');
8080
const root = require('../fixtures/cycles/root');
8181
const foo = require('../fixtures/cycles/folder/foo');
82-
assert.equal(root.foo, foo);
83-
assert.equal(root.sayHello(), root.hello);
82+
assert.strictEqual(root.foo, foo);
83+
assert.strictEqual(root.sayHello(), root.hello);
8484

8585
console.error('test node_modules folders');
8686
// asserts are in the fixtures files themselves,
@@ -99,23 +99,24 @@ try {
9999
require('../fixtures/throws_error');
100100
} catch (e) {
101101
errorThrown = true;
102-
assert.equal('blah', e.message);
102+
assert.strictEqual('blah', e.message);
103103
}
104104

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

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

116-
assert.equal(require('../fixtures/registerExt').test, 'passed');
116+
assert.strictEqual(require('../fixtures/registerExt').test, 'passed');
117117
// unknown extension, load as .js
118-
assert.equal(require('../fixtures/registerExt.hello.world').test, 'passed');
118+
assert.strictEqual(require('../fixtures/registerExt.hello.world').test,
119+
'passed');
119120

120121
console.error('load custom file types that return non-strings');
121122
require.extensions['.test'] = function(module, filename) {
@@ -124,16 +125,16 @@ require.extensions['.test'] = function(module, filename) {
124125
};
125126
};
126127

127-
assert.equal(require('../fixtures/registerExt2').custom, 'passed');
128+
assert.strictEqual(require('../fixtures/registerExt2').custom, 'passed');
128129

129-
assert.equal(require('../fixtures/foo').foo, 'ok',
130-
'require module with no extension');
130+
assert.strictEqual(require('../fixtures/foo').foo, 'ok',
131+
'require module with no extension');
131132

132133
// Should not attempt to load a directory
133134
try {
134135
require('../fixtures/empty');
135136
} catch (err) {
136-
assert.equal(err.message, 'Cannot find module \'../fixtures/empty\'');
137+
assert.strictEqual(err.message, 'Cannot find module \'../fixtures/empty\'');
137138
}
138139

139140
// Check load order is as expected
@@ -145,31 +146,31 @@ const msg = 'Load order incorrect.';
145146
require.extensions['.reg'] = require.extensions['.js'];
146147
require.extensions['.reg2'] = require.extensions['.js'];
147148

148-
assert.equal(require(loadOrder + 'file1').file1, 'file1', msg);
149-
assert.equal(require(loadOrder + 'file2').file2, 'file2.js', msg);
149+
assert.strictEqual(require(loadOrder + 'file1').file1, 'file1', msg);
150+
assert.strictEqual(require(loadOrder + 'file2').file2, 'file2.js', msg);
150151
try {
151152
require(loadOrder + 'file3');
152153
} catch (e) {
153154
// Not a real .node module, but we know we require'd the right thing.
154155
assert.ok(e.message.replace(/\\/g, '/').match(/file3\.node/));
155156
}
156-
assert.equal(require(loadOrder + 'file4').file4, 'file4.reg', msg);
157-
assert.equal(require(loadOrder + 'file5').file5, 'file5.reg2', msg);
158-
assert.equal(require(loadOrder + 'file6').file6, 'file6/index.js', msg);
157+
assert.strictEqual(require(loadOrder + 'file4').file4, 'file4.reg', msg);
158+
assert.strictEqual(require(loadOrder + 'file5').file5, 'file5.reg2', msg);
159+
assert.strictEqual(require(loadOrder + 'file6').file6, 'file6/index.js', msg);
159160
try {
160161
require(loadOrder + 'file7');
161162
} catch (e) {
162163
assert.ok(e.message.replace(/\\/g, '/').match(/file7\/index\.node/));
163164
}
164-
assert.equal(require(loadOrder + 'file8').file8, 'file8/index.reg', msg);
165-
assert.equal(require(loadOrder + 'file9').file9, 'file9/index.reg2', msg);
165+
assert.strictEqual(require(loadOrder + 'file8').file8, 'file8/index.reg', msg);
166+
assert.strictEqual(require(loadOrder + 'file9').file9, 'file9/index.reg2', msg);
166167

167168

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

174175

175176
// #1357 Loading JSON files with require()
@@ -259,29 +260,29 @@ assert.throws(function() {
259260

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

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

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

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

273274
assert.ok(d2.D instanceof Function);
274-
assert.equal('D done', d2.D());
275+
assert.strictEqual('D done', d2.D());
275276

276-
assert.equal(true, errorThrown);
277+
assert.strictEqual(true, errorThrown);
277278

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

281282

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

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

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL