1 files changed, 25 insertions, 21 deletions
diff --git a/impl_core/src/test/java/io/opencensus/trace/SpanBuilderImplTest.java b/impl_core/src/test/java/io/opencensus/trace/SpanBuilderImplTest.java
index afcd3b8b..3e827485 100644
--- a/impl_core/src/test/java/io/opencensus/trace/SpanBuilderImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/trace/SpanBuilderImplTest.java
@@ -57,12 +57,12 @@ public class SpanBuilderImplTest {
 
   @Test
   public void startSpanNullParent() {
-    Span span = SpanBuilderImpl.createBuilder(null, SPAN_NAME, spanBuilderOptions).startSpan();
+    SpanImpl span =
+        SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions).startSpan();
     assertThat(span.getContext().isValid()).isTrue();
     assertThat(span.getOptions().contains(Options.RECORD_EVENTS)).isTrue();
     assertThat(span.getContext().getTraceOptions().isSampled()).isTrue();
-    assertThat(span instanceof SpanImpl).isTrue();
-    SpanData spanData = ((SpanImpl) span).toSpanData();
+    SpanData spanData = span.toSpanData();
     assertThat(spanData.getParentSpanId()).isNull();
     assertThat(spanData.getHasRemoteParent()).isFalse();
     assertThat(spanData.getStartTimestamp()).isEqualTo(testClock.now());
@@ -71,16 +71,15 @@ public class SpanBuilderImplTest {
 
   @Test
   public void startSpanNullParentWithRecordEvents() {
-    Span span =
-        SpanBuilderImpl.createBuilder(null, SPAN_NAME, spanBuilderOptions)
+    SpanImpl span =
+        SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions)
             .setSampler(Samplers.neverSample())
             .setRecordEvents(true)
             .startSpan();
     assertThat(span.getContext().isValid()).isTrue();
     assertThat(span.getOptions().contains(Options.RECORD_EVENTS)).isTrue();
     assertThat(span.getContext().getTraceOptions().isSampled()).isFalse();
-    assertThat(span instanceof SpanImpl).isTrue();
-    SpanData spanData = ((SpanImpl) span).toSpanData();
+    SpanData spanData = span.toSpanData();
     assertThat(spanData.getParentSpanId()).isNull();
     assertThat(spanData.getHasRemoteParent()).isFalse();
   }
@@ -88,7 +87,7 @@ public class SpanBuilderImplTest {
   @Test
   public void startSpanNullParentNoRecordOptions() {
     Span span =
-        SpanBuilderImpl.createBuilder(null, SPAN_NAME, spanBuilderOptions)
+        SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions)
             .setSampler(Samplers.neverSample())
             .startSpan();
     assertThat(span.getContext().isValid()).isTrue();
@@ -98,12 +97,13 @@ public class SpanBuilderImplTest {
 
   @Test
   public void startChildSpan() {
-    Span rootSpan = SpanBuilderImpl.createBuilder(null, SPAN_NAME, spanBuilderOptions).startSpan();
+    Span rootSpan =
+        SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions).startSpan();
     assertThat(rootSpan.getContext().isValid()).isTrue();
     assertThat(rootSpan.getOptions().contains(Options.RECORD_EVENTS)).isTrue();
     assertThat(rootSpan.getContext().getTraceOptions().isSampled()).isTrue();
     Span childSpan =
-        SpanBuilderImpl.createBuilder(rootSpan, SPAN_NAME, spanBuilderOptions).startSpan();
+        SpanBuilderImpl.createWithParent(SPAN_NAME, rootSpan, spanBuilderOptions).startSpan();
     assertThat(childSpan.getContext().isValid()).isTrue();
     assertThat(childSpan.getContext().getTraceId()).isEqualTo(rootSpan.getContext().getTraceId());
     assertThat(((SpanImpl) childSpan).toSpanData().getParentSpanId())
@@ -112,22 +112,27 @@ public class SpanBuilderImplTest {
         .isEqualTo(((SpanImpl) rootSpan).getTimestampConverter());
   }
 
-  @Test(expected = NullPointerException.class)
+  @Test
   public void startRemoteSpan_NullParent() {
-    SpanBuilderImpl.createBuilderWithRemoteParent(null, SPAN_NAME, spanBuilderOptions);
+    SpanImpl span =
+        SpanBuilderImpl.createWithRemoteParent(SPAN_NAME, null, spanBuilderOptions).startSpan();
+    assertThat(span.getContext().isValid()).isTrue();
+    assertThat(span.getOptions().contains(Options.RECORD_EVENTS)).isTrue();
+    assertThat(span.getContext().getTraceOptions().isSampled()).isTrue();
+    SpanData spanData = span.toSpanData();
+    assertThat(spanData.getParentSpanId()).isNull();
+    assertThat(spanData.getHasRemoteParent()).isFalse();
   }
 
   @Test
   public void startRemoteSpanInvalidParent() {
-    Span span =
-        SpanBuilderImpl.createBuilderWithRemoteParent(
-                SpanContext.INVALID, SPAN_NAME, spanBuilderOptions)
+    SpanImpl span =
+        SpanBuilderImpl.createWithRemoteParent(SPAN_NAME, SpanContext.INVALID, spanBuilderOptions)
             .startSpan();
     assertThat(span.getContext().isValid()).isTrue();
     assertThat(span.getOptions().contains(Options.RECORD_EVENTS)).isTrue();
     assertThat(span.getContext().getTraceOptions().isSampled()).isTrue();
-    assertThat(span instanceof SpanImpl).isTrue();
-    SpanData spanData = ((SpanImpl) span).toSpanData();
+    SpanData spanData = span.toSpanData();
     assertThat(spanData.getParentSpanId()).isNull();
     assertThat(spanData.getHasRemoteParent()).isFalse();
   }
@@ -139,14 +144,13 @@ public class SpanBuilderImplTest {
             TraceId.generateRandomId(randomHandler.current()),
             SpanId.generateRandomId(randomHandler.current()),
             TraceOptions.DEFAULT);
-    Span span =
-        SpanBuilderImpl.createBuilderWithRemoteParent(spanContext, SPAN_NAME, spanBuilderOptions)
+    SpanImpl span =
+        SpanBuilderImpl.createWithRemoteParent(SPAN_NAME, spanContext, spanBuilderOptions)
             .startSpan();
     assertThat(span.getContext().isValid()).isTrue();
     assertThat(span.getContext().getTraceId()).isEqualTo(spanContext.getTraceId());
     assertThat(span.getContext().getTraceOptions().isSampled()).isTrue();
-    assertThat(span instanceof SpanImpl).isTrue();
-    SpanData spanData = ((SpanImpl) span).toSpanData();
+    SpanData spanData = span.toSpanData();
     assertThat(spanData.getParentSpanId()).isEqualTo(spanContext.getSpanId());
     assertThat(spanData.getHasRemoteParent()).isTrue();
   }