test: cleanup

stephenplusplus · stephenplusplus · commit f83a4112f2a3 · 2014-12-16T16:39:22.000-05:00
diff --git a/package.json b/package.json
@@ -67,7 +67,6 @@
     "mocha": "^2.0.1",
     "mockery": "^1.4.0",
     "power-assert": "^0.10.0",
-    "sandboxed-module": "^1.0.1",
     "tmp": "0.0.24"
   },
   "scripts": {
diff --git a/regression/bigquery.js b/regression/bigquery.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var async = require('async');
 var Dataset = require('../lib/bigquery/dataset');
 var env = require('./env');
diff --git a/regression/datastore.js b/regression/datastore.js
@@ -20,7 +20,7 @@
 
 var env = require('./env.js');
 
-var assert = require('assert');
+var assert = require('power-assert');
 var async = require('async');
 var datastore = require('../lib/datastore');
 var ds = datastore.dataset(env);
diff --git a/regression/pubsub.js b/regression/pubsub.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var async = require('async');
 
 var env = require('./env.js');
diff --git a/regression/storage.js b/regression/storage.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var async = require('async');
 var crypto = require('crypto');
 var fs = require('fs');
diff --git a/test/bigquery/dataset.js b/test/bigquery/dataset.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var Dataset = require('../../lib/bigquery/dataset');
 var Table = require('../../lib/bigquery/table');
 var util = require('../../lib/common/util');
diff --git a/test/bigquery/job.js b/test/bigquery/job.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var Job = require('../../lib/bigquery/job');
 var util = require('../../lib/common/util');
 
diff --git a/test/bigquery/table.js b/test/bigquery/table.js
@@ -18,12 +18,11 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var extend = require('extend');
 var File = require('../../lib/storage/file');
 var mockery = require('mockery');
-var Stream = require('stream');
-var through = require('through2');
+var stream = require('stream');
 var util = require('../../lib/common/util');
 
 function FakeFile(a, b) {
@@ -35,7 +34,6 @@ var fakeUtil = extend({}, util, {
   makeWritableStream: function() {
     var args = [].slice.call(arguments);
     (makeWritableStream_Override || util.makeWritableStream).apply(null, args);
-    makeWritableStream_Override = null;
   }
 });
 
@@ -81,6 +79,7 @@ describe('BigQuery/Table', function() {
   });
 
   beforeEach(function() {
+    makeWritableStream_Override = null;
     table = new Table(DATASET, TABLE_ID);
   });
 
@@ -221,7 +220,7 @@ describe('BigQuery/Table', function() {
 
   describe('createReadStream', function() {
     it('should return a stream', function() {
-      assert(table.createReadStream() instanceof Stream);
+      assert(table.createReadStream() instanceof stream.Stream);
     });
 
     it('should call getRows() when asked for data', function(done) {
@@ -339,7 +338,7 @@ describe('BigQuery/Table', function() {
     });
 
     it('should return a stream', function() {
-      assert(table.createWriteStream() instanceof Stream);
+      assert(table.createWriteStream() instanceof stream.Stream);
     });
 
     describe('writable stream', function() {
@@ -699,7 +698,7 @@ describe('BigQuery/Table', function() {
 
     it('should accept just a File and a callback', function(done) {
       table.createWriteStream = function() {
-        var ws = new Stream.Writable();
+        var ws = new stream.Writable();
         setImmediate(function() {
           ws.emit('complete');
           ws.end();
@@ -712,16 +711,16 @@ describe('BigQuery/Table', function() {
 
     it('should return a stream when a string is given', function() {
       table.createWriteStream = function() {
-        return new Stream.Writable();
+        return new stream.Writable();
       };
 
-      assert(table.import(FILEPATH) instanceof Stream);
+      assert(table.import(FILEPATH) instanceof stream.Stream);
     });
 
     it('should infer the file format from the given filepath', function(done) {
       table.createWriteStream = function(metadata) {
         assert.equal(metadata.sourceFormat, 'NEWLINE_DELIMITED_JSON');
-        var ws = new Stream.Writable();
+        var ws = new stream.Writable();
         setImmediate(function() {
           ws.emit('complete');
           ws.end();
@@ -735,7 +734,7 @@ describe('BigQuery/Table', function() {
     it('should not infer the file format if one is given', function(done) {
       table.createWriteStream = function(metadata) {
         assert.equal(metadata.sourceFormat, 'CSV');
-        var ws = new Stream.Writable();
+        var ws = new stream.Writable();
         setImmediate(function() {
           ws.emit('complete');
           ws.end();
diff --git a/test/common/util.js b/test/common/util.js
@@ -18,12 +18,12 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var duplexify = require('duplexify');
 var gsa = require('google-service-account');
 var mockery = require('mockery');
 var request = require('request');
-var Stream = require('stream');
+var stream = require('stream');
 
 var gsa_Override;
 function fakeGsa() {
@@ -172,7 +172,7 @@ describe('common/util', function() {
     it('should emit an error', function(done) {
       var error = new Error('Error.');
 
-      var ws = new Stream.Writable();
+      var ws = new stream.Writable();
       ws.on('error', function(err) {
         assert.equal(err, error);
         done();
@@ -235,7 +235,7 @@ describe('common/util', function() {
 
     it('should set the writable stream', function(done) {
       var dup = duplexify();
-      var ws = new Stream.Writable();
+      var ws = new stream.Writable();
       ws.write = function() {};
 
       request_Override = function() {
@@ -256,7 +256,7 @@ describe('common/util', function() {
 
     it('should keep the pipe open on the stream', function(done) {
       var dup = duplexify();
-      var ws = new Stream.Writable();
+      var ws = new stream.Writable();
       ws.write = function() {};
 
       request_Override = function() {
diff --git a/test/datastore/dataset.js b/test/datastore/dataset.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var Dataset = require('../../lib/datastore/dataset');
 var util = require('../../lib/common/util.js');
 
diff --git a/test/datastore/entity.js b/test/datastore/entity.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var entity = require('../../lib/datastore/entity.js');
 var datastore = require('../../lib/datastore');
 var ByteBuffer = require('bytebuffer');
diff --git a/test/datastore/index.js b/test/datastore/index.js
@@ -29,7 +29,7 @@ var entity = {
   doubleCalledWith: null
 };
 
-var assert = require('assert');
+var assert = require('power-assert');
 var mockery = require('mockery');
 
 describe('Datastore', function() {
diff --git a/test/datastore/query.js b/test/datastore/query.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var datastore = require('../../lib/datastore');
 var entity = require('../../lib/datastore/entity.js');
 var Query = require('../../lib/datastore/query.js');
diff --git a/test/datastore/request.js b/test/datastore/request.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var ByteBuffer = require('bytebuffer');
 var entity = require('../../lib/datastore/entity.js');
 var extend = require('extend');
@@ -27,7 +27,7 @@ var mockery = require('mockery');
 var mockRespGet = require('../testdata/response_get.json');
 var pb = require('../../lib/datastore/pb.js');
 var Query = require('../../lib/datastore/query.js');
-var Stream = require('stream');
+var stream = require('stream');
 var util = require('../../lib/common/util.js');
 
 var httpsRequestCached = https.request;
@@ -364,7 +364,7 @@ describe('Request', function() {
 
     describe('streams', function() {
       it('should be a stream if a callback is omitted', function() {
-        assert(request.runQuery(query) instanceof Stream);
+        assert(request.runQuery(query) instanceof stream.Stream);
       });
 
       it('should run the query after being read from', function(done) {
@@ -495,7 +495,7 @@ describe('Request', function() {
       httpsRequestOverride = function(req) {
         assert.deepEqual(req, mockRequest);
         done();
-        return new Stream.Writable();
+        return new stream.Writable();
       };
       request.makeAuthorizedRequest_ = function(opts, callback) {
         (callback.onAuthorized || callback)(null, mockRequest);
@@ -522,7 +522,7 @@ describe('Request', function() {
         done();
       };
       httpsRequestOverride = function(req, callback) {
-        var ws = new Stream.Writable();
+        var ws = new stream.Writable();
         callback(ws);
         ws.emit('end');
         return ws;
@@ -595,12 +595,12 @@ describe('Request', function() {
         it('should not attach transactional properties', function(done) {
           var expected = new pb.LookupRequest().toBuffer();
           httpsRequestOverride = function() {
-            var stream = new Stream.Writable();
-            stream.write = function(data) {
+            var ws = new stream.Writable();
+            ws.write = function(data) {
               assert.deepEqual(data, expected);
               done();
             };
-            return stream;
+            return ws;
           };
           request.makeReq_('lookup', util.noop);
         });
diff --git a/test/datastore/transaction.js b/test/datastore/transaction.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var entity = require('../../lib/datastore/entity.js');
 var extend = require('extend');
 var mockery = require('mockery');
diff --git a/test/pubsub/index.js b/test/pubsub/index.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var mockery = require('mockery');
 var request = require('request');
 var Subscription = require('../../lib/pubsub/subscription.js');
diff --git a/test/pubsub/subscription.js b/test/pubsub/subscription.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var util = require('../../lib/common/util.js');
 var Subscription = require('../../lib/pubsub/subscription.js');
 
diff --git a/test/pubsub/topic.js b/test/pubsub/topic.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var mockery = require('mockery');
 var util = require('../../lib/common/util.js');
 
diff --git a/test/storage/acl.js b/test/storage/acl.js
@@ -19,7 +19,7 @@
 'use strict';
 
 var Acl = require('../../lib/storage/acl.js');
-var assert = require('assert');
+var assert = require('power-assert');
 var storage = require('../../lib/storage/index.js');
 var util = require('../../lib/common/util.js');
 
diff --git a/test/storage/bucket.js b/test/storage/bucket.js
@@ -18,10 +18,10 @@
 
 'use strict';
 
-var assert = require('assert');
+var assert = require('power-assert');
 var mockery = require('mockery');
 var request = require('request');
-var Stream = require('stream');
+var stream = require('stream');
 var util = require('../../lib/common/util.js');
 
 function FakeFile(bucket, name, metadata) {
@@ -30,7 +30,7 @@ function FakeFile(bucket, name, metadata) {
   this.metadata = metadata;
   this.createWriteStream = function(options) {
     this.metadata = options.metadata;
-    var ws = new Stream.Writable();
+    var ws = new stream.Writable();
     ws.write = function() {
       ws.emit('complete');
     };
@@ -359,7 +359,7 @@ describe('Bucket', function() {
       var fakeFile = new FakeFile(bucket, 'file-name');
       var options = { destination: fakeFile };
       fakeFile.createWriteStream = function(options) {
-        var ws = new Stream.Writable();
+        var ws = new stream.Writable();
         ws.write = util.noop;
         setImmediate(function() {
           var expectedContentType = 'application/json; charset=utf-8';
@@ -375,7 +375,7 @@ describe('Bucket', function() {
       var fakeFile = new FakeFile(bucket, 'file-name');
       var options = { destination: fakeFile };
       fakeFile.createWriteStream = function(options) {
-        var ws = new Stream.Writable();
+        var ws = new stream.Writable();
         ws.write = util.noop;
         setImmediate(function() {
           var expectedContentType = 'text/plain; charset=utf-8';
@@ -392,7 +392,7 @@ describe('Bucket', function() {
       var metadata = { contentType: 'made-up-content-type' };
       var options = { destination: fakeFile, metadata: metadata };
       fakeFile.createWriteStream = function(options) {
-        var ws = new Stream.Writable();
+        var ws = new stream.Writable();
         ws.write = util.noop;
         setImmediate(function() {
           assert.equal(options.metadata.contentType,  metadata.contentType);
@@ -407,7 +407,7 @@ describe('Bucket', function() {
       var fakeFile = new FakeFile(bucket, 'file-name');
       var options = { destination: fakeFile, resumable: false };
       fakeFile.createWriteStream = function(options) {
-        var ws = new Stream.Writable();
+        var ws = new stream.Writable();
         ws.write = util.noop;
         setImmediate(function() {
           assert.strictEqual(options.resumable, false);
@@ -423,7 +423,7 @@ describe('Bucket', function() {
       var fakeFile = new FakeFile(bucket, 'file-name');
       var options = { destination: fakeFile };
       fakeFile.createWriteStream = function() {
-        var ws = new Stream.Writable();
+        var ws = new stream.Writable();
         setImmediate(function() {
           ws.emit('error', error);
         });
diff --git a/test/storage/file.js b/test/storage/file.js
diff --git a/test/storage/index.js b/test/storage/index.js
