From 4b1d49256193dd47a9f324a128c2a944bca72398 Mon Sep 17 00:00:00 2001
From: Erik Lundin <mjor.himself@gmail.com>
Date: Tue, 20 Mar 2012 18:07:08 +0100
Subject: [PATCH] test: merge typed arrays tests

Merge simple/test-typed-arrays-typenames into simple/test-typed-arrays.
---
 test/simple/test-typed-arrays-typenames.js | 48 ----------------------
 test/simple/test-typed-arrays.js           | 28 ++++++++++---
 2 files changed, 23 insertions(+), 53 deletions(-)
 delete mode 100644 test/simple/test-typed-arrays-typenames.js

diff --git a/test/simple/test-typed-arrays-typenames.js b/test/simple/test-typed-arrays-typenames.js
deleted file mode 100644
index a78c7598ac..0000000000
--- a/test/simple/test-typed-arrays-typenames.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-var common = require('../common');
-var assert = require('assert');
-
-// TODO: merge with test-typed-arrays.js some time in the future.
-// That file only exists in master right now.
-[
-  'ArrayBuffer',
-  'Int8Array',
-  'Uint8Array',
-  'Int16Array',
-  'Uint16Array',
-  'Int32Array',
-  'Uint32Array',
-  'Float32Array',
-  'Float64Array'
-].forEach(function(name) {
-  var expected = '[object ' + name + ']';
-  var clazz = global[name];
-  var obj = new clazz(1);
-
-  assert.equal(obj.toString(), expected);
-  assert.equal(Object.prototype.toString.call(obj), expected);
-
-  obj = new DataView(obj);
-  assert.equal(obj.toString(), '[object DataView]');
-  assert.equal(Object.prototype.toString.call(obj), '[object DataView]');
-});
diff --git a/test/simple/test-typed-arrays.js b/test/simple/test-typed-arrays.js
index ff88d067f6..3a3e1085af 100644
--- a/test/simple/test-typed-arrays.js
+++ b/test/simple/test-typed-arrays.js
@@ -27,11 +27,29 @@
 
 var common = require('../common');
 var assert = require('assert');
-var SlowBuffer = process.binding('buffer').SlowBuffer;
-var ArrayBuffer = process.binding('typed_array').ArrayBuffer;
-var Int32Array = process.binding('typed_array').Int32Array;
-var Int16Array = process.binding('typed_array').Int16Array;
-var Uint8Array = process.binding('typed_array').Uint8Array;
+
+[
+  'ArrayBuffer',
+  'Int8Array',
+  'Uint8Array',
+  'Int16Array',
+  'Uint16Array',
+  'Int32Array',
+  'Uint32Array',
+  'Float32Array',
+  'Float64Array'
+].forEach(function(name) {
+  var expected = '[object ' + name + ']';
+  var clazz = global[name];
+  var obj = new clazz(1);
+
+  assert.equal(obj.toString(), expected);
+  assert.equal(Object.prototype.toString.call(obj), expected);
+
+  obj = new DataView(obj);
+  assert.equal(obj.toString(), '[object DataView]');
+  assert.equal(Object.prototype.toString.call(obj), '[object DataView]');
+});
 
 // initialize a zero-filled buffer
 var buffer = new Buffer(8);