test: remove unneeded string splitting

vsemozhetbyt · addaleax · commit 88d2e699d828 · 2017-05-15T13:49:45.000+02:00
PR-URL: #12992 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Luca Maraschi <luca.maraschi@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
diff --git a/test/parallel/test-cluster-dgram-1.js b/test/parallel/test-cluster-dgram-1.js
@@ -30,8 +30,7 @@ const dgram = require('dgram');
 
 
 if (common.isWindows) {
-  common.skip('dgram clustering is currently not supported ' +
-              'on windows.');
+  common.skip('dgram clustering is currently not supported on Windows.');
   return;
 }
 
diff --git a/test/parallel/test-cluster-dgram-2.js b/test/parallel/test-cluster-dgram-2.js
@@ -30,8 +30,7 @@ const assert = require('assert');
 
 
 if (common.isWindows) {
-  common.skip('dgram clustering is currently not supported ' +
-              'on windows.');
+  common.skip('dgram clustering is currently not supported on Windows.');
   return;
 }
 
diff --git a/test/parallel/test-cluster-dgram-reuse.js b/test/parallel/test-cluster-dgram-reuse.js
@@ -5,8 +5,7 @@ const cluster = require('cluster');
 const dgram = require('dgram');
 
 if (common.isWindows) {
-  common.skip('dgram clustering is currently not supported ' +
-              'on windows.');
+  common.skip('dgram clustering is currently not supported on windows.');
   return;
 }
 
diff --git a/test/parallel/test-cluster-fork-env.js b/test/parallel/test-cluster-fork-env.js
@@ -57,8 +57,9 @@ if (cluster.isWorker) {
 
   process.once('exit', function() {
     assert.ok(checks.using, 'The worker did not receive the correct env.');
-    assert.ok(checks.overwrite, 'The custom environment did not overwrite ' +
-              'the existing environment.');
+    assert.ok(
+      checks.overwrite,
+      'The custom environment did not overwrite the existing environment.');
   });
 
 }
diff --git a/test/parallel/test-cluster-http-pipe.js b/test/parallel/test-cluster-http-pipe.js
@@ -27,8 +27,8 @@ const cluster = require('cluster');
 const http = require('http');
 
 if (common.isWindows) {
-  common.skip('It is not possible to send pipe handles over ' +
-              'the IPC pipe on Windows');
+  common.skip(
+    'It is not possible to send pipe handles over the IPC pipe on Windows');
   return;
 }
 
