test: remove --proxyquire-shim from bigtable, spanner, and storage

core/common/package.json

@@ -20,7 +20,7 @@
   ],
   "scripts": {
     "docs": "jsdoc -c .jsdoc.js",
-    "test": "node ../../bin/run-test.cjs --proxyquire-shim build/test",
+    "test": "node ../../bin/run-test.cjs build/test",
     "prepare": "npm run compile",
     "pretest": "npm run compile",
     "compile": "tsc -p .",
@@ -57,6 +57,7 @@
     "@types/tmp": "^0.2.6",
     "c8": "^10.1.3",
     "codecov": "^3.8.3",
+    "google-test-utils": "^0.4.0",
     "gts": "^6.0.2",
     "jsdoc": "^4.0.4",
     "jsdoc-fresh": "^6.1.0",

core/common/test/service-object.ts

@@ -20,7 +20,8 @@ import {
 import * as assert from 'assert';
 import {describe, it, beforeEach, afterEach} from 'mocha';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
+// eslint-disable-next-line import/namespace
 import * as r from 'teeny-request';
 import * as sinon from 'sinon';
 

core/common/test/service.ts

@@ -15,7 +15,7 @@
 import * as assert from 'assert';
 import {describe, it, before, beforeEach, after} from 'mocha';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {Request} from 'teeny-request';
 import {AuthClient, GoogleAuth, OAuth2Client} from 'google-auth-library';
 

core/common/test/util.ts

@@ -26,7 +26,7 @@ import {
   OAuth2Client,
 } from 'google-auth-library';
 import * as nock from 'nock';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as retryRequest from 'retry-request';
 import * as sinon from 'sinon';
 import * as stream from 'stream';

handwritten/bigquery/package.json

@@ -36,7 +36,7 @@
     "docs": "jsdoc -c .jsdoc.js",
     "lint": "gts check",
     "samples-test": "cd samples/ && pnpm link ../ && pnpm test && cd ../",
-    "test": "node ../../bin/run-test.cjs --proxyquire-shim build/test",
+    "test": "node ../../bin/run-test.cjs build/test",
     "system-test": "node ../../bin/run-test.cjs build/system-test --timeout 600000",
     "presystem-test": "pnpm run compile",
     "clean": "gts clean",
@@ -91,6 +91,7 @@
     "codecov": "^3.8.3",
     "discovery-tsd": "^0.3.0",
     "eslint-plugin-prettier": "^5.2.6",
+    "google-test-utils": "^0.4.0",
     "gts": "^6.0.2",
     "jsdoc": "^4.0.4",
     "jsdoc-fresh": "^6.1.0",

handwritten/bigquery/system-test/arrow.ts

@@ -562,7 +562,8 @@ describe('Arrow Query Results', () => {
 
   it('should raise the same error as query() when a jobs.insert query fails during execution', async () => {
     const failingQuery = {
-      query: 'SELECT 1 / 0',
+      query:
+        'DECLARE n INT64 DEFAULT 50; SELECT 1 / (x - 50) FROM UNNEST(GENERATE_ARRAY(1, n)) AS x ORDER BY x;',
       jobTimeoutMs: 60000,
       useQueryCache: false,
     };

handwritten/bigquery/test/bigquery.ts

@@ -24,7 +24,7 @@ import * as assert from 'assert';
 import {describe, it, after, afterEach, before, beforeEach} from 'mocha';
 import * as Big from 'big.js';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import * as crypto from 'crypto';
 

handwritten/bigquery/test/dataset.ts

@@ -22,7 +22,7 @@ import * as pfy from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {describe, it, before, beforeEach} from 'mocha';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 import * as _root from '../src';
 import {toArray} from '../src/util';

handwritten/bigquery/test/job.ts

@@ -16,7 +16,7 @@ import {DecorateRequestOptions, util} from '@google-cloud/common';
 import * as pfy from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {describe, it, beforeEach, afterEach, before} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 
 import {BigQuery} from '../src/bigquery';

handwritten/bigquery/test/model.ts

@@ -15,7 +15,7 @@
 import * as assert from 'assert';
 import {describe, it, before, beforeEach, afterEach} from 'mocha';
 import * as sinon from 'sinon';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as pfy from '@google-cloud/promisify';
 import {EventEmitter} from 'events';
 import {JobOptions} from '../src/job';

handwritten/bigquery/test/routine.ts

@@ -17,7 +17,7 @@ import * as pfy from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {describe, it, before, beforeEach} from 'mocha';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 import * as _root from '../src';
 

handwritten/bigquery/test/rowQueue.ts

@@ -16,7 +16,7 @@ import {util} from '@google-cloud/common';
 import * as assert from 'assert';
 import {describe, it, before, beforeEach, afterEach} from 'mocha';
 import {Duplex, Stream} from 'stream';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import * as q from '../src/rowQueue';
 import * as t from '../src/table';

handwritten/bigquery/test/table.ts

@@ -26,7 +26,7 @@ import {describe, it, afterEach, beforeEach, before, after} from 'mocha';
 import * as Big from 'big.js';
 import {EventEmitter} from 'events';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import * as stream from 'stream';
 import * as crypto from 'crypto';

handwritten/bigtable/package.json

@@ -42,7 +42,7 @@
     "presystem-test": "pnpm run compile",
     "system-test": "node ../../bin/run-test.cjs build/system-test --timeout 600000 --retries 3",
     "pretest": "pnpm run compile",
-    "test": "node ../../bin/run-test.cjs --proxyquire-shim build/test",
+    "test": "node ../../bin/run-test.cjs build/test",
     "test:snap": "SNAPSHOT_UPDATE=1 pnpm test",
     "testproxy": "pnpm run compile && node build/testproxy/index.js",
     "clean": "gts clean",
@@ -93,6 +93,7 @@
     "c8": "^10.1.3",
     "codecov": "^3.8.3",
     "gapic-tools": "^2.2.0",
+    "google-test-utils": "^0.4.0",
     "gts": "^6.0.2",
     "jsdoc": "^4.0.4",
     "jsdoc-fresh": "^6.1.0",

handwritten/bigtable/system-test/client-side-metrics-all-methods.ts

@@ -21,7 +21,7 @@ import {
 import {ResourceMetrics} from '@opentelemetry/sdk-metrics';
 import * as assert from 'assert';
 import {GCPMetricsHandler} from '../src/client-side-metrics/gcp-metrics-handler';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {Bigtable, RawFilter} from '../src';
 import {Mutation} from '../src/mutation';
 import {Row} from '../src/row';

handwritten/bigtable/system-test/client-side-metrics.ts

@@ -21,7 +21,7 @@ import {
 import {ResourceMetrics} from '@opentelemetry/sdk-metrics';
 import * as assert from 'assert';
 import {GCPMetricsHandler} from '../src/client-side-metrics/gcp-metrics-handler';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {Bigtable, BigtableOptions} from '../src';
 import {Row} from '../src/row';
 import {

handwritten/bigtable/system-test/gcp-metrics-handler.ts

@@ -26,7 +26,7 @@ import {Bigtable} from '../src';
 import {ResourceMetrics} from '@opentelemetry/sdk-metrics';
 import * as assert from 'assert';
 import {ClientOptions} from 'google-gax';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 function getHandler(Exporter: typeof CloudMonitoringExporter) {
   const FakeCGPMetricsHandler = proxyquire(

handwritten/bigtable/system-test/read-rows.ts

@@ -26,7 +26,7 @@ import {EventEmitter} from 'events';
 import {Test} from './testTypes';
 import {ServiceError, GrpcClient, GoogleError, CallOptions} from 'google-gax';
 import {PassThrough} from 'stream';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {TabularApiSurface} from '../src/tabular-api-surface';
 import * as mocha from 'mocha';
 import {generateId} from './common';
@@ -141,7 +141,10 @@ describe('Bigtable/Table', () => {
             'An error should have been thrown because the client is closed',
           );
         } catch (err: any) {
-          assert.strictEqual(err.message, 'The client has already been closed.');
+          assert.strictEqual(
+            err.message,
+            'The client has already been closed.',
+          );
         }
       } finally {
         const bigtableSecondClient = new Bigtable();

handwritten/bigtable/test/app-profile.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {describe, it, before, beforeEach} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {CallOptions} from 'google-gax';
 
 let promisified = false;
@@ -48,7 +48,7 @@
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     id: any;
     name: string;
     bigtable: any;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     constructor(instance: any, id: any) {
       this.instance = instance;

handwritten/bigtable/test/backup.ts

@@ -16,7 +16,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, describe, it, afterEach} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as pumpify from 'pumpify';
 import {ServiceError} from 'google-gax';
 
@@ -259,7 +259,7 @@
         (
           err?: ServiceError | Error | null,
           backup?: Backup | null,
           config?: any,
         ) => {
           assert.strictEqual(
             backup?.name,

handwritten/bigtable/test/base64keymap.ts

@@ -13,14 +13,13 @@
 // limitations under the License.
 
 import * as assert from 'assert';
 import {describe, it, before, beforeEach, afterEach} from 'mocha';
 import Long = require('long');
-import * as proxyquire from 'proxyquire';
 import * as sn from 'sinon';
 
 import {RowStateEnum} from '../src/chunktransformer.js';
 import {Mutation} from '../src/mutation.js';
 import {Row} from '../src/row.js';
 import {EncodedKeyMap, SqlValue} from '../src/execute-query/values.js';
 
 describe('Bigtable/EncodedKeyMap', () => {

handwritten/bigtable/test/chunktransformer.ts

@@ -15,7 +15,7 @@
 import * as assert from 'assert';
 import {describe, it, before, beforeEach, afterEach} from 'mocha';
 import Long = require('long');
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sn from 'sinon';
 
 import {RowStateEnum} from '../src/chunktransformer.js';

handwritten/bigtable/test/cluster.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {PassThrough, Readable} from 'stream';
 import {CallOptions} from 'google-gax';
 import {PreciseDate} from '@google-cloud/precise-date';

handwritten/bigtable/test/executequery.ts

@@ -15,7 +15,7 @@ import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
 import * as sinon from 'sinon';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {grpc} from 'google-gax';
 import * as inst from '../src/instance';
 import {Bigtable} from '../src';

handwritten/bigtable/test/family.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import {protos} from '@google-cloud/bigtable-api';
 import google = protos.google;

handwritten/bigtable/test/filter.ts

@@ -14,7 +14,7 @@
 
 import * as assert from 'assert';
 import {afterEach, before, beforeEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import * as fr from '../src/filter';
 import {Row} from '../src/row';

handwritten/bigtable/test/index.ts

@@ -17,7 +17,7 @@ import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {afterEach, before, beforeEach, describe, it} from 'mocha';
 import * as gax from 'google-gax';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sn from 'sinon';
 
 import {Cluster} from '../src/cluster.js';
@@ -1216,6 +1216,7 @@ describe('Bigtable', () => {
   });
   describe('close', () => {
     it('should have failed request after close is called', done => {
+      // eslint-disable-next-line promise/catch-or-return, promise/always-return
       bigtable.close().then(() => {
         bigtable.getInstances((err: Error) => {
           if (err) {

handwritten/bigtable/test/instance.ts

@@ -16,7 +16,7 @@ import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
 import * as sinon from 'sinon';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {ServiceError} from 'google-gax';
 import * as snapshot from 'snap-shot-it';
 import {Readable} from 'stream';

handwritten/bigtable/test/metric-service-client-credentials.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {ClientOptions, grpc} from 'google-gax';
 import * as assert from 'assert';
 import {MetricServiceClient} from '@google-cloud/monitoring';

handwritten/bigtable/test/metrics-collector/gcp-metrics-handler.ts

@@ -30,7 +30,7 @@ import {
 } from '../../test-common/expected-otel-export-input';
 import * as assert from 'assert';
 import {replaceTimestamps} from '../../test-common/replace-timestamps';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 /**
  * Cleans a ResourceMetrics object by replacing client UUIDs with a placeholder.

handwritten/bigtable/test/metrics-collector/metrics-collector.ts

@@ -23,7 +23,7 @@ import {
 import {grpc} from 'google-gax';
 import {expectedRequestsHandled} from '../../test-common/metrics-handler-fixture';
 import * as gax from 'google-gax';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {GCPMetricsHandler} from '../../src/client-side-metrics/gcp-metrics-handler';
 import {getProtoPath} from '../../src/utils/protos';
 const protoPath = getProtoPath('google/bigtable/v2/response_params.proto');

handwritten/bigtable/test/row.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {afterEach, beforeEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import {Mutation} from '../src/mutation.js';
 import '../src/table';

handwritten/bigtable/test/table.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {afterEach, before, beforeEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as pumpify from 'pumpify';
 import * as sinon from 'sinon';
 import {PassThrough, Writable, Duplex} from 'stream';

handwritten/datastore/package.json

@@ -38,7 +38,7 @@
     "presystem-test": "npm run compile",
     "system-test": "node ../../bin/run-test.cjs build/system-test --timeout 600000",
     "pretest": "npm run compile",
-    "test": "node ../../bin/run-test.cjs --proxyquire-shim build/test",
+    "test": "node ../../bin/run-test.cjs build/test",
     "precompile": "gts clean"
   },
   "dependencies": {
@@ -68,6 +68,7 @@
     "async": "^3.2.6",
     "c8": "^10.1.3",
     "gapic-tools": "^2.2.0",
+    "google-test-utils": "^0.4.0",
     "gts": "^6.0.2",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.4",

handwritten/datastore/system-test/transaction-spy.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {DatastoreRequest} from '../src';
 import {RequestCallback, RequestConfig} from '../src/request';
 

handwritten/datastore/test/gapic-mocks/client-initialization-testing.ts

@@ -21,7 +21,7 @@ import {
   DatastoreOptions,
 } from '../../src';
 import * as assert from 'assert';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {Callback, CallOptions} from 'google-gax';
 import * as protos from '../../src/protos';
 import * as ds from '../../src';

handwritten/datastore/test/index-class.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 import * as ds from '../src';
 

handwritten/datastore/test/index.ts

@@ -15,7 +15,7 @@
 import * as assert from 'assert';
 import {before, beforeEach, after, afterEach, describe, it} from 'mocha';
 import * as gax from 'google-gax';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {PassThrough, Readable} from 'stream';
 
 import * as ds from '../src';