From a85c653f879a2f3edf0c643d4432005ee2b7e9da Mon Sep 17 00:00:00 2001 From: Shobhit Gupta Date: Wed, 6 Nov 2019 03:37:36 -0800 Subject: [PATCH] =?UTF-8?q?Migrate=20tests=20from=20"store/storetest/emoji?= =?UTF-8?q?=5Fstore.go"=20to=20use=20tes=E2=80=A6=20(#12913)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- store/storetest/emoji_store.go | 125 ++++++++++++++------------------- 1 file changed, 51 insertions(+), 74 deletions(-) diff --git a/store/storetest/emoji_store.go b/store/storetest/emoji_store.go index c0adfd0867..4479aa18dd 100644 --- a/store/storetest/emoji_store.go +++ b/store/storetest/emoji_store.go @@ -30,33 +30,26 @@ func testEmojiSaveDelete(t *testing.T, ss store.Store) { Name: model.NewId(), } - if _, err := ss.Emoji().Save(emoji1); err != nil { - t.Fatal(err) - } + _, err := ss.Emoji().Save(emoji1) + require.Nil(t, err) - if len(emoji1.Id) != 26 { - t.Fatal("should've set id for emoji") - } + assert.Len(t, emoji1.Id, 26, "should've set id for emoji") emoji2 := model.Emoji{ CreatorId: model.NewId(), Name: emoji1.Name, } - if _, err := ss.Emoji().Save(&emoji2); err == nil { - t.Fatal("shouldn't be able to save emoji with duplicate name") - } + _, err = ss.Emoji().Save(&emoji2) + require.NotNil(t, err, "shouldn't be able to save emoji with duplicate name") - if err := ss.Emoji().Delete(emoji1, time.Now().Unix()); err != nil { - t.Fatal(err) - } + err = ss.Emoji().Delete(emoji1, time.Now().Unix()) + require.Nil(t, err) - if _, err := ss.Emoji().Save(&emoji2); err != nil { - t.Fatal("should be able to save emoji with duplicate name now that original has been deleted", err) - } + _, err = ss.Emoji().Save(&emoji2) + require.Nil(t, err, "should be able to save emoji with duplicate name now that original has been deleted") - if err := ss.Emoji().Delete(&emoji2, time.Now().Unix()+1); err != nil { - t.Fatal(err) - } + err = ss.Emoji().Delete(&emoji2, time.Now().Unix()+1) + require.Nil(t, err) } func testEmojiGet(t *testing.T, ss store.Store) { @@ -88,15 +81,13 @@ func testEmojiGet(t *testing.T, ss store.Store) { }() for _, emoji := range emojis { - if _, err := ss.Emoji().Get(emoji.Id, false); err != nil { - t.Fatalf("failed to get emoji with id %v: %v", emoji.Id, err) - } + _, err := ss.Emoji().Get(emoji.Id, false) + require.Nilf(t, err, "failed to get emoji with id %v", emoji.Id) } for _, emoji := range emojis { - if _, err := ss.Emoji().Get(emoji.Id, true); err != nil { - t.Fatalf("failed to get emoji with id %v: %v", emoji.Id, err) - } + _, err := ss.Emoji().Get(emoji.Id, true) + require.Nilf(t, err, "failed to get emoji with id %v", emoji.Id) } } @@ -184,9 +175,8 @@ func testEmojiGetByName(t *testing.T, ss store.Store) { }() for _, emoji := range emojis { - if _, err := ss.Emoji().GetByName(emoji.Name, true); err != nil { - t.Fatalf("failed to get emoji with name %v: %v", emoji.Name, err) - } + _, err := ss.Emoji().GetByName(emoji.Name, true) + require.Nilf(t, err, "failed to get emoji with name %v", emoji.Name) } } @@ -219,35 +209,28 @@ func testEmojiGetMultipleByName(t *testing.T, ss store.Store) { }() t.Run("one emoji", func(t *testing.T) { - if received, err := ss.Emoji().GetMultipleByName([]string{emojis[0].Name}); err != nil { - t.Fatal("could not get emoji", err) - } else if len(received) != 1 || *received[0] != emojis[0] { - t.Fatal("got incorrect emoji") - } + received, err := ss.Emoji().GetMultipleByName([]string{emojis[0].Name}) + require.Nilf(t, err, "could not get emoji") + require.Len(t, received, 1, "got incorrect emoji") + require.Equal(t, *received[0], emojis[0], "got incorrect emoji") }) t.Run("multiple emojis", func(t *testing.T) { - if received, err := ss.Emoji().GetMultipleByName([]string{emojis[0].Name, emojis[1].Name, emojis[2].Name}); err != nil { - t.Fatal("could not get emojis", err) - } else if len(received) != 3 { - t.Fatal("got incorrect emojis") - } + received, err := ss.Emoji().GetMultipleByName([]string{emojis[0].Name, emojis[1].Name, emojis[2].Name}) + require.Nil(t, err, "could not get emojis") + require.Len(t, received, 3, "got incorrect emojis") }) t.Run("one nonexistent emoji", func(t *testing.T) { - if received, err := ss.Emoji().GetMultipleByName([]string{"ab"}); err != nil { - t.Fatal("could not get emoji", err) - } else if len(received) != 0 { - t.Fatal("got incorrect emoji") - } + received, err := ss.Emoji().GetMultipleByName([]string{"ab"}) + require.Nilf(t, err, "%v, could not get emoji", err) + require.Len(t, received, 0, "got incorrect emoji") }) t.Run("multiple emojis with nonexistent names", func(t *testing.T) { - if received, err := ss.Emoji().GetMultipleByName([]string{emojis[0].Name, emojis[1].Name, emojis[2].Name, "abcd", "1234"}); err != nil { - t.Fatal("could not get emojis", err) - } else if len(received) != 3 { - t.Fatal("got incorrect emojis") - } + received, err := ss.Emoji().GetMultipleByName([]string{emojis[0].Name, emojis[1].Name, emojis[2].Name, "abcd", "1234"}) + require.Nil(t, err, "could not get emojis") + require.Len(t, received, 3, "got incorrect emojis") }) } @@ -292,9 +275,7 @@ func testEmojiGetList(t *testing.T, ss store.Store) { } } - if !found { - t.Fatalf("failed to get emoji with id %v", emoji.Id) - } + require.Truef(t, found, "failed to get emoji with id %v", emoji.Id) } } @@ -347,38 +328,34 @@ func testEmojiSearch(t *testing.T, ss store.Store) { shouldFind := []bool{true, false, false, false} - if result, err := ss.Emoji().Search("blargh", true, 100); err != nil { - t.Fatal(err) - } else { - for i, emoji := range emojis { - found := false + result, err := ss.Emoji().Search("blargh", true, 100) + require.Nil(t, err) + for i, emoji := range emojis { + found := false - for _, savedEmoji := range result { - if emoji.Id == savedEmoji.Id { - found = true - break - } + for _, savedEmoji := range result { + if emoji.Id == savedEmoji.Id { + found = true + break } - - assert.Equal(t, shouldFind[i], found, emoji.Name) } + + assert.Equal(t, shouldFind[i], found, emoji.Name) } shouldFind = []bool{true, true, true, false} - if result, err := ss.Emoji().Search("blargh", false, 100); err != nil { - t.Fatal(err) - } else { - for i, emoji := range emojis { - found := false + result, err = ss.Emoji().Search("blargh", false, 100) + require.Nil(t, err) + for i, emoji := range emojis { + found := false - for _, savedEmoji := range result { - if emoji.Id == savedEmoji.Id { - found = true - break - } + for _, savedEmoji := range result { + if emoji.Id == savedEmoji.Id { + found = true + break } - - assert.Equal(t, shouldFind[i], found, emoji.Name) } + + assert.Equal(t, shouldFind[i], found, emoji.Name) } }