Skip to content

Commit 66df5d1

Browse files
delvedorimyller
authored andcommitted
test: cleanup test-os.js
Moved from var to const. Moved from .equal to .strictEqual. Added more checks about the type of the returned values. PR-URL: #8606 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Ilkka Myller <ilkka.myller@nodefield.com>
1 parent db5a879 commit 66df5d1

File tree

1 file changed

+54
-36
lines changed

1 file changed

+54
-36
lines changed

test/parallel/test-os.js

Lines changed: 54 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,91 @@
11
'use strict';
2-
var common = require('../common');
3-
var assert = require('assert');
4-
var os = require('os');
5-
var path = require('path');
6-
2+
const common = require('../common');
3+
const assert = require('assert');
4+
const os = require('os');
5+
const path = require('path');
6+
7+
const is = {
8+
string: (value) => { assert.strictEqual(typeof value, 'string'); },
9+
number: (value) => { assert.strictEqual(typeof value, 'number'); },
10+
array: (value) => { assert.ok(Array.isArray(value)); },
11+
object: (value) => {
12+
assert.strictEqual(typeof value, 'object');
13+
assert.notStrictEqual(value, null);
14+
}
15+
};
716

817
process.env.TMPDIR = '/tmpdir';
918
process.env.TMP = '/tmp';
1019
process.env.TEMP = '/temp';
1120
if (common.isWindows) {
12-
assert.equal(os.tmpdir(), '/temp');
21+
assert.strictEqual(os.tmpdir(), '/temp');
1322
process.env.TEMP = '';
14-
assert.equal(os.tmpdir(), '/tmp');
23+
assert.strictEqual(os.tmpdir(), '/tmp');
1524
process.env.TMP = '';
1625
const expected = (process.env.SystemRoot || process.env.windir) + '\\temp';
17-
assert.equal(os.tmpdir(), expected);
26+
assert.strictEqual(os.tmpdir(), expected);
1827
process.env.TEMP = '\\temp\\';
19-
assert.equal(os.tmpdir(), '\\temp');
28+
assert.strictEqual(os.tmpdir(), '\\temp');
2029
process.env.TEMP = '\\tmpdir/';
21-
assert.equal(os.tmpdir(), '\\tmpdir/');
30+
assert.strictEqual(os.tmpdir(), '\\tmpdir/');
2231
process.env.TEMP = '\\';
23-
assert.equal(os.tmpdir(), '\\');
32+
assert.strictEqual(os.tmpdir(), '\\');
2433
process.env.TEMP = 'C:\\';
25-
assert.equal(os.tmpdir(), 'C:\\');
34+
assert.strictEqual(os.tmpdir(), 'C:\\');
2635
} else {
27-
assert.equal(os.tmpdir(), '/tmpdir');
36+
assert.strictEqual(os.tmpdir(), '/tmpdir');
2837
process.env.TMPDIR = '';
29-
assert.equal(os.tmpdir(), '/tmp');
38+
assert.strictEqual(os.tmpdir(), '/tmp');
3039
process.env.TMP = '';
31-
assert.equal(os.tmpdir(), '/temp');
40+
assert.strictEqual(os.tmpdir(), '/temp');
3241
process.env.TEMP = '';
33-
assert.equal(os.tmpdir(), '/tmp');
42+
assert.strictEqual(os.tmpdir(), '/tmp');
3443
process.env.TMPDIR = '/tmpdir/';
35-
assert.equal(os.tmpdir(), '/tmpdir');
44+
assert.strictEqual(os.tmpdir(), '/tmpdir');
3645
process.env.TMPDIR = '/tmpdir\\';
37-
assert.equal(os.tmpdir(), '/tmpdir\\');
46+
assert.strictEqual(os.tmpdir(), '/tmpdir\\');
3847
process.env.TMPDIR = '/';
39-
assert.equal(os.tmpdir(), '/');
48+
assert.strictEqual(os.tmpdir(), '/');
4049
}
4150

42-
var endianness = os.endianness();
51+
const endianness = os.endianness();
4352
console.log('endianness = %s', endianness);
53+
is.string(endianness);
4454
assert.ok(/[BL]E/.test(endianness));
4555

