From f75ae546d4462ba062135d7a040232dbfccd1b4c Mon Sep 17 00:00:00 2001 From: Mayur Kale Date: Tue, 13 Aug 2019 23:06:49 -0700 Subject: [PATCH] refactor: unit tests (#198) --- .nycrc | 6 +- .../test/context/BinaryTraceContext.test.ts | 4 +- .../test/context/HttpTraceContext.test.ts | 4 +- .../test/trace/TracerDelegate.test.ts | 66 +++++++++---------- .../test/trace/tracestate.test.ts | 4 +- .../test/instrumentation/PluginLoader.test.ts | 6 +- .../AsyncHooksScopeManager.test.ts | 2 +- .../test/{noop => }/NoopScopeManager.test.ts | 2 +- 8 files changed, 49 insertions(+), 45 deletions(-) rename packages/opentelemetry-scope-async-hooks/test/{asynchooks => }/AsyncHooksScopeManager.test.ts (98%) rename packages/opentelemetry-scope-base/test/{noop => }/NoopScopeManager.test.ts (98%) diff --git a/.nycrc b/.nycrc index 3b478a143e6..f8e60152fa8 100644 --- a/.nycrc +++ b/.nycrc @@ -5,7 +5,11 @@ "exclude": [ "**/*.d.ts", "build/**/**/*.js", - "src/index.ts" + "src/index.ts", + "karma.conf.js", + "src/platform/browser/*.ts", + "test/index-webpack.ts", + "webpack/*.js" ], "all": true } diff --git a/packages/opentelemetry-core/test/context/BinaryTraceContext.test.ts b/packages/opentelemetry-core/test/context/BinaryTraceContext.test.ts index 226735d79c0..fd42f72a159 100644 --- a/packages/opentelemetry-core/test/context/BinaryTraceContext.test.ts +++ b/packages/opentelemetry-core/test/context/BinaryTraceContext.test.ts @@ -114,7 +114,7 @@ describe('BinaryTraceContext', () => { }, ]; - describe('toBytes', () => { + describe('.toBytes()', () => { testCases.forEach( testCase => testCase.structured && @@ -127,7 +127,7 @@ describe('BinaryTraceContext', () => { ); }); - describe('fromBytes', () => { + describe('.fromBytes()', () => { testCases.forEach(testCase => it(`should deserialize ${testCase.description}`, () => { assert.deepStrictEqual( diff --git a/packages/opentelemetry-core/test/context/HttpTraceContext.test.ts b/packages/opentelemetry-core/test/context/HttpTraceContext.test.ts index 8a32768c46b..eea65ed00f1 100644 --- a/packages/opentelemetry-core/test/context/HttpTraceContext.test.ts +++ b/packages/opentelemetry-core/test/context/HttpTraceContext.test.ts @@ -31,7 +31,7 @@ describe('HttpTraceContext', () => { carrier = {}; }); - describe('inject', () => { + describe('.inject()', () => { it('should set traceparent header', () => { const spanContext: SpanContext = { traceId: 'd4cda95b652f4a1592b449d5929fda1b', @@ -64,7 +64,7 @@ describe('HttpTraceContext', () => { }); }); - describe('extract', () => { + describe('.extract()', () => { it('should extract context of a sampled span from carrier', () => { carrier[TRACE_PARENT_HEADER] = '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01'; diff --git a/packages/opentelemetry-core/test/trace/TracerDelegate.test.ts b/packages/opentelemetry-core/test/trace/TracerDelegate.test.ts index c6186a9e590..f7a5eef8565 100644 --- a/packages/opentelemetry-core/test/trace/TracerDelegate.test.ts +++ b/packages/opentelemetry-core/test/trace/TracerDelegate.test.ts @@ -65,44 +65,44 @@ describe('TracerDelegate', () => { tracerDelegate.startSpan('foo'); assert.deepStrictEqual(dummyTracer.spyCounter, 1); }); + }); - describe('.start/stop()', () => { - it('should use the fallback tracer when stop is called', () => { - const dummyTracerUser = new DummyTracer(); - const dummyTracerFallback = new DummyTracer(); - const tracerDelegate = new TracerDelegate( - dummyTracerUser, - dummyTracerFallback - ); + describe('.start/.stop()', () => { + it('should use the fallback tracer when stop is called', () => { + const dummyTracerUser = new DummyTracer(); + const dummyTracerFallback = new DummyTracer(); + const tracerDelegate = new TracerDelegate( + dummyTracerUser, + dummyTracerFallback + ); - tracerDelegate.stop(); - tracerDelegate.startSpan('fallback'); - assert.deepStrictEqual(dummyTracerUser.spyCounter, 0); - assert.deepStrictEqual(dummyTracerFallback.spyCounter, 1); - }); + tracerDelegate.stop(); + tracerDelegate.startSpan('fallback'); + assert.deepStrictEqual(dummyTracerUser.spyCounter, 0); + assert.deepStrictEqual(dummyTracerFallback.spyCounter, 1); + }); - it('should use the user tracer when start is called', () => { - const dummyTracerUser = new DummyTracer(); - const dummyTracerFallback = new DummyTracer(); - const tracerDelegate = new TracerDelegate( - dummyTracerUser, - dummyTracerFallback - ); + it('should use the user tracer when start is called', () => { + const dummyTracerUser = new DummyTracer(); + const dummyTracerFallback = new DummyTracer(); + const tracerDelegate = new TracerDelegate( + dummyTracerUser, + dummyTracerFallback + ); - tracerDelegate.stop(); - tracerDelegate.startSpan('fallback'); - assert.deepStrictEqual(dummyTracerUser.spyCounter, 0); - assert.deepStrictEqual(dummyTracerFallback.spyCounter, 1); + tracerDelegate.stop(); + tracerDelegate.startSpan('fallback'); + assert.deepStrictEqual(dummyTracerUser.spyCounter, 0); + assert.deepStrictEqual(dummyTracerFallback.spyCounter, 1); - tracerDelegate.start(); - tracerDelegate.startSpan('user'); - assert.deepStrictEqual(dummyTracerUser.spyCounter, 1); - assert.deepStrictEqual( - dummyTracerFallback.spyCounter, - 1, - 'Only user tracer counter is incremented' - ); - }); + tracerDelegate.start(); + tracerDelegate.startSpan('user'); + assert.deepStrictEqual(dummyTracerUser.spyCounter, 1); + assert.deepStrictEqual( + dummyTracerFallback.spyCounter, + 1, + 'Only user tracer counter is incremented' + ); }); }); diff --git a/packages/opentelemetry-core/test/trace/tracestate.test.ts b/packages/opentelemetry-core/test/trace/tracestate.test.ts index 43922e3506c..d618d69dfbc 100644 --- a/packages/opentelemetry-core/test/trace/tracestate.test.ts +++ b/packages/opentelemetry-core/test/trace/tracestate.test.ts @@ -18,7 +18,7 @@ import * as assert from 'assert'; import { TraceState } from '../../src/trace/TraceState'; describe('TraceState', () => { - describe('serialize', () => { + describe('.serialize()', () => { it('returns serialize string', () => { const state = new TraceState('a=1,b=2'); assert.deepStrictEqual(state.serialize(), 'a=1,b=2'); @@ -52,7 +52,7 @@ describe('TraceState', () => { }); }); - describe('parse', () => { + describe('.parse()', () => { it('must successfully parse valid state value', () => { const state = new TraceState( 'vendorname2=opaqueValue2,vendorname1=opaqueValue1' diff --git a/packages/opentelemetry-node-tracer/test/instrumentation/PluginLoader.test.ts b/packages/opentelemetry-node-tracer/test/instrumentation/PluginLoader.test.ts index fc10b9ea578..66961790e68 100644 --- a/packages/opentelemetry-node-tracer/test/instrumentation/PluginLoader.test.ts +++ b/packages/opentelemetry-node-tracer/test/instrumentation/PluginLoader.test.ts @@ -39,7 +39,7 @@ describe('PluginLoader', () => { Object.keys(require.cache).forEach(key => delete require.cache[key]); }); - describe('state()', () => { + describe('.state()', () => { it('returns UNINITIALIZED when first called', () => { const pluginLoader = new PluginLoader(tracer, logger); assert.strictEqual(pluginLoader['_hookState'], HookState.UNINITIALIZED); @@ -59,7 +59,7 @@ describe('PluginLoader', () => { }); }); - describe('load()', () => { + describe('.load()', () => { it('sanity check', () => { // Ensure that module fixtures contain values that we expect. const simpleModule = require('simple-module'); @@ -107,7 +107,7 @@ describe('PluginLoader', () => { }); }); - describe('unload()', () => { + describe('.unload()', () => { it('should unload the plugins and unpatch the target module when unloads', () => { const pluginLoader = new PluginLoader(tracer, logger); assert.strictEqual(pluginLoader['_plugins'].length, 0); diff --git a/packages/opentelemetry-scope-async-hooks/test/asynchooks/AsyncHooksScopeManager.test.ts b/packages/opentelemetry-scope-async-hooks/test/AsyncHooksScopeManager.test.ts similarity index 98% rename from packages/opentelemetry-scope-async-hooks/test/asynchooks/AsyncHooksScopeManager.test.ts rename to packages/opentelemetry-scope-async-hooks/test/AsyncHooksScopeManager.test.ts index ee587b33fdf..0f6c8e147be 100644 --- a/packages/opentelemetry-scope-async-hooks/test/asynchooks/AsyncHooksScopeManager.test.ts +++ b/packages/opentelemetry-scope-async-hooks/test/AsyncHooksScopeManager.test.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import { AsyncHooksScopeManager } from '../../src'; +import { AsyncHooksScopeManager } from '../src'; describe('AsyncHooksScopeManager', () => { let scopeManager: AsyncHooksScopeManager; diff --git a/packages/opentelemetry-scope-base/test/noop/NoopScopeManager.test.ts b/packages/opentelemetry-scope-base/test/NoopScopeManager.test.ts similarity index 98% rename from packages/opentelemetry-scope-base/test/noop/NoopScopeManager.test.ts rename to packages/opentelemetry-scope-base/test/NoopScopeManager.test.ts index b6ec6791a21..a9d75e017cd 100644 --- a/packages/opentelemetry-scope-base/test/noop/NoopScopeManager.test.ts +++ b/packages/opentelemetry-scope-base/test/NoopScopeManager.test.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import { NoopScopeManager } from '../../src'; +import { NoopScopeManager } from '../src'; describe('NoopScopeManager', () => { let scopeManager: NoopScopeManager;