1 files changed, 4 insertions, 166 deletions

diff --git a/store/sqlstore/emoji_store_test.go b/store/sqlstore/emoji_store_test.go
index 9754e2b47..6f5f1cc52 100644
--- a/store/sqlstore/emoji_store_test.go
+++ b/store/sqlstore/emoji_store_test.go
@@ -1,176 +1,14 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
 package sqlstore
 
 import (
 	"testing"
-	"time"
 
-	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/store/storetest"
 )
 
-func TestEmojiSaveDelete(t *testing.T) {
-	ss := Setup()
-
-	emoji1 := &model.Emoji{
-		CreatorId: model.NewId(),
-		Name:      model.NewId(),
-	}
-
-	if result := <-ss.Emoji().Save(emoji1); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-
-	if len(emoji1.Id) != 26 {
-		t.Fatal("should've set id for emoji")
-	}
-
-	emoji2 := model.Emoji{
-		CreatorId: model.NewId(),
-		Name:      emoji1.Name,
-	}
-	if result := <-ss.Emoji().Save(&emoji2); result.Err == nil {
-		t.Fatal("shouldn't be able to save emoji with duplicate name")
-	}
-
-	if result := <-ss.Emoji().Delete(emoji1.Id, time.Now().Unix()); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-
-	if result := <-ss.Emoji().Save(&emoji2); result.Err != nil {
-		t.Fatal("should be able to save emoji with duplicate name now that original has been deleted", result.Err)
-	}
-
-	if result := <-ss.Emoji().Delete(emoji2.Id, time.Now().Unix()+1); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-}
-
-func TestEmojiGet(t *testing.T) {
-	ss := Setup()
-
-	emojis := []model.Emoji{
-		{
-			CreatorId: model.NewId(),
-			Name:      model.NewId(),
-		},
-		{
-			CreatorId: model.NewId(),
-			Name:      model.NewId(),
-		},
-		{
-			CreatorId: model.NewId(),
-			Name:      model.NewId(),
-		},
-	}
-
-	for i, emoji := range emojis {
-		emojis[i] = *store.Must(ss.Emoji().Save(&emoji)).(*model.Emoji)
-	}
-	defer func() {
-		for _, emoji := range emojis {
-			store.Must(ss.Emoji().Delete(emoji.Id, time.Now().Unix()))
-		}
-	}()
-
-	for _, emoji := range emojis {
-		if result := <-ss.Emoji().Get(emoji.Id, false); result.Err != nil {
-			t.Fatalf("failed to get emoji with id %v: %v", emoji.Id, result.Err)
-		}
-	}
-
-	for _, emoji := range emojis {
-		if result := <-ss.Emoji().Get(emoji.Id, true); result.Err != nil {
-			t.Fatalf("failed to get emoji with id %v: %v", emoji.Id, result.Err)
-		}
-	}
-
-	for _, emoji := range emojis {
-		if result := <-ss.Emoji().Get(emoji.Id, true); result.Err != nil {
-			t.Fatalf("failed to get emoji with id %v: %v", emoji.Id, result.Err)
-		}
-	}
-}
-
-func TestEmojiGetByName(t *testing.T) {
-	ss := Setup()
-
-	emojis := []model.Emoji{
-		{
-			CreatorId: model.NewId(),
-			Name:      model.NewId(),
-		},
-		{
-			CreatorId: model.NewId(),
-			Name:      model.NewId(),
-		},
-		{
-			CreatorId: model.NewId(),
-			Name:      model.NewId(),
-		},
-	}
-
-	for i, emoji := range emojis {
-		emojis[i] = *store.Must(ss.Emoji().Save(&emoji)).(*model.Emoji)
-	}
-	defer func() {
-		for _, emoji := range emojis {
-			store.Must(ss.Emoji().Delete(emoji.Id, time.Now().Unix()))
-		}
-	}()
-
-	for _, emoji := range emojis {
-		if result := <-ss.Emoji().GetByName(emoji.Name); result.Err != nil {
-			t.Fatalf("failed to get emoji with name %v: %v", emoji.Name, result.Err)
-		}
-	}
-}
-
-func TestEmojiGetList(t *testing.T) {
-	ss := Setup()
-
-	emojis := []model.Emoji{
-		{
-			CreatorId: model.NewId(),
-			Name:      model.NewId(),
-		},
-		{
-			CreatorId: model.NewId(),
-			Name:      model.NewId(),
-		},
-		{
-			CreatorId: model.NewId(),
-			Name:      model.NewId(),
-		},
-	}
-
-	for i, emoji := range emojis {
-		emojis[i] = *store.Must(ss.Emoji().Save(&emoji)).(*model.Emoji)
-	}
-	defer func() {
-		for _, emoji := range emojis {
-			store.Must(ss.Emoji().Delete(emoji.Id, time.Now().Unix()))
-		}
-	}()
-
-	if result := <-ss.Emoji().GetList(0, 100); result.Err != nil {
-		t.Fatal(result.Err)
-	} else {
-		for _, emoji := range emojis {
-			found := false
-
-			for _, savedEmoji := range result.Data.([]*model.Emoji) {
-				if emoji.Id == savedEmoji.Id {
-					found = true
-					break
-				}
-			}
-
-			if !found {
-				t.Fatalf("failed to get emoji with id %v", emoji.Id)
-			}
-		}
-	}
+func TestEmojiStore(t *testing.T) {
+	StoreTest(t, storetest.TestEmojiStore)
 }