1 files changed, 43 insertions, 15 deletions

diff --git a/store/sql_post_store_test.go b/store/sql_post_store_test.go
index 6105cbace..d685ea41e 100644
--- a/store/sql_post_store_test.go
+++ b/store/sql_post_store_test.go
@@ -87,45 +87,73 @@ func TestPostStoreUpdate(t *testing.T) {
 
 	ro1 := (<-store.Post().Get(o1.Id)).Data.(*model.PostList).Posts[o1.Id]
 	ro2 := (<-store.Post().Get(o1.Id)).Data.(*model.PostList).Posts[o2.Id]
-	ro6 := (<-store.Post().Get(o3.Id)).Data.(*model.PostList).Posts[o3.Id]
+	ro3 := (<-store.Post().Get(o3.Id)).Data.(*model.PostList).Posts[o3.Id]
 
 	if ro1.Message != o1.Message {
 		t.Fatal("Failed to save/get")
 	}
 
-	msg := o1.Message + "BBBBBBBBBB"
-	if result := <-store.Post().Update(ro1, msg, ""); result.Err != nil {
+	o1a := &model.Post{}
+	*o1a = *ro1
+	o1a.Message = ro1.Message + "BBBBBBBBBB"
+	if result := <-store.Post().Update(o1a, ro1); result.Err != nil {
 		t.Fatal(result.Err)
 	}
 
-	msg2 := o2.Message + "DDDDDDD"
-	if result := <-store.Post().Update(ro2, msg2, ""); result.Err != nil {
-		t.Fatal(result.Err)
+	ro1a := (<-store.Post().Get(o1.Id)).Data.(*model.PostList).Posts[o1.Id]
+
+	if ro1a.Message != o1a.Message {
+		t.Fatal("Failed to update/get")
 	}
 
-	msg3 := o3.Message + "WWWWWWW"
-	if result := <-store.Post().Update(ro6, msg3, "#hashtag"); result.Err != nil {
+	o2a := &model.Post{}
+	*o2a = *ro2
+	o2a.Message = ro2.Message + "DDDDDDD"
+	if result := <-store.Post().Update(o2a, ro2); result.Err != nil {
 		t.Fatal(result.Err)
 	}
 
-	ro3 := (<-store.Post().Get(o1.Id)).Data.(*model.PostList).Posts[o1.Id]
+	ro2a := (<-store.Post().Get(o1.Id)).Data.(*model.PostList).Posts[o2.Id]
 
-	if ro3.Message != msg {
+	if ro2a.Message != o2a.Message {
 		t.Fatal("Failed to update/get")
 	}
 
-	ro4 := (<-store.Post().Get(o1.Id)).Data.(*model.PostList).Posts[o2.Id]
+	o3a := &model.Post{}
+	*o3a = *ro3
+	o3a.Message = ro3.Message + "WWWWWWW"
+	if result := <-store.Post().Update(o3a, ro3); result.Err != nil {
+		t.Fatal(result.Err)
+	}
+
+	ro3a := (<-store.Post().Get(o3.Id)).Data.(*model.PostList).Posts[o3.Id]
 
-	if ro4.Message != msg2 {
+	if ro3a.Message != o3a.Message && ro3a.Hashtags != o3a.Hashtags {
 		t.Fatal("Failed to update/get")
 	}
 
-	ro5 := (<-store.Post().Get(o3.Id)).Data.(*model.PostList).Posts[o3.Id]
+	o4 := Must(store.Post().Save(&model.Post{
+		ChannelId: model.NewId(),
+		UserId:    model.NewId(),
+		Message:   model.NewId(),
+		Filenames: []string{"test"},
+	})).(*model.Post)
 
-	if ro5.Message != msg3 && ro5.Hashtags != "#hashtag" {
-		t.Fatal("Failed to update/get")
+	ro4 := (<-store.Post().Get(o4.Id)).Data.(*model.PostList).Posts[o4.Id]
+
+	o4a := &model.Post{}
+	*o4a = *ro4
+	o4a.Filenames = []string{}
+	o4a.FileIds = []string{model.NewId()}
+	if result := <-store.Post().Update(o4a, ro4); result.Err != nil {
+		t.Fatal(result.Err)
 	}
 
+	if ro4a := Must(store.Post().Get(o4.Id)).(*model.PostList).Posts[o4.Id]; len(ro4a.Filenames) != 0 {
+		t.Fatal("Failed to clear Filenames")
+	} else if len(ro4a.FileIds) != 1 {
+		t.Fatal("Failed to set FileIds")
+	}
 }
 
 func TestPostStoreDelete(t *testing.T) {