1 files changed, 3 insertions, 191 deletions

diff --git a/store/sqlstore/cluster_discovery_store_test.go b/store/sqlstore/cluster_discovery_store_test.go
index ce361d59d..b6503ccb8 100644
--- a/store/sqlstore/cluster_discovery_store_test.go
+++ b/store/sqlstore/cluster_discovery_store_test.go
@@ -6,197 +6,9 @@ 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 TestSqlClusterDiscoveryStore(t *testing.T) {
-	ss := Setup()
-
-	discovery := &model.ClusterDiscovery{
-		ClusterName: "cluster_name",
-		Hostname:    "hostname" + model.NewId(),
-		Type:        "test_test",
-	}
-
-	if result := <-ss.ClusterDiscovery().Save(discovery); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-
-	if result := <-ss.ClusterDiscovery().Cleanup(); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-}
-
-func TestSqlClusterDiscoveryStoreDelete(t *testing.T) {
-	ss := Setup()
-
-	discovery := &model.ClusterDiscovery{
-		ClusterName: "cluster_name",
-		Hostname:    "hostname" + model.NewId(),
-		Type:        "test_test",
-	}
-
-	if result := <-ss.ClusterDiscovery().Save(discovery); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-
-	if result := <-ss.ClusterDiscovery().Delete(discovery); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-}
-
-func TestSqlClusterDiscoveryStoreLastPing(t *testing.T) {
-	ss := Setup()
-
-	discovery := &model.ClusterDiscovery{
-		ClusterName: "cluster_name_lastPing",
-		Hostname:    "hostname" + model.NewId(),
-		Type:        "test_test_lastPing" + model.NewId(),
-	}
-
-	if result := <-ss.ClusterDiscovery().Save(discovery); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-
-	if result := <-ss.ClusterDiscovery().SetLastPingAt(discovery); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-
-	ttime := model.GetMillis()
-
-	time.Sleep(1 * time.Second)
-
-	if result := <-ss.ClusterDiscovery().SetLastPingAt(discovery); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-
-	if result := <-ss.ClusterDiscovery().GetAll(discovery.Type, "cluster_name_lastPing"); result.Err != nil {
-		t.Fatal(result.Err)
-	} else {
-		list := result.Data.([]*model.ClusterDiscovery)
-
-		if len(list) != 1 {
-			t.Fatal("should only be 1 items")
-			return
-		}
-
-		if list[0].LastPingAt-ttime < 500 {
-			t.Fatal("failed to set time")
-		}
-	}
-
-	discovery2 := &model.ClusterDiscovery{
-		ClusterName: "cluster_name_missing",
-		Hostname:    "hostname" + model.NewId(),
-		Type:        "test_test_missing",
-	}
-
-	if result := <-ss.ClusterDiscovery().SetLastPingAt(discovery2); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-}
-
-func TestSqlClusterDiscoveryStoreExists(t *testing.T) {
-	ss := Setup()
-
-	discovery := &model.ClusterDiscovery{
-		ClusterName: "cluster_name_Exists",
-		Hostname:    "hostname" + model.NewId(),
-		Type:        "test_test_Exists" + model.NewId(),
-	}
-
-	if result := <-ss.ClusterDiscovery().Save(discovery); result.Err != nil {
-		t.Fatal(result.Err)
-	}
-
-	if result := <-ss.ClusterDiscovery().Exists(discovery); result.Err != nil {
-		t.Fatal(result.Err)
-	} else {
-		val := result.Data.(bool)
-		if !val {
-			t.Fatal("should be true")
-		}
-	}
-
-	discovery.ClusterName = "cluster_name_Exists2"
-
-	if result := <-ss.ClusterDiscovery().Exists(discovery); result.Err != nil {
-		t.Fatal(result.Err)
-	} else {
-		val := result.Data.(bool)
-		if val {
-			t.Fatal("should be true")
-		}
-	}
-}
-
-func TestSqlClusterDiscoveryGetStore(t *testing.T) {
-	ss := Setup()
-
-	testType1 := model.NewId()
-
-	discovery1 := &model.ClusterDiscovery{
-		ClusterName: "cluster_name",
-		Hostname:    "hostname1",
-		Type:        testType1,
-	}
-	store.Must(ss.ClusterDiscovery().Save(discovery1))
-
-	discovery2 := &model.ClusterDiscovery{
-		ClusterName: "cluster_name",
-		Hostname:    "hostname2",
-		Type:        testType1,
-	}
-	store.Must(ss.ClusterDiscovery().Save(discovery2))
-
-	discovery3 := &model.ClusterDiscovery{
-		ClusterName: "cluster_name",
-		Hostname:    "hostname3",
-		Type:        testType1,
-		CreateAt:    1,
-		LastPingAt:  1,
-	}
-	store.Must(ss.ClusterDiscovery().Save(discovery3))
-
-	testType2 := model.NewId()
-
-	discovery4 := &model.ClusterDiscovery{
-		ClusterName: "cluster_name",
-		Hostname:    "hostname1",
-		Type:        testType2,
-	}
-	store.Must(ss.ClusterDiscovery().Save(discovery4))
-
-	if result := <-ss.ClusterDiscovery().GetAll(testType1, "cluster_name"); result.Err != nil {
-		t.Fatal(result.Err)
-	} else {
-		list := result.Data.([]*model.ClusterDiscovery)
-
-		if len(list) != 2 {
-			t.Fatal("Should only have returned 2")
-		}
-	}
-
-	if result := <-ss.ClusterDiscovery().GetAll(testType2, "cluster_name"); result.Err != nil {
-		t.Fatal(result.Err)
-	} else {
-		list := result.Data.([]*model.ClusterDiscovery)
-
-		if len(list) != 1 {
-			t.Fatal("Should only have returned 1")
-		}
-	}
-
-	if result := <-ss.ClusterDiscovery().GetAll(model.NewId(), "cluster_name"); result.Err != nil {
-		t.Fatal(result.Err)
-	} else {
-		list := result.Data.([]*model.ClusterDiscovery)
-
-		if len(list) != 0 {
-			t.Fatal("shouldn't be any")
-		}
-	}
+func TestClusterDiscoveryStore(t *testing.T) {
+	StoreTest(t, storetest.TestClusterDiscoveryStore)
 }