diff --git a/test/parallel/test-cluster-worker-isdead.js b/test/parallel/test-cluster-worker-isdead.js
@@ -5,14 +5,13 @@ const assert = require('assert');
 
 if (cluster.isMaster) {
   const worker = cluster.fork();
-  assert.ok(!worker.isDead(),
-            'isDead() should return false right after the worker has been ' +
-            'created.');
+  assert.ok(
+    !worker.isDead(),
+    'isDead() should return false right after the worker has been created.');
 
   worker.on('exit', function() {
     assert.ok(worker.isDead(),
-              'After an event has been emitted, ' +
-              'isDead should return true');
+              'After an event has been emitted, isDead should return true');
   });
 
   worker.on('message', function(msg) {
diff --git a/test/parallel/test-crypto-padding-aes256.js b/test/parallel/test-crypto-padding-aes256.js
@@ -34,7 +34,7 @@ crypto.DEFAULT_ENCODING = 'buffer';
 function aes256(decipherFinal) {
   const iv = Buffer.from('00000000000000000000000000000000', 'hex');
   const key = Buffer.from('0123456789abcdef0123456789abcdef' +
-                         '0123456789abcdef0123456789abcdef', 'hex');
+                          '0123456789abcdef0123456789abcdef', 'hex');
 
   function encrypt(val, pad) {
     const c = crypto.createCipheriv('aes256', key, iv);
diff --git a/test/parallel/test-crypto-padding.js b/test/parallel/test-crypto-padding.js
@@ -66,8 +66,7 @@ const EVEN_LENGTH_ENCRYPTED =
 // openssl enc -aes-128-cbc -e -K 5333632e722e652e742e4b2e652e5921 \
 // -iv 626c616846697a7a3230313142757a7a -nopad | xxd -p -c256
 const EVEN_LENGTH_ENCRYPTED_NOPAD =
-    '7f57859550d4d2fdb9806da2a750461ab46e' +
-    '71b3d78ebe2d9684dfc87f7575b9';
+    '7f57859550d4d2fdb9806da2a750461ab46e71b3d78ebe2d9684dfc87f7575b9';
 
 
 /*
diff --git a/test/parallel/test-domain-stack-empty-in-process-uncaughtexception.js b/test/parallel/test-domain-stack-empty-in-process-uncaughtexception.js
@@ -7,9 +7,9 @@ const assert = require('assert');
 const d = domain.create();
 
 process.on('uncaughtException', common.mustCall(function onUncaught() {
-  assert.strictEqual(process.domain, null,
-                     'domains stack should be empty in uncaughtException' +
-                     ' handler');
+  assert.strictEqual(
+    process.domain, null,
+    'domains stack should be empty in uncaughtException handler');
 }));
 
 process.on('beforeExit', common.mustCall(function onBeforeExit() {
diff --git a/test/parallel/test-http-expect-continue.js b/test/parallel/test-http-expect-continue.js
@@ -31,8 +31,8 @@ let sent_continue = false;
 let got_continue = false;
 
 function handler(req, res) {
-  assert.strictEqual(sent_continue, true, 'Full response sent before ' +
-                     '100 Continue');
+  assert.strictEqual(sent_continue, true,
+                     'Full response sent before 100 Continue');
   console.error('Server sending full response...');
   res.writeHead(200, {
     'Content-Type': 'text/plain',
diff --git a/test/parallel/test-http-url.parse-auth-with-header-in-request.js b/test/parallel/test-http-url.parse-auth-with-header-in-request.js
@@ -39,8 +39,8 @@ const server = http.createServer(function(request, response) {
 });
 
 server.listen(0, function() {
-  const testURL = url.parse('http://asdf:qwer@localhost:' +
-      `${this.address().port}`);
+  const testURL =
+    url.parse(`http://asdf:qwer@localhost:${this.address().port}`);
   // the test here is if you set a specific authorization header in the
   // request we should not override that with basic auth
   testURL.headers = {
diff --git a/test/parallel/test-http-url.parse-only-support-http-https-protocol.js b/test/parallel/test-http-url.parse-only-support-http-https-protocol.js
@@ -30,8 +30,8 @@ assert.throws(function() {
   http.request(url.parse('file:///whatever'));
 }, function(err) {
   if (err instanceof Error) {
-    assert.strictEqual(err.message, 'Protocol "file:" not supported.' +
-                       ' Expected "http:"');
+    assert.strictEqual(
+      err.message, 'Protocol "file:" not supported. Expected "http:"');
     return true;
   }
 });
@@ -40,8 +40,8 @@ assert.throws(function() {
   http.request(url.parse('mailto:asdf@asdf.com'));
 }, function(err) {
   if (err instanceof Error) {
-    assert.strictEqual(err.message, 'Protocol "mailto:" not supported.' +
-                       ' Expected "http:"');
+    assert.strictEqual(
+      err.message, 'Protocol "mailto:" not supported. Expected "http:"');
     return true;
   }
 });
@@ -50,8 +50,8 @@ assert.throws(function() {
   http.request(url.parse('ftp://www.example.com'));
 }, function(err) {
   if (err instanceof Error) {
-    assert.strictEqual(err.message, 'Protocol "ftp:" not supported.' +
-                       ' Expected "http:"');
+    assert.strictEqual(
+      err.message, 'Protocol "ftp:" not supported. Expected "http:"');
     return true;
   }
 });
@@ -60,8 +60,8 @@ assert.throws(function() {
   http.request(url.parse('javascript:alert(\'hello\');'));
 }, function(err) {
   if (err instanceof Error) {
-    assert.strictEqual(err.message, 'Protocol "javascript:" not supported.' +
-                       ' Expected "http:"');
+    assert.strictEqual(
+      err.message, 'Protocol "javascript:" not supported. Expected "http:"');
     return true;
   }
 });
@@ -70,8 +70,8 @@ assert.throws(function() {
   http.request(url.parse('xmpp:isaacschlueter@jabber.org'));
 }, function(err) {
   if (err instanceof Error) {
-    assert.strictEqual(err.message, 'Protocol "xmpp:" not supported.' +
-                       ' Expected "http:"');
+    assert.strictEqual(
+      err.message, 'Protocol "xmpp:" not supported. Expected "http:"');
     return true;
   }
 });
@@ -80,8 +80,8 @@ assert.throws(function() {
   http.request(url.parse('f://some.host/path'));
 }, function(err) {
   if (err instanceof Error) {
-    assert.strictEqual(err.message, 'Protocol "f:" not supported.' +
-                       ' Expected "http:"');
+    assert.strictEqual(
+      err.message, 'Protocol "f:" not supported. Expected "http:"');
     return true;
   }
 });
diff --git a/test/parallel/test-intl.js b/test/parallel/test-intl.js
@@ -72,8 +72,8 @@ if (!common.hasIntl) {
 
   // If list is specified and doesn't contain 'en' then return.
   if (process.config.variables.icu_locales && !haveLocale('en')) {
-    common.skip('detailed Intl tests because English is not ' +
-                'listed as supported.');
+    common.skip(
+      'detailed Intl tests because English is not listed as supported.');
     // Smoke test. Does it format anything, or fail?
     console.log(`Date(0) formatted to: ${dtf.format(date0)}`);
     return;
diff --git a/test/parallel/test-tls-alpn-server-client.js b/test/parallel/test-tls-alpn-server-client.js
@@ -7,8 +7,8 @@ if (!common.hasCrypto) {
 }
 
 if (!process.features.tls_alpn || !process.features.tls_npn) {
-  common.skip('Skipping because node compiled without NPN or ALPN' +
-              ' feature of OpenSSL.');
+  common.skip(
+    'Skipping because node compiled without NPN or ALPN feature of OpenSSL.');
   return;
 }
 
diff --git a/test/parallel/test-tls-client-mindhsize.js b/test/parallel/test-tls-client-mindhsize.js
@@ -53,8 +53,8 @@ function test(size, err, next) {
     if (err) {
       client.on('error', function(e) {
         nerror++;
-        assert.strictEqual(e.message, 'DH parameter size 1024 is less' +
-                           ' than 2048');
+        assert.strictEqual(e.message,
+                           'DH parameter size 1024 is less than 2048');
         server.close();
       });
     }
diff --git a/test/parallel/test-tls-npn-server-client.js b/test/parallel/test-tls-npn-server-client.js
@@ -22,8 +22,7 @@
 'use strict';
 const common = require('../common');
 if (!process.features.tls_npn) {
-  common.skip('Skipping because node compiled without NPN feature of' +
-              ' OpenSSL.');
+  common.skip('Skipping because node compiled without NPN feature of OpenSSL.');
   return;
 }
 
diff --git a/test/parallel/test-tls-ocsp-callback.js b/test/parallel/test-tls-ocsp-callback.js
@@ -23,8 +23,7 @@
 const common = require('../common');
 
 if (!process.features.tls_ocsp) {
-  common.skip('node compiled without OpenSSL or ' +
-              'with old OpenSSL version.');
+  common.skip('node compiled without OpenSSL or with old OpenSSL version.');
   return;
 }
 if (!common.opensslCli) {
diff --git a/test/parallel/test-tls-sni-option.js b/test/parallel/test-tls-sni-option.js
@@ -22,8 +22,7 @@
 'use strict';
 const common = require('../common');
 if (!process.features.tls_sni) {
-  common.skip('node compiled without OpenSSL or ' +
-              'with old OpenSSL version.');
+  common.skip('node compiled without OpenSSL or with old OpenSSL version.');
   return;
 }
 
diff --git a/test/parallel/test-tls-sni-server-client.js b/test/parallel/test-tls-sni-server-client.js
@@ -22,8 +22,7 @@
 'use strict';
 const common = require('../common');
 if (!process.features.tls_sni) {
-  common.skip('node compiled without OpenSSL or ' +
-              'with old OpenSSL version.');
+  common.skip('node compiled without OpenSSL or with old OpenSSL version.');
   return;
 }
 
diff --git a/test/parallel/test-url-format-invalid-input.js b/test/parallel/test-url-format-invalid-input.js
@@ -14,8 +14,8 @@ const throwsObjsAndReportTypes = new Map([
 ]);
 
 for (const [obj, type] of throwsObjsAndReportTypes) {
-  const error = new RegExp('^TypeError: Parameter "urlObj" must be an object' +
-                           `, not ${type}$`);
+  const error = new RegExp(
+    `^TypeError: Parameter "urlObj" must be an object, not ${type}$`);
   assert.throws(function() { url.format(obj); }, error);
 }
 assert.strictEqual(url.format(''), '');
diff --git a/test/parallel/test-zlib-flush-drain.js b/test/parallel/test-zlib-flush-drain.js
@@ -37,12 +37,14 @@ deflater.on('drain', function() {
 });
 
 process.once('exit', function() {
-  assert.strictEqual(beforeFlush, true, 'before calling flush, writable ' +
-                     'stream should need to drain');
-  assert.strictEqual(afterFlush, false, 'after calling flush, writable ' +
-                     'stream should not need to drain');
-  assert.strictEqual(drainCount, 1,
-                     'the deflater should have emitted a single drain event');
-  assert.strictEqual(flushCount, 2,
-                     'flush should be called twice');
+  assert.strictEqual(
+    beforeFlush, true,
+    'before calling flush, writable stream should need to drain');
+  assert.strictEqual(
+    afterFlush, false,
+    'after calling flush, writable stream should not need to drain');
+  assert.strictEqual(
+    drainCount, 1, 'the deflater should have emitted a single drain event');
+  assert.strictEqual(
+    flushCount, 2, 'flush should be called twice');
 });
diff --git a/test/pummel/test-net-timeout.js b/test/pummel/test-net-timeout.js
@@ -40,8 +40,8 @@ const echo_server = net.createServer(function(socket) {
   });
 
   socket.on('error', function(e) {
-    throw new Error('Server side socket should not get error. ' +
-                      'We disconnect willingly.');
+    throw new Error(
+      'Server side socket should not get error. We disconnect willingly.');
   });
 
   socket.on('data', function(d) {

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ const dgram = require('dgram');`
`30`	`30`
`31`	`31`
`32`	`32`	`if (common.isWindows) {`
`33`		`- common.skip('dgram clustering is currently not supported ' +`
`34`		`- 'on windows.');`
	`33`	`+ common.skip('dgram clustering is currently not supported on Windows.');`
`35`	`34`	`return;`
`36`	`35`	`}`
`37`	`36`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ const assert = require('assert');`
`30`	`30`
`31`	`31`
`32`	`32`	`if (common.isWindows) {`
`33`		`- common.skip('dgram clustering is currently not supported ' +`
`34`		`- 'on windows.');`
	`33`	`+ common.skip('dgram clustering is currently not supported on Windows.');`
`35`	`34`	`return;`
`36`	`35`	`}`
`37`	`36`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@ const cluster = require('cluster');`
`5`	`5`	`const dgram = require('dgram');`
`6`	`6`
`7`	`7`	`if (common.isWindows) {`
`8`		`- common.skip('dgram clustering is currently not supported ' +`
`9`		`- 'on windows.');`
	`8`	`+ common.skip('dgram clustering is currently not supported on windows.');`
`10`	`9`	`return;`
`11`	`10`	`}`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ const cluster = require('cluster');`
`27`	`27`	`const http = require('http');`
`28`	`28`
`29`	`29`	`if (common.isWindows) {`
`30`		`- common.skip('It is not possible to send pipe handles over ' +`
`31`		`- 'the IPC pipe on Windows');`
	`30`	`+ common.skip(`
	`31`	`+ 'It is not possible to send pipe handles over the IPC pipe on Windows');`
`32`	`32`	`return;`
`33`	`33`	`}`
`34`	`34`