From dd86d3532a0bb7952958ff85f9ec4eff9e18db91 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 2 Nov 2015 14:05:40 -0500 Subject: Improved tests for search wildcards and removed duplicate search code --- store/sql_post_store.go | 7 ------- store/sql_post_store_test.go | 12 ++++++------ 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'store') diff --git a/store/sql_post_store.go b/store/sql_post_store.go index f514d23ed..de8c4f356 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -443,13 +443,6 @@ func (s SqlPostStore) Search(teamId string, userId string, params *model.SearchP var posts []*model.Post - if utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_POSTGRES { - // Parse text for wildcards - if wildcard, err := regexp.Compile("\\*($| )"); err == nil { - terms = wildcard.ReplaceAllLiteralString(terms, "* ") - } - } - searchQuery := ` SELECT * diff --git a/store/sql_post_store_test.go b/store/sql_post_store_test.go index 872423c5a..0980b1a11 100644 --- a/store/sql_post_store_test.go +++ b/store/sql_post_store_test.go @@ -526,32 +526,32 @@ func TestPostStoreSearch(t *testing.T) { o5 = (<-store.Post().Save(o5)).Data.(*model.Post) r1 := (<-store.Post().Search(teamId, userId, &model.SearchParams{Terms: "corey", IsHashtag: false})).Data.(*model.PostList) - if len(r1.Order) != 1 && r1.Order[0] != o1.Id { + if len(r1.Order) != 1 || r1.Order[0] != o1.Id { t.Fatal("returned wrong search result") } r3 := (<-store.Post().Search(teamId, userId, &model.SearchParams{Terms: "new", IsHashtag: false})).Data.(*model.PostList) - if len(r3.Order) != 2 && r3.Order[0] != o1.Id { + if len(r3.Order) != 2 || (r3.Order[0] != o1.Id && r3.Order[1] != o1.Id) { t.Fatal("returned wrong search result") } r4 := (<-store.Post().Search(teamId, userId, &model.SearchParams{Terms: "john", IsHashtag: false})).Data.(*model.PostList) - if len(r4.Order) != 1 && r4.Order[0] != o2.Id { + if len(r4.Order) != 1 || r4.Order[0] != o2.Id { t.Fatal("returned wrong search result") } r5 := (<-store.Post().Search(teamId, userId, &model.SearchParams{Terms: "matter*", IsHashtag: false})).Data.(*model.PostList) - if len(r5.Order) != 1 && r5.Order[0] != o1.Id { + if len(r5.Order) != 1 || r5.Order[0] != o1.Id { t.Fatal("returned wrong search result") } r6 := (<-store.Post().Search(teamId, userId, &model.SearchParams{Terms: "#hashtag", IsHashtag: true})).Data.(*model.PostList) - if len(r6.Order) != 1 && r6.Order[0] != o4.Id { + if len(r6.Order) != 1 || r6.Order[0] != o4.Id { t.Fatal("returned wrong search result") } r7 := (<-store.Post().Search(teamId, userId, &model.SearchParams{Terms: "#secret", IsHashtag: true})).Data.(*model.PostList) - if len(r7.Order) != 1 && r7.Order[0] != o5.Id { + if len(r7.Order) != 1 || r7.Order[0] != o5.Id { t.Fatal("returned wrong search result") } -- cgit v1.2.3-1-g7c22