diff --git a/system-test/trace-express.js b/system-test/trace-express.js index e21269d73..e2fa2c5b9 100644 --- a/system-test/trace-express.js +++ b/system-test/trace-express.js @@ -44,6 +44,7 @@ const tracer = require('../').start({ require('hard-rejection')(); const assert = require('assert'); +const {describe, it} = require('mocha'); const googleAuth = require('google-auto-auth'); const got = require('got'); const queryString = require('querystring'); diff --git a/test/plugins/test-cls-bluebird.ts b/test/plugins/test-cls-bluebird.ts index ddd821ecc..61471754d 100644 --- a/test/plugins/test-cls-bluebird.ts +++ b/test/plugins/test-cls-bluebird.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {bluebird_3 as BluebirdPromise} from '../../src/plugins/types'; import {Trace} from '../../src/trace'; diff --git a/test/plugins/test-trace-google-gax.ts b/test/plugins/test-trace-google-gax.ts index d083c4bf3..ed758673c 100644 --- a/test/plugins/test-trace-google-gax.ts +++ b/test/plugins/test-trace-google-gax.ts @@ -34,6 +34,7 @@ */ import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as testTraceModule from '../trace'; import {describeInterop} from '../utils'; diff --git a/test/plugins/test-trace-grpc.ts b/test/plugins/test-trace-grpc.ts index ba65b39fb..0cfb174c6 100644 --- a/test/plugins/test-trace-grpc.ts +++ b/test/plugins/test-trace-grpc.ts @@ -19,6 +19,7 @@ import { TraceLabels } from '../../src/trace-labels'; import * as TracingPolicy from '../../src/tracing-policy'; import * as util from '../../src/util'; import * as assert from 'assert'; +import {describe, it} from 'mocha'; import { asRootSpanData, describeInterop, DEFAULT_SPAN_DURATION, assertSpanDuration } from '../utils'; import { Span } from '../../src/plugin-types'; import { FORCE_NEW } from '../../src/util'; diff --git a/test/plugins/test-trace-http.ts b/test/plugins/test-trace-http.ts index cd991eb98..0702838f2 100644 --- a/test/plugins/test-trace-http.ts +++ b/test/plugins/test-trace-http.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {EventEmitter} from 'events'; import * as httpModule from 'http'; import * as httpsModule from 'https'; diff --git a/test/plugins/test-trace-http2.ts b/test/plugins/test-trace-http2.ts index 3fe592e7c..ce087df2b 100644 --- a/test/plugins/test-trace-http2.ts +++ b/test/plugins/test-trace-http2.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; // This is imported only for types. Generated .js file should NOT load 'http2' // in this place. It is dynamically loaded later from each test suite below. import * as http2Types from 'http2'; diff --git a/test/plugins/test-trace-knex.ts b/test/plugins/test-trace-knex.ts index 2100b3cc3..29e62c11e 100644 --- a/test/plugins/test-trace-knex.ts +++ b/test/plugins/test-trace-knex.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as knexTypes from 'knex'; import {Tracer} from '../../src/plugin-types'; diff --git a/test/plugins/test-trace-mongoose-async-await.ts b/test/plugins/test-trace-mongoose-async-await.ts index 75d738393..be4d66add 100644 --- a/test/plugins/test-trace-mongoose-async-await.ts +++ b/test/plugins/test-trace-mongoose-async-await.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as mongooseTypes from 'mongoose'; import * as traceTestModule from '../trace'; diff --git a/test/plugins/test-trace-node-fetch.ts b/test/plugins/test-trace-node-fetch.ts index 90ef2da7e..3e5d5a534 100644 --- a/test/plugins/test-trace-node-fetch.ts +++ b/test/plugins/test-trace-node-fetch.ts @@ -15,6 +15,7 @@ import * as fetchTypes from 'node-fetch'; // For types only. import * as testTraceModule from '../trace'; import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {describeInterop} from '../utils'; import {Express4} from '../web-frameworks/express'; import {Express4Secure} from '../web-frameworks/express-secure'; diff --git a/test/test-agent-stopped.ts b/test/test-agent-stopped.ts index aaad24215..c7d66e68a 100644 --- a/test/test-agent-stopped.ts +++ b/test/test-agent-stopped.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as http from 'http'; import * as traceTestModule from './trace'; import { pluginLoader, PluginLoaderState } from '../src/trace-plugin-loader'; diff --git a/test/test-cls-ah.ts b/test/test-cls-ah.ts index 32d85ec24..9f4d34629 100644 --- a/test/test-cls-ah.ts +++ b/test/test-cls-ah.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as asyncHooksModule from 'async_hooks'; import * as semver from 'semver'; diff --git a/test/test-cls.ts b/test/test-cls.ts index 9c72c6a21..d372f1e27 100644 --- a/test/test-cls.ts +++ b/test/test-cls.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {EventEmitter} from 'events'; import * as semver from 'semver'; import {inspect} from 'util'; diff --git a/test/test-config-plugins.ts b/test/test-config-plugins.ts index 9dad8773a..eb7b8f2c4 100644 --- a/test/test-config-plugins.ts +++ b/test/test-config-plugins.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {defaultConfig} from '../src/config'; import {StackdriverTracerComponents} from '../src/trace-api'; diff --git a/test/test-config-priority.ts b/test/test-config-priority.ts index 93e5b96ae..0f28098a4 100644 --- a/test/test-config-priority.ts +++ b/test/test-config-priority.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as path from 'path'; import {Trace} from '../src/trace'; diff --git a/test/test-config.ts b/test/test-config.ts index b71e273f8..0a08bc79b 100644 --- a/test/test-config.ts +++ b/test/test-config.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as semver from 'semver'; import * as util from 'util'; diff --git a/test/test-default-ignore-ah-health.ts b/test/test-default-ignore-ah-health.ts index e035ac883..712458f2a 100644 --- a/test/test-default-ignore-ah-health.ts +++ b/test/test-default-ignore-ah-health.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as trace from './trace'; diff --git a/test/test-env-log-level.ts b/test/test-env-log-level.ts index 3555c2fa7..5d8efcbe8 100644 --- a/test/test-env-log-level.ts +++ b/test/test-env-log-level.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as shimmer from 'shimmer'; import * as logger from '../src/logger'; diff --git a/test/test-modules-loaded-before-agent.ts b/test/test-modules-loaded-before-agent.ts index b98b83fc6..85c89fa18 100644 --- a/test/test-modules-loaded-before-agent.ts +++ b/test/test-modules-loaded-before-agent.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as shimmer from 'shimmer'; import * as log from '../src/logger'; diff --git a/test/test-plugin-loader.ts b/test/test-plugin-loader.ts index 325c992ce..25ae16d35 100644 --- a/test/test-plugin-loader.ts +++ b/test/test-plugin-loader.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as path from 'path'; import {OpenCensusPropagation} from '../src/config'; diff --git a/test/test-preloaded-agent.ts b/test/test-preloaded-agent.ts index 8b10ae59b..1bf9ce9e8 100644 --- a/test/test-preloaded-agent.ts +++ b/test/test-preloaded-agent.ts @@ -15,6 +15,7 @@ import * as semver from 'semver'; import { execSync } from 'child_process'; import * as assert from 'assert'; +import {describe, it} from 'mocha'; describe('preloaded agent', () => { it('should start automatically when preloaded using --require', () => { diff --git a/test/test-span-data.ts b/test/test-span-data.ts index 63cb29318..0982f9076 100644 --- a/test/test-span-data.ts +++ b/test/test-span-data.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {Constants, SpanType} from '../src/constants'; import {BaseSpanData, ChildSpanData, RootSpanData} from '../src/span-data'; diff --git a/test/test-trace-api-none-cls.ts b/test/test-trace-api-none-cls.ts index b94673784..9ad1e2e6b 100644 --- a/test/test-trace-api-none-cls.ts +++ b/test/test-trace-api-none-cls.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {SpanType} from '../src/constants'; import {Tracer} from '../src/plugin-types'; diff --git a/test/test-trace-api.ts b/test/test-trace-api.ts index 6dd50685f..16de9eeaa 100644 --- a/test/test-trace-api.ts +++ b/test/test-trace-api.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {cls, TraceCLS, TraceCLSMechanism} from '../src/cls'; import { diff --git a/test/test-trace-cluster.ts b/test/test-trace-cluster.ts index 20f58d324..4866a3d7e 100644 --- a/test/test-trace-cluster.ts +++ b/test/test-trace-cluster.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import axiosModule from 'axios'; import * as cluster from 'cluster'; import {Server} from 'http'; diff --git a/test/test-trace-hapi-tails.ts b/test/test-trace-hapi-tails.ts index 9c9e5a9e5..7f898a3b3 100644 --- a/test/test-trace-hapi-tails.ts +++ b/test/test-trace-hapi-tails.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import axiosModule from 'axios'; import * as semver from 'semver'; diff --git a/test/test-trace-policy.ts b/test/test-trace-policy.ts index 1c30ba1fe..a47477561 100644 --- a/test/test-trace-policy.ts +++ b/test/test-trace-policy.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {RequestDetails} from '../src/config'; import { diff --git a/test/test-trace-uncaught-exception.ts b/test/test-trace-uncaught-exception.ts index f8368a731..3ef1804cb 100644 --- a/test/test-trace-uncaught-exception.ts +++ b/test/test-trace-uncaught-exception.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {Logger} from '../src/logger'; import {Trace} from '../src/trace'; diff --git a/test/test-trace-web-frameworks.ts b/test/test-trace-web-frameworks.ts index 2faf17857..694237f27 100644 --- a/test/test-trace-web-frameworks.ts +++ b/test/test-trace-web-frameworks.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import axiosModule from 'axios'; import * as semver from 'semver'; diff --git a/test/test-trace-writer.ts b/test/test-trace-writer.ts index 0cdeb8315..709edeb55 100644 --- a/test/test-trace-writer.ts +++ b/test/test-trace-writer.ts @@ -14,6 +14,7 @@ import {Service, DecorateRequestOptions} from '@google-cloud/common'; import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {GoogleAuth} from 'google-auth-library'; import {JWTInput} from 'google-auth-library/build/src/auth/credentials'; import {RefreshOptions} from 'google-auth-library/build/src/auth/oauth2client'; diff --git a/test/test-util.ts b/test/test-util.ts index e685f7ed2..9c7276dd6 100644 --- a/test/test-util.ts +++ b/test/test-util.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {inspect} from 'util'; import {Constants} from '../src/constants'; diff --git a/test/trace.ts b/test/trace.ts index 87aac9a1d..8a4085b27 100644 --- a/test/trace.ts +++ b/test/trace.ts @@ -33,6 +33,7 @@ */ import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as shimmer from 'shimmer'; import * as trace from '../src'; diff --git a/test/utils.ts b/test/utils.ts index 8d66f680f..1409c5dc2 100644 --- a/test/utils.ts +++ b/test/utils.ts @@ -15,6 +15,7 @@ // TODO(kjin): This file should supercede plugins/common.ts. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as fs from 'fs'; import * as semver from 'semver';