fix: fixed span tests

Author: djonathascardoso

packages/opencensus-core/package.json

@@ -7,7 +7,7 @@
   "repository": "census-instrumentation/opencensus-node",
   "scripts": {
     "build": "node_modules/.bin/tsc --declaration",
-    "test": "node_modules/.bin/mocha 'build/test/**/*.js' --reporter spec",
+    "test": "nyc --reporter=html --reporter=text mocha 'build/test/**/*.js'",
     "clean": "rimraf build/*"
   },
   "keywords": [
@@ -44,7 +44,8 @@
     "mocha": "^5.0.4",
     "ncp": "^2.0.0",
     "ts-node": "^4.0.0",
-    "typescript": "^2.7.2"
+    "typescript": "^2.7.2",
+    "nyc": "11.6.0"
   },
   "dependencies": {
     "async_hooks": "^1.0.0",

packages/opencensus-core/src/trace/model/span.ts

@@ -35,12 +35,12 @@ export class SpanImpl extends SpanBaseModel implements Span {
     this.root = root;
   }
 
-  /** Gets trace id of rootspan. */
+  /** Gets trace id of span. */
   get traceId(): string {
     return this.root.traceId;
   }
 
-  /** Gets trace context of rootspan. */
+  /** Gets trace context of span. */
   get traceContext(): TraceContext {
     return {
       traceId: this.traceId.toString(),
@@ -64,6 +64,11 @@ export class SpanImpl extends SpanBaseModel implements Span {
 
   /** Ends the span. */
   end(): void {
+    if (!this.started) {
+      debug("calling end() on un-started span");
+      return;
+    }
+    
     super.end();
     this.notifyEnd();
     debug('ending span  %o', {

packages/opencensus-core/test/test-span.ts

@@ -26,75 +26,88 @@ let tracer = new TracerImpl();
 
 describe('Span', function() {
   /**
-   * Should create, start and end a rootspan
+   * Should create a span
    */
-  describe('startSpan()', function() {
-    it('should create an span', function() {
+  describe('new Span()', function() {
+    it('should create a Span instance', function() {
       const rootSpan = new RootSpanImpl(tracer);
-      assert.ok(rootSpan instanceof SpanImpl);
+      const span = new SpanImpl(rootSpan);
+      assert.ok(span instanceof SpanImpl);
+    });
+  });
 
+  /**
+   * Should return the Trace ID
+   */
+  describe('get traceId()', function() {
+    it('should return the trace id', function() {
+      const rootSpan = new RootSpanImpl(tracer);
       rootSpan.start();
-      const span = rootSpan.startSpan('spanName', 'typeSpan');
-      assert.ok(span instanceof SpanImpl);
-      assert.ok(span.id);
+      const span = new SpanImpl(rootSpan);
+      assert.equal(span.traceId, rootSpan.traceId);
     });
+  });
 
-    it('should start a span', function() {
+  /**
+   * Should the trace context of span
+   */
+  describe('get traceContext()', function() {
+    it('should the trace context of span', function() {
       const rootSpan = new RootSpanImpl(tracer);
       rootSpan.start();
-      const span = rootSpan.startSpan('spanName', 'typeSpan');
-      span.start();
-      assert.ok(span.started);
+      
+      const span = new SpanImpl(rootSpan);
+      const context = span.traceContext;
+
+      assert.equal(context.traceId, rootSpan.traceId);
+      assert.equal(context.spanId, span.id);
+      assert.equal(context.options, 1);
     });
+  });
 
-    it('should end a span', function() {
+  /**
+   * Should start a span instance
+   */
+  describe('start()', function() {
+    it('should start a span instance', function() {
       const rootSpan = new RootSpanImpl(tracer);
       rootSpan.start();
-      const span = rootSpan.startSpan('spanName', 'typeSpan');
+      
+      const span = new SpanImpl(rootSpan);
       span.start();
-      span.end();
-      assert.ok(span.ended);
+
+      assert.ok(span.started);
     });
   });
 
   /**
-   * Should not start span after it ended
+   * Should end a span instance
    */
-  describe('Span checking after creation', function() {
-    it('should not start span after it ended', function() {
-      const root = new RootSpanImpl(tracer);
-      root.start();
-      const span = root.startSpan('spanName', 'typeSpan');
+  describe('end()', function() {
+    it('should end a span instance', function() {
+      const rootSpan = new RootSpanImpl(tracer);
+      rootSpan.start();
+      
+      const span = new SpanImpl(rootSpan);
       span.start();
       span.end();
 
-      span.start();
-      assert.equal(span.ended, true);
+      assert.ok(span.ended);
     });
   });
 
   /**
-   * Should an unique ID for spans
+   * Should not end a span instance
    */
-  describe('Span data', function() {
-    it('should create an unique numeric span ID strings', function() {
-      const root = new RootSpanImpl(tracer);
-      root.start();
-
-      var numberOfSpansToCheck = 5;
-      for (var i = 0; i < numberOfSpansToCheck; i++) {
-        var span = root.startSpan('spanName' + i, 'typeSpan' + i);
-        var spanId = span.id;
-        assert.ok(typeof spanId === 'string');
-        assert.ok(spanId.match(/\d+/));
-        assert.ok(Number(spanId) > 0);
-        assert.strictEqual(Number(spanId).toString(), spanId);
-      }
-    });
+  describe('end() before start the span', function() {
+    it('should not end a span instance', function() {
+      const rootSpan = new RootSpanImpl(tracer);
+      rootSpan.start();
+      
+      const span = new SpanImpl(rootSpan);
+      span.end();
 
-    // TODO
-    it('should truncate namespace', function() {
-      this.skip();
+      assert.ok(!span.ended);
     });
   });
 });