improve style of tests

diff --git a/test/basic.js b/test/basic.js
index 75a190ee7930e7f357d2ddd4654cbe4279b8364b..5a3f05ea123191c5ed3fc1e06e82340f50d7d954 100644 (file)
--- a/test/basic.js
+++ b/test/basic.js
@@ -2,21 +2,20 @@ var B = require('../index.js').Buffer
 var test = require('tape')
 
 test('new buffer from array', function (t) {
-    t.plan(1)
-    t.equal(
-        new B([1, 2, 3]).toString(),
-        '\u0001\u0002\u0003'
-    )
-    t.end()
+  t.equal(
+    new B([1, 2, 3]).toString(),
+    '\u0001\u0002\u0003'
+  )
+  t.end()
 })
 
 test('new buffer from string', function (t) {
-    t.plan(1)
-    t.equal(
-        new B('hey', 'utf8').toString(),
-        'hey'
-    )
-    t.end()
+  t.plan(1)
+  t.equal(
+    new B('hey', 'utf8').toString(),
+    'hey'
+  )
+  t.end()
 })
 
 test('buffer toArrayBuffer()', function (t) {
@@ -34,31 +33,31 @@ test('buffer toArrayBuffer()', function (t) {
 })
 
 test('buffer toJSON()', function (t) {
-    t.plan(1)
-    var data = [1, 2, 3, 4]
-    t.deepEqual(
-      new B(data).toJSON(),
-      { type: 'Buffer', data: [1,2,3,4] }
-    )
-    t.end()
+  t.plan(1)
+  var data = [1, 2, 3, 4]
+  t.deepEqual(
+    new B(data).toJSON(),
+    { type: 'Buffer', data: [1,2,3,4] }
+  )
+  t.end()
 })
 
 test('buffer copy example', function (t) {
-    t.plan(1)
+  t.plan(1)
 
-    buf1 = new B(26)
-    buf2 = new B(26)
+  buf1 = new B(26)
+  buf2 = new B(26)
 
-    for (var i = 0 ; i < 26 ; i++) {
-      buf1[i] = i + 97; // 97 is ASCII a
-      buf2[i] = 33; // ASCII !
-    }
+  for (var i = 0 ; i < 26 ; i++) {
+    buf1[i] = i + 97; // 97 is ASCII a
+    buf2[i] = 33; // ASCII !
+  }
 
-    buf1.copy(buf2, 8, 16, 20)
+  buf1.copy(buf2, 8, 16, 20)
 
-    t.equal(
-      buf2.toString('ascii', 0, 25),
-      '!!!!!!!!qrst!!!!!!!!!!!!!'
-    )
-    t.end()
+  t.equal(
+    buf2.toString('ascii', 0, 25),
+    '!!!!!!!!qrst!!!!!!!!!!!!!'
+  )
+  t.end()
 })

diff --git a/test/buffer.js b/test/buffer.js
index 9a906c8fd250f33bc6b3ee59741963a3e326f4be..a449879db1c315ee057c93c1fe2d7867318777bd 100644 (file)
--- a/test/buffer.js
+++ b/test/buffer.js
@@ -2,158 +2,146 @@ var B = require('../index.js').Buffer
 var test = require('tape')
 
 test('utf8 buffer to base64', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("Ձאab", "utf8").toString("base64"),
-        '1YHXkGFi'
-    )
-    t.end()
+  t.equal(
+    new B("Ձאab", "utf8").toString("base64"),
+    '1YHXkGFi'
+  )
+  t.end()
 })
 
 test('utf8 buffer to hex', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("Ձאab", "utf8").toString("hex"),
-        'd581d7906162'
-    )
-    t.end()
+  t.equal(
+    new B("Ձאab", "utf8").toString("hex"),
+    'd581d7906162'
+  )
+  t.end()
 })
 
 test('utf8 to utf8', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("öäüõÖÄÜÕ", "utf8").toString("utf8"),
-        'öäüõÖÄÜÕ'
-    )
-    t.end()
+  t.equal(
+    new B("öäüõÖÄÜÕ", "utf8").toString("utf8"),
+    'öäüõÖÄÜÕ'
+  )
+  t.end()
 })
 
 test('ascii buffer to base64', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("123456!@#$%^", "ascii").toString("base64"),
-        'MTIzNDU2IUAjJCVe'
-    )
-    t.end()
+  t.equal(
+    new B("123456!@#$%^", "ascii").toString("base64"),
+    'MTIzNDU2IUAjJCVe'
+  )
+  t.end()
 })
 
 test('ascii buffer to hex', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("123456!@#$%^", "ascii").toString("hex"),
-        '31323334353621402324255e'
-    )
-    t.end()
+  t.equal(
+    new B("123456!@#$%^", "ascii").toString("hex"),
+    '31323334353621402324255e'
+  )
+  t.end()
 })
 
 test('base64 buffer to utf8', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("1YHXkGFi", "base64").toString("utf8"),
-        'Ձאab'
-    )
-    t.end()
+  t.equal(
+    new B("1YHXkGFi", "base64").toString("utf8"),
+    'Ձאab'
+  )
+  t.end()
 })
 
 test('hex buffer to utf8', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("d581d7906162", "hex").toString("utf8"),
-        'Ձאab'
-    )
-    t.end()
+  t.equal(
+    new B("d581d7906162", "hex").toString("utf8"),
+    'Ձאab'
+  )
+  t.end()
 })
 
 test('base64 buffer to ascii', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("MTIzNDU2IUAjJCVe", "base64").toString("ascii"),
-        '123456!@#$%^'
-    )
-    t.end()
+  t.equal(
+    new B("MTIzNDU2IUAjJCVe", "base64").toString("ascii"),
+    '123456!@#$%^'
+  )
+  t.end()
 })
 
 test('hex buffer to ascii', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("31323334353621402324255e", "hex").toString("ascii"),
-        '123456!@#$%^'
-    )
-    t.end()
+  t.equal(
+    new B("31323334353621402324255e", "hex").toString("ascii"),
+    '123456!@#$%^'
+  )
+  t.end()
 })
 
 test('base64 buffer to binary', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("MTIzNDU2IUAjJCVe", "base64").toString("binary"),
-        '123456!@#$%^'
-    )
-    t.end()
+  t.equal(
+    new B("MTIzNDU2IUAjJCVe", "base64").toString("binary"),
+    '123456!@#$%^'
+  )
+  t.end()
 })
 
 test('hex buffer to binary', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("31323334353621402324255e", "hex").toString("binary"),
-        '123456!@#$%^'
-    )
-    t.end()
+  t.equal(
+    new B("31323334353621402324255e", "hex").toString("binary"),
+    '123456!@#$%^'
+  )
+  t.end()
 })
 
 test('utf8 to binary', function (t) {
-    t.plan(1)
-    t.equal(
-        new B("öäüõÖÄÜÕ", "utf8").toString("binary"),
-        "öäüõÃ\96Ã\84Ã\9cÃ\95"
-    )
-    t.end()
+  t.equal(
+    new B("öäüõÖÄÜÕ", "utf8").toString("binary"),
+    "öäüõÃ\96Ã\84Ã\9cÃ\95"
+  )
+  t.end()
 })
 
 test("hex of write{Uint,Int}{8,16,32}{LE,BE}", function (t) {
-    t.plan(2*(2*2*2+2))
-    var hex = [
-        "03", "0300", "0003", "03000000", "00000003",
-        "fd", "fdff", "fffd", "fdffffff", "fffffffd"
-    ]
-    var reads = [ 3, 3, 3, 3, 3, -3, -3, -3, -3, -3 ]
-    var xs = ["UInt","Int"]
-    var ys = [8,16,32]
-    for (var i = 0; i < xs.length; i++) {
-      var x = xs[i]
-      for (var j = 0; j < ys.length; j++) {
-        var y = ys[j]
-        var endianesses = (y === 8) ? [""] : ["LE","BE"]
-        for (var k = 0; k < endianesses.length; k++) {
-          var z = endianesses[k]
-
-          var v1  = new B(y / 8)
-          var writefn  = "write" + x + y + z
-          var val = (x === "Int") ? -3 : 3
-          v1[writefn](val, 0)
-          t.equal(
-              v1.toString("hex"),
-              hex.shift()
-          )
-          var readfn = "read" + x + y + z
-          t.equal(
-              v1[readfn](0),
-              reads.shift()
-          )
-        }
+  t.plan(2*(2*2*2+2))
+  var hex = [
+    "03", "0300", "0003", "03000000", "00000003",
+    "fd", "fdff", "fffd", "fdffffff", "fffffffd"
+  ]
+  var reads = [ 3, 3, 3, 3, 3, -3, -3, -3, -3, -3 ]
+  var xs = ["UInt","Int"]
+  var ys = [8,16,32]
+  for (var i = 0; i < xs.length; i++) {
+    var x = xs[i]
+    for (var j = 0; j < ys.length; j++) {
+      var y = ys[j]
+      var endianesses = (y === 8) ? [""] : ["LE","BE"]
+      for (var k = 0; k < endianesses.length; k++) {
+        var z = endianesses[k]
+
+        var v1  = new B(y / 8)
+        var writefn  = "write" + x + y + z
+        var val = (x === "Int") ? -3 : 3
+        v1[writefn](val, 0)
+        t.equal(
+          v1.toString("hex"),
+          hex.shift()
+        )
+        var readfn = "read" + x + y + z
+        t.equal(
+          v1[readfn](0),
+          reads.shift()
+        )
       }
     }
-    t.end()
+  }
+  t.end()
 })
 
 test("hex of write{Uint,Int}{8,16,32}{LE,BE} with overflow", function (t) {
     t.plan(3*(2*2*2+2))
     var hex = [
-        "", "03", "00", "030000", "000000",
-        "", "fd", "ff", "fdffff", "ffffff"
+      "", "03", "00", "030000", "000000",
+      "", "fd", "ff", "fdffff", "ffffff"
     ]
     var reads = [
-        undefined, 3, 0, 3, 0,
-        undefined, 253, -256, 16777213, -256
+      undefined, 3, 0, 3, 0,
+      undefined, 253, -256, 16777213, -256
     ]
     var xs = ["UInt","Int"]
     var ys = [8,16,32]
@@ -172,8 +160,8 @@ test("hex of write{Uint,Int}{8,16,32}{LE,BE} with overflow", function (t) {
           var val = (x === "Int") ? -3 : 3
           v1[writefn](val, 0, true)
           t.equal(
-              v1.toString("hex"),
-              hex.shift()
+            v1.toString("hex"),
+            hex.shift()
           )
           // check that nothing leaked to next buffer.
           t.equal(next.readUInt32BE(0), 0)
@@ -181,8 +169,8 @@ test("hex of write{Uint,Int}{8,16,32}{LE,BE} with overflow", function (t) {
           next.writeInt32BE(~0, 0)
           var readfn = "read" + x + y + z
           t.equal(
-              v1[readfn](0, true),
-              reads.shift()
+            v1[readfn](0, true),
+            reads.shift()
           )
         }
       }
@@ -191,48 +179,47 @@ test("hex of write{Uint,Int}{8,16,32}{LE,BE} with overflow", function (t) {
 })
 
 test("concat() a varying number of buffers", function (t) {
-    t.plan(5)
-    var zero = []
-    var one  = [ new B('asdf') ]
-    var long = []
-    for (var i = 0; i < 10; i++) long.push(new B('asdf'))
-
-    var flatZero = B.concat(zero)
-    var flatOne = B.concat(one)
-    var flatLong = B.concat(long)
-    var flatLongLen = B.concat(long, 40)
-
-    t.equal(flatZero.length, 0)
-    t.equal(flatOne.toString(), 'asdf')
-    t.equal(flatOne, one[0])
-    t.equal(flatLong.toString(), (new Array(10+1).join('asdf')))
-    t.equal(flatLongLen.toString(), (new Array(10+1).join('asdf')))
-    t.end()
+  t.plan(5)
+  var zero = []
+  var one  = [ new B('asdf') ]
+  var long = []
+  for (var i = 0; i < 10; i++) long.push(new B('asdf'))
+
+  var flatZero = B.concat(zero)
+  var flatOne = B.concat(one)
+  var flatLong = B.concat(long)
+  var flatLongLen = B.concat(long, 40)
+
+  t.equal(flatZero.length, 0)
+  t.equal(flatOne.toString(), 'asdf')
+  t.equal(flatOne, one[0])
+  t.equal(flatLong.toString(), (new Array(10+1).join('asdf')))
+  t.equal(flatLongLen.toString(), (new Array(10+1).join('asdf')))
+  t.end()
 })
 
-test("buffer from buffer", function (t) {
-    t.plan(1)
-    var b1 = new B('asdf')
-    var b2 = new B(b1)
-    t.equal(b1.toString('hex'), b2.toString('hex'))
-    t.end()
+test("new buffer from buffer", function (t) {
+  var b1 = new B('asdf')
+  var b2 = new B(b1)
+  t.equal(b1.toString('hex'), b2.toString('hex'))
+  t.end()
 })
 
 test("fill", function(t) {
-    t.plan(1)
-    var b = new B(10)
-    b.fill(2)
-    t.equal(b.toString('hex'), '02020202020202020202')
-    t.end()
+  t.plan(1)
+  var b = new B(10)
+  b.fill(2)
+  t.equal(b.toString('hex'), '02020202020202020202')
+  t.end()
 })
 
 test('copy() empty buffer with sourceEnd=0', function (t) {
-    t.plan(1)
-    var source = new B([42])
-    var destination = new B([43])
-    source.copy(destination, 0, 0, 0)
-    t.equal(destination.readUInt8(0), 43)
-    t.end()
+  t.plan(1)
+  var source = new B([42])
+  var destination = new B([43])
+  source.copy(destination, 0, 0, 0)
+  t.equal(destination.readUInt8(0), 43)
+  t.end()
 })
 
 test('base64 ignore whitespace', function(t) {
@@ -261,37 +248,3 @@ test('base64 strings without padding', function (t) {
   t.equal((new B('YW9ldQ', 'base64').toString()), 'aoeu')
   t.end()
 })
-
-test('detect utf16 surrogate pairs', function(t) {
-  t.plan(1)
-  var text = '\uD83D\uDE38' + '\uD83D\uDCAD' + '\uD83D\uDC4D'
-  var buf = new B(text)
-  t.equal(text, buf.toString())
-  t.end()
-})
-
-test('throw on orphaned utf16 surrogate lead code point', function(t) {
-  t.plan(1)
-  var text = '\uD83D\uDE38' + '\uD83D' + '\uD83D\uDC4D'
-  var err
-  try {
-    var buf = new B(text)
-  } catch (e) {
-    err = e
-  }
-  t.equal(err instanceof URIError, true)
-  t.end()
-})
-
-test('throw on orphaned utf16 surrogate trail code point', function(t) {
-  t.plan(1)
-  var text = '\uD83D\uDE38' + '\uDCAD' + '\uD83D\uDC4D'
-  var err
-  try {
-    var buf = new B(text)
-  } catch (e) {
-    err = e
-  }
-  t.equal(err instanceof URIError, true)
-  t.end()
-})

diff --git a/test/indexes.js b/test/indexes.js
index 55a0cb9aa91d06df6a26ea5f3973a229b1243943..88879c86c5a3616f73bf873f4d4afa9d8b641182 100644 (file)
--- a/test/indexes.js
+++ b/test/indexes.js
@@ -2,28 +2,28 @@ var B = require('../').Buffer
 var test = require('tape')
 
 test('indexes from a string', function(t) {
-    t.plan(3)
-    var buf = new B('abc')
-    t.equal(buf[0], 97)
-    t.equal(buf[1], 98)
-    t.equal(buf[2], 99)
+  t.plan(3)
+  var buf = new B('abc')
+  t.equal(buf[0], 97)
+  t.equal(buf[1], 98)
+  t.equal(buf[2], 99)
 })
 
 test('indexes from an array', function(t) {
-    t.plan(3)
-    var buf = new B([ 97, 98, 99 ])
-    t.equal(buf[0], 97)
-    t.equal(buf[1], 98)
-    t.equal(buf[2], 99)
+  t.plan(3)
+  var buf = new B([ 97, 98, 99 ])
+  t.equal(buf[0], 97)
+  t.equal(buf[1], 98)
+  t.equal(buf[2], 99)
 })
 
 test('set then modify indexes from an array', function(t) {
-    t.plan(4)
-    var buf = new B([ 97, 98, 99 ])
-    t.equal(buf[2], 99)
-    t.equal(buf.toString(), 'abc')
+  t.plan(4)
+  var buf = new B([ 97, 98, 99 ])
+  t.equal(buf[2], 99)
+  t.equal(buf.toString(), 'abc')
 
-    buf[2] += 10
-    t.equal(buf[2], 109)
-    t.equal(buf.toString(), 'abm')
+  buf[2] += 10
+  t.equal(buf[2], 109)
+  t.equal(buf.toString(), 'abm')
 })

diff --git a/test/utf16.js b/test/utf16.js
new file mode 100644 (file)
index 0000000..ffb6525
--- /dev/null
+++ b/test/utf16.js
@@ -0,0 +1,36 @@
+var B = require('../index.js').Buffer
+var test = require('tape')
+
+test('detect utf16 surrogate pairs', function(t) {
+  t.plan(1)
+  var text = '\uD83D\uDE38' + '\uD83D\uDCAD' + '\uD83D\uDC4D'
+  var buf = new B(text)
+  t.equal(text, buf.toString())
+  t.end()
+})
+
+test('throw on orphaned utf16 surrogate lead code point', function(t) {
+  t.plan(1)
+  var text = '\uD83D\uDE38' + '\uD83D' + '\uD83D\uDC4D'
+  var err
+  try {
+    var buf = new B(text)
+  } catch (e) {
+    err = e
+  }
+  t.equal(err instanceof URIError, true)
+  t.end()
+})
+
+test('throw on orphaned utf16 surrogate trail code point', function(t) {
+  t.plan(1)
+  var text = '\uD83D\uDE38' + '\uDCAD' + '\uD83D\uDC4D'
+  var err
+  try {
+    var buf = new B(text)
+  } catch (e) {
+    err = e
+  }
+  t.equal(err instanceof URIError, true)
+  t.end()
+})
\ No newline at end of file