oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-03 16:38:31 +00:00
Code Wiki Activity

Fix tests for deleted code

Browse source
This commit is contained in:
Kane York 2015-11-19 16:38:07 -08:00
parent 75bee4fee5
commit 3c3791579f
2 changed files with 45 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
socketserver/server/publisher.go
View file

@ -8,6 +8,7 @@ import (
"strconv"
"sync"
"time"
"strings"
)
type PushCommandCacheInfo struct {
@ -260,6 +261,12 @@ func HTTPBackendCachedPublish(w http.ResponseWriter, r *http.Request) {
} else if cacheinfo.Caching == CacheTypePersistent && cacheinfo.Target == MsgTargetTypeChat {
SaveLastMessage(PersistentLastMessages, &PersistentLSMLock, cmd, channel, timestamp, json, deleteMode)
count = PublishToChannel(channel, msg)
} else if cacheinfo.Caching == CacheTypeLastOnly && cacheinfo.Target == MsgTargetTypeMultichat {
channels := strings.Split(channel, ",")
for _, channel := range channels {
SaveLastMessage(CachedLastMessages, &CachedLSMLock, cmd, channel, timestamp, json, deleteMode)
}
count = PublishToMultiple(channels, msg)
}
w.Write([]byte(strconv.Itoa(count)))

52
socketserver/server/subscriptions_test.go
View file

@ -93,7 +93,31 @@ func TSealForSavePubMsg(tb testing.TB, cmd Command, channel string, arguments in
return sealed, nil
}
func TCheckResponse(tb testing.TB, resp *http.Response, expected string) bool {
func TSealForUncachedPubMsg(tb testing.TB, cmd Command, channel string, arguments interface{}, scope MessageTargetType, deleteMode bool) (url.Values, error) {
form := url.Values{}
form.Set("cmd", string(cmd))
argsBytes, err := json.Marshal(arguments)
if err != nil {
tb.Error(err)
return nil, err
}
form.Set("args", string(argsBytes))
form.Set("channel", channel)
if deleteMode {
form.Set("delete", "1")
}
form.Set("time", time.Now().Format(time.UnixDate))
form.Set("scope", scope.String())
sealed, err := SealRequest(form)
if err != nil {
tb.Error(err)
return nil, err
}
return sealed, nil
}
func TCheckResponse(tb testing.TB, resp *http.Response, expected string, desc string) bool {
var failed bool
respBytes, err := ioutil.ReadAll(resp.Body)
resp.Body.Close()
@ -110,7 +134,7 @@ func TCheckResponse(tb testing.TB, resp *http.Response, expected string) bool {
}
if respStr != expected {
tb.Errorf("Got wrong response from server. Expected: '%s' Got: '%s'", expected, respStr)
tb.Errorf("Got wrong response from server. %s Expected: '%s' Got: '%s'", desc, expected, respStr)
failed = true
}
return !failed
@ -119,8 +143,8 @@ func TCheckResponse(tb testing.TB, resp *http.Response, expected string) bool {
type TURLs struct {
Websocket string
Origin string
PubMsg string
SavePubMsg string // update_and_pub
UncachedPubMsg string // uncached_pub
SavePubMsg string // cached_pub
}
func TGetUrls(testserver *httptest.Server) TURLs {
@ -128,7 +152,7 @@ func TGetUrls(testserver *httptest.Server) TURLs {
return TURLs{
Websocket: fmt.Sprintf("ws://%s/", addr),
Origin: fmt.Sprintf("http://%s", addr),
PubMsg: fmt.Sprintf("http://%s/uncached_pub", addr),
UncachedPubMsg: fmt.Sprintf("http://%s/uncached_pub", addr),
SavePubMsg: fmt.Sprintf("http://%s/cached_pub", addr),
}
}
@ -191,8 +215,8 @@ func TestSubscriptionAndPublish(t *testing.T) {
var TestData4 = []interface{}{"str1", "str2", "str3"}
S2CCommandsCacheInfo[TestCommandChan] = PushCommandCacheInfo{CacheTypeLastOnly, MsgTargetTypeChat}
S2CCommandsCacheInfo[TestCommandMulti] = PushCommandCacheInfo{CacheTypeTimestamps, MsgTargetTypeMultichat}
S2CCommandsCacheInfo[TestCommandGlobal] = PushCommandCacheInfo{CacheTypeTimestamps, MsgTargetTypeGlobal}
S2CCommandsCacheInfo[TestCommandMulti] = PushCommandCacheInfo{CacheTypeLastOnly, MsgTargetTypeMultichat}
S2CCommandsCacheInfo[TestCommandGlobal] = PushCommandCacheInfo{CacheTypeLastOnly, MsgTargetTypeGlobal}
var server *httptest.Server
var urls TURLs
@ -214,7 +238,7 @@ func TestSubscriptionAndPublish(t *testing.T) {
// msg 1: ch1
// msg 2: ch2, ch3
// msg 3: chEmpty
// msg 4: global
// msg 4: global uncached
// Client 1
conn, resp, err = websocket.DefaultDialer.Dial(urls.Websocket, headers)
@ -309,7 +333,7 @@ func TestSubscriptionAndPublish(t *testing.T) {
t.FailNow()
}
resp, err = http.PostForm(urls.SavePubMsg, form)
if !TCheckResponse(t, resp, strconv.Itoa(2)) {
if !TCheckResponse(t, resp, strconv.Itoa(2), "pub msg 1") {
t.FailNow()
}
@ -320,7 +344,7 @@ func TestSubscriptionAndPublish(t *testing.T) {
t.FailNow()
}
resp, err = http.PostForm(urls.SavePubMsg, form)
if !TCheckResponse(t, resp, strconv.Itoa(2)) {
if !TCheckResponse(t, resp, strconv.Itoa(2), "pub msg 2") {
t.FailNow()
}
@ -331,18 +355,18 @@ func TestSubscriptionAndPublish(t *testing.T) {
t.FailNow()
}
resp, err = http.PostForm(urls.SavePubMsg, form)
if !TCheckResponse(t, resp, strconv.Itoa(0)) {
if !TCheckResponse(t, resp, strconv.Itoa(0), "pub msg 3") {
t.FailNow()
}
// Publish message 4 - should go to clients 1, 2, 3
form, err = TSealForSavePubMsg(t, TestCommandGlobal, "", TestData4, false)
form, err = TSealForUncachedPubMsg(t, TestCommandGlobal, "", TestData4, MsgTargetTypeGlobal, false)
if err != nil {
t.FailNow()
}
resp, err = http.PostForm(urls.SavePubMsg, form)
if !TCheckResponse(t, resp, strconv.Itoa(3)) {
resp, err = http.PostForm(urls.UncachedPubMsg, form)
if !TCheckResponse(t, resp, strconv.Itoa(3), "pub msg 4") {
t.FailNow()
}