1 files changed, 14 insertions, 15 deletions
diff --git a/model/preference_test.go b/model/preference_test.go
index bfbe81f39..170784c1f 100644
--- a/model/preference_test.go
+++ b/model/preference_test.go
@@ -9,15 +9,19 @@ import (
 )
 
 func TestPreferenceIsValid(t *testing.T) {
-	preference := Preference{}
+	preference := Preference{
+		UserId:   "1234garbage",
+		Category: PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW,
+		Name:     PREFERENCE_NAME_TEST,
+	}
 
 	if err := preference.IsValid(); err == nil {
 		t.Fatal()
 	}
 
 	preference.UserId = NewId()
-	if err := preference.IsValid(); err == nil {
-		t.Fatal()
+	if err := preference.IsValid(); err != nil {
+		t.Fatal(err)
 	}
 
 	preference.Category = "1234garbage"
@@ -25,8 +29,8 @@ func TestPreferenceIsValid(t *testing.T) {
 		t.Fatal()
 	}
 
-	preference.Category = PREFERENCE_CATEGORY_DIRECT_CHANNELS
-	if err := preference.IsValid(); err == nil {
+	preference.Category = PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW
+	if err := preference.IsValid(); err != nil {
 		t.Fatal()
 	}
 
@@ -35,18 +39,18 @@ func TestPreferenceIsValid(t *testing.T) {
 		t.Fatal()
 	}
 
-	preference.Name = PREFERENCE_NAME_SHOW
+	preference.Name = NewId()
 	if err := preference.IsValid(); err != nil {
 		t.Fatal()
 	}
 
-	preference.AltId = "1234garbage"
-	if err := preference.IsValid(); err == nil {
+	preference.Name = PREFERENCE_NAME_TEST
+	if err := preference.IsValid(); err != nil {
 		t.Fatal()
 	}
 
-	preference.AltId = NewId()
-	if err := preference.IsValid(); err != nil {
+	preference.Value = strings.Repeat("01234567890", 20)
+	if err := preference.IsValid(); err == nil {
 		t.Fatal()
 	}
 
@@ -54,9 +58,4 @@ func TestPreferenceIsValid(t *testing.T) {
 	if err := preference.IsValid(); err != nil {
 		t.Fatal()
 	}
-
-	preference.Value = strings.Repeat("01234567890", 20)
-	if err := preference.IsValid(); err == nil {
-		t.Fatal()
-	}
 }