Tidy up tests

Since `testify/assert` was brought in by previous change, use it across
all bridge tests.

Signed-off-by: Bryan Boreham <[email protected]>

bridge/opentracing/bridge_test.go

@@ -15,7 +15,6 @@
 package opentracing
 
 import (
-	"reflect"
 	"sort"
 	"testing"
 
@@ -70,21 +69,15 @@ func testBridgeWithCarrier(t *testing.T, carrier interface{}) {
 	defer span.Finish()
 
 	err := bridgeTracer.Inject(span.Context(), ot.HTTPHeaders, carrier)
-	if err != nil {
-		t.Errorf("Inject error: %s", err)
-	}
+	assert.NoError(t, err, "Inject")
 
 	extractedSpanContext, err := bridgeTracer.Extract(ot.HTTPHeaders, carrier)
-	if err != nil {
-		t.Errorf("Extract error: %s", err)
-	}
+	assert.NoError(t, err, "Extract")
 
 	// Make a copy of the SpanContext with remote set to true
 	originalSpanContext := span.Context().(*bridgeSpanContext)
 	copySpanContext := *originalSpanContext
 	copySpanContext.otelSpanContext = copySpanContext.otelSpanContext.WithRemote(true)
 	// Now the copy should be equal to the original we passed in.
-	if !reflect.DeepEqual(&copySpanContext, extractedSpanContext) {
-		t.Errorf("Extracted span context does not match: %#v, %#v", span.Context(), extractedSpanContext)
-	}
+	assert.Equal(t, &copySpanContext, extractedSpanContext)
 }