Merge pull request #870 from stephenplusplus/spp--coverage-coverage

Bring test coverage to 100%
googleapis · Sep 17, 2015 · 1716bae · 1716bae
2 parents 469c3ac + 3713fa5
commit 1716bae
Show file tree

Hide file tree

Showing 28 changed files with 490 additions and 148 deletions.
diff --git a/lib/bigquery/dataset.js b/lib/bigquery/dataset.js
@@ -159,7 +159,7 @@ Dataset.prototype.delete = function(options, callback) {
  *
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request
- * @param {object} callback.metadata - The Dataset metadata
+ * @param {object} callback.metadata - The dataset's metadata.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -284,28 +284,27 @@ Dataset.prototype.query = function(options, callback) {
  * @param {object} metadata - Metadata to save on the Dataset.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request
- * @param {object} callback.metadata - The metadata of the Dataset object.
- * @param {object} callback.apiResponse - The full API response.
+  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
  * var metadata = {
  *   description: 'Information for every institution in the 2013 IPEDS universe'
  * };
  *
- * dataset.setMetadata(metadata, function(err, metadata, apiResponse) {});
+ * dataset.setMetadata(metadata, function(err, apiResponse) {});
  */
 Dataset.prototype.setMetadata = function(metadata, callback) {
   var that = this;
 
   this.makeReq_('PATCH', '', null, metadata, function(err, resp) {
     if (err) {
-      callback(err, null, resp);
+      callback(err, resp);
       return;
     }
 
     that.metadata = resp;
 
-    callback(null, that.metadata, resp);
+    callback(null, resp);
   });
 };
 

diff --git a/lib/bigquery/table.js b/lib/bigquery/table.js
@@ -587,9 +587,9 @@ Table.prototype.getRows = function(options, callback) {
 
     if (resp.rows && resp.rows.length > 0 && !that.metadata.schema) {
       // We don't know the schema for this table yet. Do a quick stat.
-      that.getMetadata(function(err) {
+      that.getMetadata(function(err, metadata, apiResponse) {
         if (err) {
-          onComplete(err);
+          onComplete(err, null, null, apiResponse);
           return;
         }
 
@@ -867,8 +867,7 @@ Table.prototype.query = function(query, callback) {
  *     a [Table resource](http://goo.gl/sl8Dmg) for more detailed information.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {object} callback.metadata - The metadata of the Table.
- * @param {object} callback.apiResponse - The full API response.
+  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
  * var metadata = {
@@ -892,13 +891,13 @@ Table.prototype.setMetadata = function(metadata, callback) {
 
   this.makeReq_('PUT', '', null, metadata, function(err, resp) {
     if (err) {
-      callback(err, null, resp);
+      callback(err, resp);
       return;
     }
 
     that.metadata = resp;
 
-    callback(null, that.metadata, resp);
+    callback(null, resp);
   });
 };
 

diff --git a/lib/compute/firewall.js b/lib/compute/firewall.js
@@ -103,7 +103,7 @@ Firewall.prototype.delete = function(callback) {
  *
  * @param {function=} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request
- * @param {object} callback.metadata - The network's metadata.
+ * @param {object} callback.metadata - The firewall's metadata.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example

diff --git a/lib/compute/snapshot.js b/lib/compute/snapshot.js
@@ -100,7 +100,7 @@ Snapshot.prototype.delete = function(callback) {
  *
  * @param {function=} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request
- * @param {object} callback.metadata - The zone's metadata.
+ * @param {object} callback.metadata - The snapshot's metadata.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example

diff --git a/lib/datastore/dataset.js b/lib/datastore/dataset.js
@@ -244,14 +244,14 @@ Dataset.prototype.createQuery = function(namespace, kind) {
  *
  *     done();
  *   });
- * }, function(err) {});
+ * }, function(err, apiResponse) {});
  */
 Dataset.prototype.runInTransaction = function(fn, callback) {
   var newTransaction = this.createTransaction_();
 
-  newTransaction.begin_(function(err) {
+  newTransaction.begin_(function(err, resp) {
     if (err) {
-      callback(err);
+      callback(err, resp);
       return;
     }
 

diff --git a/lib/datastore/transaction.js b/lib/datastore/transaction.js
@@ -383,15 +383,4 @@ Transaction.prototype.save = function(entities) {
   });
 };
 
-/**
- * mapQuery
- *
- * @todo Implement.
- *
- * @private
- */
-Transaction.prototype.mapQuery = function() {
-  throw new Error('not yet implemented');
-};
-
 module.exports = Transaction;
diff --git a/lib/search/index.js b/lib/search/index.js
@@ -197,8 +197,8 @@ Search.prototype.getIndexes = function(query, callback) {
     var indexes = (resp.indexes || []).map(function(indexObject) {
       var index = self.index(indexObject.indexId);
 
-      if (is.object(resp.indexedField)) {
-        index.fields = resp.indexedField;
+      if (is.object(indexObject.indexedField)) {
+        index.fields = indexObject.indexedField;
       }
 
       return index;

diff --git a/lib/storage/bucket.js b/lib/storage/bucket.js
@@ -824,7 +824,6 @@ Bucket.prototype.makePublic = function(options, callback) {
  * @param {object} metadata - The metadata you wish to set.
  * @param {function=} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request
- * @param {object} callback.metadata - The bucket's metadata.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -836,7 +835,7 @@ Bucket.prototype.makePublic = function(options, callback) {
  *     mainPageSuffix: 'http://example.com',
  *     notFoundPage: 'http://example.com/404.html'
  *   }
- * }, function(err, metadata, apiResponse) {});
+ * }, function(err, apiResponse) {});
  *
  * //-
  * // Enable versioning for your bucket.
@@ -845,21 +844,21 @@ Bucket.prototype.makePublic = function(options, callback) {
  *   versioning: {
  *     enabled: true
  *   }
- * }, function(err, metadata, apiResponse) {});
+ * }, function(err, apiResponse) {});
  */
 Bucket.prototype.setMetadata = function(metadata, callback) {
   var that = this;
   callback = callback || util.noop;
 
   this.makeReq_('PATCH', '', null, metadata, function(err, resp) {
     if (err) {
-      callback(err, null, resp);
+      callback(err, resp);
       return;
     }
 
     that.metadata = resp;
 
-    callback(null, that.metadata, resp);
+    callback(null, resp);
   });
 };
 

diff --git a/lib/storage/file.js b/lib/storage/file.js
@@ -1264,7 +1264,6 @@ File.prototype.getSignedUrl = function(options, callback) {
  * @param {object} metadata - The metadata you wish to update.
  * @param {function=} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request
- * @param {object} callback.metadata - The File's metadata.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1274,7 +1273,7 @@ File.prototype.getSignedUrl = function(options, callback) {
  *     my: 'custom',
  *     properties: 'go here'
  *   }
- * }, function(err, metadata, apiResponse) {});
+ * }, function(err, apiResponse) {});
  *
  * // Assuming current metadata = { hello: 'world', unsetMe: 'will do' }
  * file.setMetadata({
@@ -1283,7 +1282,7 @@ File.prototype.getSignedUrl = function(options, callback) {
  *     unsetMe: null, // will be unset (deleted).
  *     hello: 'goodbye' // will be updated from 'hello' to 'goodbye'.
  *   }
- * }, function(err, metadata, apiResponse) {
+ * }, function(err, apiResponse) {
  *   // metadata should now be { abc: '123', hello: 'goodbye' }
  * });
  */
@@ -1300,13 +1299,13 @@ File.prototype.setMetadata = function(metadata, callback) {
 
   this.makeReq_('PATCH', path, query, metadata, function(err, resp) {
     if (err) {
-      callback(err, null, resp);
+      callback(err, resp);
       return;
     }
 
     that.metadata = resp;
 
-    callback(null, that.metadata, resp);
+    callback(null, resp);
   });
 };
 
@@ -1351,13 +1350,13 @@ File.prototype.makePrivate = function(options, callback) {
 
   this.makeReq_('PATCH', path, query, metadata, function(err, resp) {
     if (err) {
-      callback(err);
+      callback(err, resp);
       return;
     }
 
     that.metadata = resp;
 
-    callback(null);
+    callback(null, resp);
   });
 };
 

diff --git a/system-test/bigquery.js b/system-test/bigquery.js
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-/*global describe, it, before, after */
-
 'use strict';
 
 var assert = require('assert');

diff --git a/system-test/compute.js b/system-test/compute.js
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 'use strict';
 
 var assert = require('assert');

diff --git a/system-test/datastore.js b/system-test/datastore.js
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-/*global describe, it, after, before */
-
 'use strict';
 
 var env = require('./env.js');

diff --git a/test/bigquery/dataset.js b/test/bigquery/dataset.js
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-/*global describe, it, beforeEach */
-
 'use strict';
 
 var arrify = require('arrify');
@@ -441,13 +439,17 @@ describe('BigQuery/Dataset', function() {
       ds.setMetadata(METADATA, assert.ifError);
     });
 
-    it('should execute callback with error', function(done) {
+    it('should execute callback with error & API response', function(done) {
       var error = new Error('Error.');
+      var apiResponse = {};
+
       ds.makeReq_ = function(method, path, query, body, callback) {
-        callback(error);
+        callback(error, apiResponse);
       };
-      ds.setMetadata(METADATA, function(err) {
-        assert.equal(err, error);
+
+      ds.setMetadata(METADATA, function(err, apiResponse_) {
+        assert.strictEqual(err, error);
+        assert.strictEqual(apiResponse_, apiResponse);
         done();
       });
     });
@@ -467,16 +469,8 @@ describe('BigQuery/Dataset', function() {
         });
       });
 
-      it('should execute callback with metadata', function(done) {
-        ds.setMetadata(METADATA, function(err, metadata) {
-          assert.ifError(err);
-          assert.deepEqual(metadata, METADATA);
-          done();
-        });
-      });
-
       it('should execute callback with apiResponse', function(done) {
-        ds.setMetadata(METADATA, function(err, metadata, apiResponse) {
+        ds.setMetadata(METADATA, function(err, apiResponse) {
           assert.ifError(err);
           assert.deepEqual(apiResponse, METADATA);
           done();

diff --git a/test/bigquery/job.js b/test/bigquery/job.js
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-/*global describe, it, beforeEach */
-
 'use strict';
 
 var assert = require('assert');