From 19b28455814f859ee6c0508501f718d7ac89d288 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Sun, 20 Dec 2020 11:53:28 +0100 Subject: [PATCH] Chore: Convert tsdb request test to standard library (#29936) * Chore: Convert tsdb request test to standard library Co-authored-by: Arve Knudsen --- pkg/tsdb/{tsdb_test.go => request_test.go} | 30 ++++++++++------------ 1 file changed, 13 insertions(+), 17 deletions(-) rename pkg/tsdb/{tsdb_test.go => request_test.go} (65%) diff --git a/pkg/tsdb/tsdb_test.go b/pkg/tsdb/request_test.go similarity index 65% rename from pkg/tsdb/tsdb_test.go rename to pkg/tsdb/request_test.go index 3ce85cd8c7f..97a5895347e 100644 --- a/pkg/tsdb/tsdb_test.go +++ b/pkg/tsdb/request_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/grafana/grafana/pkg/models" - . "github.com/smartystreets/goconvey/convey" + "github.com/stretchr/testify/require" ) -func TestMetricQuery(t *testing.T) { - Convey("When executing request with one query", t, func() { +func TestHandleRequest(t *testing.T) { + t.Run("Should return query result when handling request for query", func(t *testing.T) { req := &TsdbQuery{ Queries: []*Query{ {RefId: "A", DataSource: &models.DataSource{Id: 1, Type: "test"}}, @@ -20,15 +20,12 @@ func TestMetricQuery(t *testing.T) { fakeExecutor.Return("A", TimeSeriesSlice{&TimeSeries{Name: "argh"}}) res, err := HandleRequest(context.TODO(), &models.DataSource{Id: 1, Type: "test"}, req) - So(err, ShouldBeNil) - - Convey("Should return query results", func() { - So(res.Results["A"].Series, ShouldNotBeEmpty) - So(res.Results["A"].Series[0].Name, ShouldEqual, "argh") - }) + require.NoError(t, err) + require.NotEmpty(t, res.Results["A"].Series) + require.Equal(t, "argh", res.Results["A"].Series[0].Name) }) - Convey("When executing one request with two queries from same data source", t, func() { + t.Run("Should return query results when handling request for two queries with same data source", func(t *testing.T) { req := &TsdbQuery{ Queries: []*Query{ {RefId: "A", DataSource: &models.DataSource{Id: 1, Type: "test"}}, @@ -41,15 +38,14 @@ func TestMetricQuery(t *testing.T) { fakeExecutor.Return("B", TimeSeriesSlice{&TimeSeries{Name: "barg"}}) res, err := HandleRequest(context.TODO(), &models.DataSource{Id: 1, Type: "test"}, req) - So(err, ShouldBeNil) + require.NoError(t, err) - Convey("Should return query results", func() { - So(len(res.Results), ShouldEqual, 2) - So(res.Results["B"].Series[0].Name, ShouldEqual, "barg") - }) + require.Len(t, res.Results, 2) + require.Equal(t, "argh", res.Results["A"].Series[0].Name) + require.Equal(t, "barg", res.Results["B"].Series[0].Name) }) - Convey("When query uses data source of unknown type", t, func() { + t.Run("Should return error when handling request for query with unknown type", func(t *testing.T) { req := &TsdbQuery{ Queries: []*Query{ {RefId: "A", DataSource: &models.DataSource{Id: 1, Type: "asdasdas"}}, @@ -57,7 +53,7 @@ func TestMetricQuery(t *testing.T) { } _, err := HandleRequest(context.TODO(), &models.DataSource{Id: 12, Type: "testjughjgjg"}, req) - So(err, ShouldNotBeNil) + require.Error(t, err) }) }