From 894b124bc6aae414820e5e44bf906e637372b575 Mon Sep 17 00:00:00 2001 From: Sheshagiri Rao Mallipedhi Date: Tue, 8 Oct 2019 07:36:15 -0700 Subject: [PATCH] Migrate tests from "model/analytics_row_test.go" to use testify (#12601) --- model/analytics_row_test.go | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/model/analytics_row_test.go b/model/analytics_row_test.go index bd4e96c7dc..31ad461041 100644 --- a/model/analytics_row_test.go +++ b/model/analytics_row_test.go @@ -6,32 +6,23 @@ package model import ( "strings" "testing" + + "github.com/stretchr/testify/require" ) -func TestAnalyticsRowJson(t *testing.T) { - a1 := AnalyticsRow{} - a1.Name = "2015-10-12" - a1.Value = 12345.0 - json := a1.ToJson() - ra1 := AnalyticsRowFromJson(strings.NewReader(json)) +var a1 = AnalyticsRow{ + Name: "2015-10-12", + Value: 12345.0, +} - if a1.Name != ra1.Name { - t.Fatal("days didn't match") - } +func TestAnalyticsRowJson(t *testing.T) { + ra1 := AnalyticsRowFromJson(strings.NewReader(a1.ToJson())) + require.Equal(t, a1.Name, ra1.Name, "days didn't match") } func TestAnalyticsRowsJson(t *testing.T) { - a1 := AnalyticsRow{} - a1.Name = "2015-10-12" - a1.Value = 12345.0 - var a1s AnalyticsRows = make([]*AnalyticsRow, 1) a1s[0] = &a1 - - ljson := a1s.ToJson() - results := AnalyticsRowsFromJson(strings.NewReader(ljson)) - - if a1s[0].Name != results[0].Name { - t.Fatal("Ids do not match") - } + results := AnalyticsRowsFromJson(strings.NewReader(a1s.ToJson())) + require.Equal(t, a1s[0].Name, results[0].Name, "Ids do not match") }