Use Buffer.from and Buffer.alloc in tests

request · May 4, 2018 · db17497 · db17497
1 parent 0d29635
commit db17497
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -187,7 +187,7 @@ var formData = {
   // Pass a simple key-value pair
   my_field: 'my_value',
   // Pass data via Buffers
-  my_buffer: new Buffer([1, 2, 3]),
+  my_buffer: Buffer.from([1, 2, 3]),
   // Pass data via Streams
   my_file: fs.createReadStream(__dirname + '/unicycle.jpg'),
   // Pass multiple values /w an Array
@@ -221,7 +221,7 @@ For advanced cases, you can access the form-data object itself via `r.form()`. T
 var r = request.post('http://service.com/upload', function optionalCallback(err, httpResponse, body) {...})
 var form = r.form();
 form.append('my_field', 'my_value');
-form.append('my_buffer', new Buffer([1, 2, 3]));
+form.append('my_buffer', Buffer.from([1, 2, 3]));
 form.append('custom_file', fs.createReadStream(__dirname + '/unicycle.jpg'), {filename: 'unicycle.jpg'});
 ```
 See the [form-data README](https://github.com/form-data/form-data) for more information & examples.

diff --git a/tests/server.js b/tests/server.js
@@ -76,7 +76,7 @@ exports.createPostStream = function (text) {
   postStream.writeable = true
   postStream.readable = true
   setTimeout(function () {
-    postStream.emit('data', new Buffer(text))
+    postStream.emit('data', Buffer.from(text))
     postStream.emit('end')
   }, 0)
   return postStream

diff --git a/tests/test-basic-auth.js b/tests/test-basic-auth.js
@@ -15,13 +15,13 @@ tape('setup', function (t) {
     var ok
 
     if (req.headers.authorization) {
-      if (req.headers.authorization === 'Basic ' + new Buffer('user:pass').toString('base64')) {
+      if (req.headers.authorization === 'Basic ' + Buffer.from('user:pass').toString('base64')) {
         ok = true
-      } else if (req.headers.authorization === 'Basic ' + new Buffer('user:').toString('base64')) {
+      } else if (req.headers.authorization === 'Basic ' + Buffer.from('user:').toString('base64')) {
         ok = true
-      } else if (req.headers.authorization === 'Basic ' + new Buffer(':pass').toString('base64')) {
+      } else if (req.headers.authorization === 'Basic ' + Buffer.from(':pass').toString('base64')) {
         ok = true
-      } else if (req.headers.authorization === 'Basic ' + new Buffer('user:pâss').toString('base64')) {
+      } else if (req.headers.authorization === 'Basic ' + Buffer.from('user:pâss').toString('base64')) {
         ok = true
       } else {
         // Bad auth header, don't send back WWW-Authenticate header

diff --git a/tests/test-body.js b/tests/test-body.js
@@ -35,28 +35,28 @@ addTest('testGet', {
 
 addTest('testGetChunkBreak', {
   resp: server.createChunkResponse(
-    [ new Buffer([239]),
-      new Buffer([163]),
-      new Buffer([191]),
-      new Buffer([206]),
-      new Buffer([169]),
-      new Buffer([226]),
-      new Buffer([152]),
-      new Buffer([131])
+    [ Buffer.from([239]),
+      Buffer.from([163]),
+      Buffer.from([191]),
+      Buffer.from([206]),
+      Buffer.from([169]),
+      Buffer.from([226]),
+      Buffer.from([152]),
+      Buffer.from([131])
     ]),
   expectBody: '\uF8FF\u03A9\u2603'
 })
 
 addTest('testGetBuffer', {
-  resp: server.createGetResponse(new Buffer('TESTING!')), encoding: null, expectBody: new Buffer('TESTING!')
+  resp: server.createGetResponse(Buffer.from('TESTING!')), encoding: null, expectBody: Buffer.from('TESTING!')
 })
 
 addTest('testGetEncoding', {
-  resp: server.createGetResponse(new Buffer('efa3bfcea9e29883', 'hex')), encoding: 'hex', expectBody: 'efa3bfcea9e29883'
+  resp: server.createGetResponse(Buffer.from('efa3bfcea9e29883', 'hex')), encoding: 'hex', expectBody: 'efa3bfcea9e29883'
 })
 
 addTest('testGetUTF', {
-  resp: server.createGetResponse(new Buffer([0xEF, 0xBB, 0xBF, 226, 152, 131])), encoding: 'utf8', expectBody: '\u2603'
+  resp: server.createGetResponse(Buffer.from([0xEF, 0xBB, 0xBF, 226, 152, 131])), encoding: 'utf8', expectBody: '\u2603'
 })
 
 addTest('testGetJSON', {
@@ -68,7 +68,7 @@ addTest('testPutString', {
 })
 
 addTest('testPutBuffer', {
-  resp: server.createPostValidator('PUTTINGDATA'), method: 'PUT', body: new Buffer('PUTTINGDATA')
+  resp: server.createPostValidator('PUTTINGDATA'), method: 'PUT', body: Buffer.from('PUTTINGDATA')
 })
 
 addTest('testPutJSON', {
@@ -141,7 +141,7 @@ tape('typed array', function (t) {
       encoding: null
     }, function (err, res, body) {
       t.error(err)
-      t.deepEqual(new Buffer(data), body)
+      t.deepEqual(Buffer.from(data), body)
       server.close(t.end)
     })
   })

diff --git a/tests/test-emptyBody.js b/tests/test-emptyBody.js
@@ -32,7 +32,7 @@ tape('empty body without encoding', function (t) {
   }, function (err, res, body) {
     t.equal(err, null)
     t.equal(res.statusCode, 200)
-    t.same(body, new Buffer(0))
+    t.same(body, Buffer.alloc(0))
     t.end()
   })
 })

diff --git a/tests/test-form-data.js b/tests/test-form-data.js
@@ -25,7 +25,7 @@ function runTest (t, options) {
         res.end()
         return
       } else {
-        t.ok(req.headers.authorization === 'Basic ' + new Buffer('user:pass').toString('base64'))
+        t.ok(req.headers.authorization === 'Basic ' + Buffer.from('user:pass').toString('base64'))
       }
     }
 
@@ -84,7 +84,7 @@ function runTest (t, options) {
     var url = 'http://localhost:' + this.address().port
     // @NOTE: multipartFormData properties must be set here so that my_file read stream does not leak in node v0.8
     multipartFormData.my_field = 'my_value'
-    multipartFormData.my_buffer = new Buffer([1, 2, 3])
+    multipartFormData.my_buffer = Buffer.from([1, 2, 3])
     multipartFormData.my_file = fs.createReadStream(localFile)
     multipartFormData.remote_file = request(url + '/file')
     multipartFormData.secret_file = {

diff --git a/tests/test-form.js b/tests/test-form.js
@@ -74,7 +74,7 @@ tape('multipart form append', function (t) {
     var url = 'http://localhost:' + this.address().port
     FIELDS = [
       { name: 'my_field', value: 'my_value' },
-      { name: 'my_buffer', value: new Buffer([1, 2, 3]) },
+      { name: 'my_buffer', value: Buffer.from([1, 2, 3]) },
       { name: 'my_file', value: fs.createReadStream(localFile) },
       { name: 'remote_file', value: request(url + '/file') }
     ]

diff --git a/tests/test-gzip.js b/tests/test-gzip.js
@@ -69,7 +69,7 @@ tape('setup', function (t) {
   var a = 48271
   var m = 0x7FFFFFFF
   var x = 1
-  testContentBig = new Buffer(10240)
+  testContentBig = Buffer.alloc(10240)
   for (var i = 0; i < testContentBig.length; ++i) {
     x = (a * x) & m
     // Printable ASCII range from 32-126, inclusive

diff --git a/tests/test-https.js b/tests/test-https.js
@@ -55,14 +55,14 @@ function runAllTests (strict, s) {
 
   runTest('testGetChunkBreak', {
     resp: server.createChunkResponse(
-      [ new Buffer([239]),
-        new Buffer([163]),
-        new Buffer([191]),
-        new Buffer([206]),
-        new Buffer([169]),
-        new Buffer([226]),
-        new Buffer([152]),
-        new Buffer([131])
+      [ Buffer.from([239]),
+        Buffer.from([163]),
+        Buffer.from([191]),
+        Buffer.from([206]),
+        Buffer.from([169]),
+        Buffer.from([226]),
+        Buffer.from([152]),
+        Buffer.from([131])
       ]),
     expectBody: '\uf8ff\u03a9\u2603'
   })
@@ -76,7 +76,7 @@ function runAllTests (strict, s) {
   })
 
   runTest('testPutBuffer', {
-    resp: server.createPostValidator('PUTTINGDATA'), method: 'PUT', body: new Buffer('PUTTINGDATA')
+    resp: server.createPostValidator('PUTTINGDATA'), method: 'PUT', body: Buffer.from('PUTTINGDATA')
   })
 
   runTest('testPutJSON', {

diff --git a/tests/test-multipart.js b/tests/test-multipart.js
@@ -77,7 +77,7 @@ function runTest (t, a) {
     multipartData = [
       {name: 'my_field', body: 'my_value'},
       {name: 'my_number', body: 1000},
-      {name: 'my_buffer', body: new Buffer([1, 2, 3])},
+      {name: 'my_buffer', body: Buffer.from([1, 2, 3])},
       {name: 'my_file', body: fs.createReadStream(localFile)},
       {name: 'remote_file', body: request(url + '/file')}
     ]

diff --git a/tests/test-params.js b/tests/test-params.js
@@ -36,22 +36,22 @@ runTest('testGet', {
 
 runTest('testGetChunkBreak', {
   resp: server.createChunkResponse(
-    [ new Buffer([239]),
-      new Buffer([163]),
-      new Buffer([191]),
-      new Buffer([206]),
-      new Buffer([169]),
-      new Buffer([226]),
-      new Buffer([152]),
-      new Buffer([131])
+    [ Buffer.from([239]),
+      Buffer.from([163]),
+      Buffer.from([191]),
+      Buffer.from([206]),
+      Buffer.from([169]),
+      Buffer.from([226]),
+      Buffer.from([152]),
+      Buffer.from([131])
     ]),
   expectBody: '\uf8ff\u03a9\u2603'
 })
 
 runTest('testGetBuffer', {
-  resp: server.createGetResponse(new Buffer('TESTING!')),
+  resp: server.createGetResponse(Buffer.from('TESTING!')),
   encoding: null,
-  expectBody: new Buffer('TESTING!')
+  expectBody: Buffer.from('TESTING!')
 })
 
 runTest('testGetJSON', {
@@ -69,7 +69,7 @@ runTest('testPutString', {
 runTest('testPutBuffer', {
   resp: server.createPostValidator('PUTTINGDATA'),
   method: 'PUT',
-  body: new Buffer('PUTTINGDATA')
+  body: Buffer.from('PUTTINGDATA')
 })
 
 runTest('testPutJSON', {