From 54181e4015203436466d17508b5d642ffaef0d97 Mon Sep 17 00:00:00 2001 From: aqche <39076898+aqche@users.noreply.github.com> Date: Thu, 17 Oct 2019 07:24:06 -0700 Subject: [PATCH] Migrate tests from 'store/sqlstore/utils_test.go' to use testify (#12815) --- store/sqlstore/utils_test.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/store/sqlstore/utils_test.go b/store/sqlstore/utils_test.go index f49c1b4049..8f16cffbbc 100644 --- a/store/sqlstore/utils_test.go +++ b/store/sqlstore/utils_test.go @@ -12,11 +12,9 @@ func TestMapStringsToQueryParams(t *testing.T) { keys, params := MapStringsToQueryParams(input, "Fruit") - if len(params) != 1 || params["Fruit0"] != "apple" { - t.Fatal("returned incorrect params", params) - } else if keys != "(:Fruit0)" { - t.Fatal("returned incorrect query", keys) - } + require.Len(t, params, 1, "returned incorrect params", params) + require.Equal(t, "apple", params["Fruit0"], "returned incorrect params", params) + require.Equal(t, "(:Fruit0)", keys, "returned incorrect query", keys) }) t.Run("multiple items", func(t *testing.T) { @@ -24,12 +22,11 @@ func TestMapStringsToQueryParams(t *testing.T) { keys, params := MapStringsToQueryParams(input, "Vegetable") - if len(params) != 3 || params["Vegetable0"] != "carrot" || - params["Vegetable1"] != "tomato" || params["Vegetable2"] != "potato" { - t.Fatal("returned incorrect params", params) - } else if keys != "(:Vegetable0,:Vegetable1,:Vegetable2)" { - t.Fatal("returned incorrect query", keys) - } + require.Len(t, params, 3, "returned incorrect params", params) + require.Equal(t, "carrot", params["Vegetable0"], "returned incorrect params", params) + require.Equal(t, "tomato", params["Vegetable1"], "returned incorrect params", params) + require.Equal(t, "potato", params["Vegetable2"], "returned incorrect params", params) + require.Equal(t, "(:Vegetable0,:Vegetable1,:Vegetable2)", keys, "returned incorrect query", keys) }) }