1 files changed, 95 insertions, 7 deletions

diff --git a/store/sql_post_store_test.go b/store/sql_post_store_test.go
index 336a20d98..d48dea51c 100644
--- a/store/sql_post_store_test.go
+++ b/store/sql_post_store_test.go
@@ -4,11 +4,11 @@
 package store
 
 import (
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/mattermost/platform/model"
 )
 
 func TestPostStoreSave(t *testing.T) {
@@ -374,6 +374,91 @@ func TestPostStoreGetPostsWtihDetails(t *testing.T) {
 		t.Fatal("invalid order")
 	}
 
+	if len(r1.Posts) != 5 { //the last 4, + o1 (o3 and o2a's parent)
+		t.Fatal("wrong size")
+	}
+
+	if r1.Posts[o1.Id].Message != o1.Message {
+		t.Fatal("Missing parent")
+	}
+}
+
+func TestPostStoreGetPostsSince(t *testing.T) {
+	Setup()
+	o0 := &model.Post{}
+	o0.ChannelId = model.NewId()
+	o0.UserId = model.NewId()
+	o0.Message = "a" + model.NewId() + "b"
+	o0 = (<-store.Post().Save(o0)).Data.(*model.Post)
+	time.Sleep(2 * time.Millisecond)
+
+	o1 := &model.Post{}
+	o1.ChannelId = model.NewId()
+	o1.UserId = model.NewId()
+	o1.Message = "a" + model.NewId() + "b"
+	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
+	time.Sleep(2 * time.Millisecond)
+
+	o2 := &model.Post{}
+	o2.ChannelId = o1.ChannelId
+	o2.UserId = model.NewId()
+	o2.Message = "a" + model.NewId() + "b"
+	o2.ParentId = o1.Id
+	o2.RootId = o1.Id
+	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
+	time.Sleep(2 * time.Millisecond)
+
+	o2a := &model.Post{}
+	o2a.ChannelId = o1.ChannelId
+	o2a.UserId = model.NewId()
+	o2a.Message = "a" + model.NewId() + "b"
+	o2a.ParentId = o1.Id
+	o2a.RootId = o1.Id
+	o2a = (<-store.Post().Save(o2a)).Data.(*model.Post)
+	time.Sleep(2 * time.Millisecond)
+
+	o3 := &model.Post{}
+	o3.ChannelId = o1.ChannelId
+	o3.UserId = model.NewId()
+	o3.Message = "a" + model.NewId() + "b"
+	o3.ParentId = o1.Id
+	o3.RootId = o1.Id
+	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
+	time.Sleep(2 * time.Millisecond)
+
+	o4 := &model.Post{}
+	o4.ChannelId = o1.ChannelId
+	o4.UserId = model.NewId()
+	o4.Message = "a" + model.NewId() + "b"
+	o4 = (<-store.Post().Save(o4)).Data.(*model.Post)
+	time.Sleep(2 * time.Millisecond)
+
+	o5 := &model.Post{}
+	o5.ChannelId = o1.ChannelId
+	o5.UserId = model.NewId()
+	o5.Message = "a" + model.NewId() + "b"
+	o5.ParentId = o4.Id
+	o5.RootId = o4.Id
+	o5 = (<-store.Post().Save(o5)).Data.(*model.Post)
+
+	r1 := (<-store.Post().GetPostsSince(o1.ChannelId, o1.CreateAt)).Data.(*model.PostList)
+
+	if r1.Order[0] != o5.Id {
+		t.Fatal("invalid order")
+	}
+
+	if r1.Order[1] != o4.Id {
+		t.Fatal("invalid order")
+	}
+
+	if r1.Order[2] != o3.Id {
+		t.Fatal("invalid order")
+	}
+
+	if r1.Order[3] != o2a.Id {
+		t.Fatal("invalid order")
+	}
+
 	if len(r1.Posts) != 6 {
 		t.Fatal("wrong size")
 	}
@@ -462,11 +547,9 @@ func TestPostStoreSearch(t *testing.T) {
 		t.Fatal("returned wrong serach result")
 	}
 
-	if utils.Cfg.SqlSettings.DriverName == "mysql" {
-		r5 := (<-store.Post().Search(teamId, userId, "matter*", false)).Data.(*model.PostList)
-		if len(r5.Order) != 1 && r5.Order[0] != o1.Id {
-			t.Fatal("returned wrong serach result")
-		}
+	r5 := (<-store.Post().Search(teamId, userId, "matter*", false)).Data.(*model.PostList)
+	if len(r5.Order) != 1 && r5.Order[0] != o1.Id {
+		t.Fatal("returned wrong serach result")
 	}
 
 	r6 := (<-store.Post().Search(teamId, userId, "#hashtag", true)).Data.(*model.PostList)
@@ -488,4 +571,9 @@ func TestPostStoreSearch(t *testing.T) {
 	if len(r9.Order) != 2 {
 		t.Fatal("returned wrong search result")
 	}
+
+	r10 := (<-store.Post().Search(teamId, userId, "matter* jer*", false)).Data.(*model.PostList)
+	if len(r10.Order) != 2 {
+		t.Fatal("returned wrong search result")
+	}
 }