From bbd5ee854d4229e9a4c245624f85f2a89e5b2e62 Mon Sep 17 00:00:00 2001 From: Ace Nassri Date: Mon, 22 Aug 2016 12:57:16 -0700 Subject: [PATCH] Minor stylistic tweaks --- bigquery/system-test/export_data.test.js | 16 +++++++++------- bigquery/test/export_data.test.js | 22 ++++++++++------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bigquery/system-test/export_data.test.js b/bigquery/system-test/export_data.test.js index 58e4dc8226..5b7fc0b498 100644 --- a/bigquery/system-test/export_data.test.js +++ b/bigquery/system-test/export_data.test.js @@ -27,9 +27,9 @@ describe('bigquery:export_data', function () { it('should export data to GCS', function (done) { example.exportTableToGCS(options, function (err, job) { assert.ifError(err); - assert.notEqual(job, null); - assert.notEqual(job.id, null); - assert(job.id.length > 5); + assert(job, 'job is not null'); + assert(job.id, 'job has an id'); + assert(job.id.length > 5, 'job id is 5 characters or more'); jobId = job.id; setTimeout(done, 100); // Wait for export job to be submitted }); @@ -38,15 +38,17 @@ describe('bigquery:export_data', function () { describe('export_poll', function () { it('should fetch job status', function (done) { - assert.notEqual(jobId, null); + assert(jobId); var poller = function (tries) { example.pollExportJob(jobId, function (err, metadata) { if (!err || tries === 0) { - assert.ifError(err); - assert.equal(metadata.status.state, 'DONE'); + assert.ifError(err, 'no error occurred'); + assert.equal(metadata.status.state, 'DONE', 'export job is finished'); done(); } else { - setTimeout(function () { poller(tries - 1); }, 1000); + setTimeout(function () { + poller(tries - 1); + }, 1000); } }); }; diff --git a/bigquery/test/export_data.test.js b/bigquery/test/export_data.test.js index 7901e4ae02..ed75eb1ff5 100644 --- a/bigquery/test/export_data.test.js +++ b/bigquery/test/export_data.test.js @@ -123,12 +123,14 @@ describe('bigquery:export', function () { example.mocks.bigquery.job = sinon.stub().returns(example.mocks.job); example.program.pollExportJob(example.jobId, callback); - assert(example.mocks.bigquery.job.calledOnce); - assert(example.mocks.job.getMetadata.calledOnce); - assert(callback.calledOnce); - assert.equal(callback.firstCall.args.length, 2); - assert.equal(callback.firstCall.args[0], null); - assert.deepEqual(callback.firstCall.args[1], example.mocks.metadata); + assert(example.mocks.bigquery.job.calledOnce, 'job called once'); + assert(example.mocks.job.getMetadata.calledOnce, 'getMetadata called once'); + assert(callback.calledOnce, 'callback called once'); + assert.equal(callback.firstCall.args.length, 2, 'callback received 2 arguments'); + assert.equal(callback.firstCall.args[0], null, 'callback did not receive error'); + assert.deepEqual(callback.firstCall.args[1], example.mocks.metadata, + 'callback received metadata' + ); assert( console.log.calledWith('PollExportJob: job status: %s', example.mocks.metadata.status.state), @@ -148,9 +150,7 @@ describe('bigquery:export', function () { assert(example.mocks.job.getMetadata.calledOnce, 'getMetadata called once'); assert(callback.calledOnce, 'callback called once'); assert.equal(callback.firstCall.args.length, 1, 'callback received 1 argument'); - assert.deepEqual( - callback.firstCall.args[0], - new Error('Job %s is not done'), + assert.deepEqual(callback.firstCall.args[0], new Error('Job %s is not done'), 'callback received error' ); @@ -168,9 +168,7 @@ describe('bigquery:export', function () { assert.equal(callback.secondCall.args.length, 2, 'callback received 2 arguments'); assert.ifError(callback.secondCall.args[0], 'callback did not receive error'); - assert.deepEqual( - callback.secondCall.args[1], - example.mocks.metadata, + assert.deepEqual(callback.secondCall.args[1], example.mocks.metadata, 'callback received metadata' );