test: remove await from code samples (#1229)

* Remove await

Remove await from the sample. It is preventing the sample from working.

* Remove await from samples

await causes the code sample not to work so needs to be removed

* Restructure the OR query code sample

The OR query code sample should be run in a similar way to the other code samples.

* Cleanup and change assert

There is no guarantee that the integration test database will have no Buy Milk or Feed cats data in the database to begin with so we will have to make sure to remove all such data so that the test starts with no such data in datastore. This is a requirement for the console output to be correct.

Also, since we now use execSync, the standard output cannot be found in console.log.firstCall.args[0] so we have to get it from stdout just like in the other tests.

* inline the test variable

Inline simple local variables as suggested in PR feedback.

Author: danieljbruce

samples/export.js

@@ -40,7 +40,7 @@ async function main(bucket = 'YOUR_BUCKET_NAME') {
     console.log(specificExportOperation.result.outputUrl);
   }
 
-  await exportEntities();
+  exportEntities();
   // [END datastore_admin_entities_export]
 }
 

samples/import.js

@@ -45,7 +45,7 @@ async function main(file = 'YOUR_FILE_NAME') {
     await specificImportOperation.cancel();
   }
 
-  await importEntities();
+  importEntities();
   // [END datastore_admin_entities_import]
 }
 

samples/indexes.get.js

@@ -31,7 +31,7 @@ async function main(indexId = 'YOUR_INDEX_ID') {
     console.log('Properties:', metadata.properties);
   }
 
-  await getIndex();
+  getIndex();
   // [END datastore_admin_index_get]
 }
 

samples/indexes.list.js

@@ -37,7 +37,7 @@ async function main() {
       });
   }
 
-  await listIndexes();
+  listIndexes();
   // [END datastore_admin_index_list]
 }
 

samples/queryFilterOr.js

@@ -46,8 +46,9 @@ async function main() {
     }
   }
 
-  await queryFilterOr();
+  queryFilterOr();
   // [END datastore_query_filter_or]
 }
 
-exports.queryFilterOr = main;
+const args = process.argv.slice(2);
+main(...args).catch(console.error);

samples/test/queryFilterOr.test.js

@@ -20,12 +20,14 @@ const path = require('path');
 const {assert} = require('chai');
 const {describe, it, after, before} = require('mocha');
 const sinon = require('sinon');
-const {Datastore} = require('@google-cloud/datastore');
+const {Datastore, PropertyFilter, or} = require('@google-cloud/datastore');
 const datastore = new Datastore();
 
-const {queryFilterOr} = require('../queryFilterOr');
+const cp = require('child_process');
 let taskKey1, taskKey2;
 
+const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
+
 describe('Creating a union query', () => {
   const stubConsole = function () {
     sinon.stub(console, 'error');
@@ -57,6 +59,18 @@ describe('Creating a union query', () => {
       },
     };
 
+    // Ensure the datastore database has no existing data for the task keys.
+    const query = datastore
+      .createQuery('Task')
+      .filter(
+        or([
+          new PropertyFilter('description', '=', 'Buy milk'),
+          new PropertyFilter('description', '=', 'Feed cats'),
+        ])
+      );
+    const [entities] = await datastore.runQuery(query);
+    await datastore.delete(entities.map(entity => entity[datastore.KEY]));
+
     await datastore.upsert(entity1);
     await datastore.upsert(entity2);
   });
@@ -67,7 +81,6 @@ describe('Creating a union query', () => {
   });
 
   it('should get a combination of items from the Datastore', async () => {
-    await queryFilterOr();
-    assert.include(console.log.firstCall.args[0], 'Entity');
+    assert.strictEqual(execSync(`node ./queryFilterOr.js`), 'Entity found: Feed cats\nEntity found: Buy milk\n');
   });
 });