fix tests

topfreegames · Feb 26, 2019 · f33024e · f33024e
1 parent 35df0fa
commit f33024e
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/metrics/report_test.go b/metrics/report_test.go
@@ -22,6 +22,7 @@ package metrics
 
 import (
 	"context"
+	"errors"
 	"testing"
 	"time"
 
@@ -42,7 +43,7 @@ func TestReportTimingFromCtx(t *testing.T) {
 		originalTs := time.Now().UnixNano()
 		expectedRoute := uuid.New().String()
 		expectedType := uuid.New().String()
-		expectedErrored := true
+		expectedErr := errors.New(uuid.New().String())
 		ctx := pcontext.AddToPropagateCtx(context.Background(), constants.StartTimeKey, originalTs)
 		ctx = pcontext.AddToPropagateCtx(ctx, constants.RouteKey, expectedRoute)
 
@@ -53,7 +54,7 @@ func TestReportTimingFromCtx(t *testing.T) {
 			},
 		)
 
-		ReportTimingFromCtx(ctx, []Reporter{mockMetricsReporter}, expectedType, expectedErrored)
+		ReportTimingFromCtx(ctx, []Reporter{mockMetricsReporter}, expectedType, expectedErr)
 	})
 
 	t.Run("test-tags", func(t *testing.T) {
@@ -64,7 +65,7 @@ func TestReportTimingFromCtx(t *testing.T) {
 		originalTs := time.Now().UnixNano()
 		expectedRoute := uuid.New().String()
 		expectedType := uuid.New().String()
-		expectedErrored := false
+		var expectedErr error
 		ctx := pcontext.AddToPropagateCtx(context.Background(), constants.StartTimeKey, originalTs)
 		ctx = pcontext.AddToPropagateCtx(ctx, constants.RouteKey, expectedRoute)
 		ctx = pcontext.AddToPropagateCtx(ctx, constants.MetricTagsKey, map[string]string{
@@ -76,11 +77,12 @@ func TestReportTimingFromCtx(t *testing.T) {
 			"status": "ok",
 			"type":   expectedType,
 			"key":    "value",
+			"code":   "",
 		}
 
 		mockMetricsReporter.EXPECT().ReportSummary(ResponseTime, expectedTags, gomock.Any())
 
-		ReportTimingFromCtx(ctx, []Reporter{mockMetricsReporter}, expectedType, expectedErrored)
+		ReportTimingFromCtx(ctx, []Reporter{mockMetricsReporter}, expectedType, expectedErr)
 	})
 
 	t.Run("test-tags-not-correct-type", func(t *testing.T) {
@@ -91,7 +93,7 @@ func TestReportTimingFromCtx(t *testing.T) {
 		originalTs := time.Now().UnixNano()
 		expectedRoute := uuid.New().String()
 		expectedType := uuid.New().String()
-		expectedErrored := false
+		var expectedErr error
 		ctx := pcontext.AddToPropagateCtx(context.Background(), constants.StartTimeKey, originalTs)
 		ctx = pcontext.AddToPropagateCtx(ctx, constants.RouteKey, expectedRoute)
 		ctx = pcontext.AddToPropagateCtx(ctx, constants.MetricTagsKey, "not-map")
@@ -100,11 +102,12 @@ func TestReportTimingFromCtx(t *testing.T) {
 			"route":  expectedRoute,
 			"status": "ok",
 			"type":   expectedType,
+			"code":   "",
 		}
 
 		mockMetricsReporter.EXPECT().ReportSummary(ResponseTime, expectedTags, gomock.Any())
 
-		ReportTimingFromCtx(ctx, []Reporter{mockMetricsReporter}, expectedType, expectedErrored)
+		ReportTimingFromCtx(ctx, []Reporter{mockMetricsReporter}, expectedType, expectedErr)
 	})
 }