46-
var hostname = os.hostname();
56+
const hostname = os.hostname();
4757
console.log('hostname = %s', hostname);
58+
is.string(hostname);
4859
assert.ok(hostname.length > 0);
4960

50-
var uptime = os.uptime();
61+
const uptime = os.uptime();
5162
console.log('uptime = %d', uptime);
63+
is.number(uptime);
5264
assert.ok(uptime > 0);
5365

54-
var cpus = os.cpus();
66+
const cpus = os.cpus();
5567
console.log('cpus = ', cpus);
68+
is.array(cpus);
5669
assert.ok(cpus.length > 0);
5770

58-
var type = os.type();
71+
const type = os.type();
5972
console.log('type = ', type);
73+
is.string(type);
6074
assert.ok(type.length > 0);
6175

62-
var release = os.release();
76+
const release = os.release();
6377
console.log('release = ', release);
78+
is.string(release);
6479
assert.ok(release.length > 0);
6580

66-
var platform = os.platform();
81+
const platform = os.platform();
6782
console.log('platform = ', platform);
83+
is.string(platform);
6884
assert.ok(platform.length > 0);
6985

70-
var arch = os.arch();
86+
const arch = os.arch();
7187
console.log('arch = ', arch);
88+
is.string(arch);
7289
assert.ok(arch.length > 0);
7390

7491
if (!common.isSunOS) {
@@ -79,7 +96,7 @@ if (!common.isSunOS) {
7996
}
8097

8198

82-
var interfaces = os.networkInterfaces();
99+
const interfaces = os.networkInterfaces();
83100
console.error(interfaces);
84101
switch (platform) {
85102
case 'linux':
@@ -104,29 +121,30 @@ switch (platform) {
104121
}
105122
}
106123

107-
var EOL = os.EOL;
124+
const EOL = os.EOL;
108125
assert.ok(EOL.length > 0);
109126

110127

111-
var home = os.homedir();
128+
const home = os.homedir();
112129

113130
console.log('homedir = ' + home);
114-
assert.ok(typeof home === 'string');
131+
is.string(home);
115132
assert.ok(home.indexOf(path.sep) !== -1);
116133

117134
if (common.isWindows && process.env.USERPROFILE) {
118-
assert.equal(home, process.env.USERPROFILE);
135+
assert.strictEqual(home, process.env.USERPROFILE);
119136
delete process.env.USERPROFILE;
120137
assert.ok(os.homedir().indexOf(path.sep) !== -1);
121138
process.env.USERPROFILE = home;
122139
} else if (!common.isWindows && process.env.HOME) {
123-
assert.equal(home, process.env.HOME);
140+
assert.strictEqual(home, process.env.HOME);
124141
delete process.env.HOME;
125142
assert.ok(os.homedir().indexOf(path.sep) !== -1);
126143
process.env.HOME = home;
127144
}
128145

129146
const pwd = os.userInfo();
147+
is.object(pwd);
130148
const pwdBuf = os.userInfo({ encoding: 'buffer' });
131149

132150
if (common.isWindows) {
@@ -137,15 +155,15 @@ if (common.isWindows) {
137155
assert.strictEqual(pwdBuf.gid, -1);
138156
assert.strictEqual(pwdBuf.shell, null);
139157
} else {
140-
assert.strictEqual(typeof pwd.uid, 'number');
141-
assert.strictEqual(typeof pwd.gid, 'number');
158+
is.number(pwd.uid);
159+
is.number(pwd.gid);
142160
assert.notStrictEqual(pwd.shell.indexOf(path.sep), -1);
143161
assert.strictEqual(pwd.uid, pwdBuf.uid);
144162
assert.strictEqual(pwd.gid, pwdBuf.gid);
145163
assert.strictEqual(pwd.shell, pwdBuf.shell.toString('utf8'));
146164
}
147165

148-
assert.strictEqual(typeof pwd.username, 'string');
166+
is.string(pwd.username);
149167
assert.notStrictEqual(pwd.homedir.indexOf(path.sep), -1);
150168
assert.strictEqual(pwd.username, pwdBuf.username.toString('utf8'));
151169
assert.strictEqual(pwd.homedir, pwdBuf.homedir.toString('utf8'));

0 commit comments

Comments
 (0)