rename a few fields in the handlers struct and add two new (conquer, getConquer)
This commit is contained in:
parent
77e67c83dd
commit
4e82ae6bed
|
@ -33,9 +33,11 @@ type handlers struct {
|
||||||
killAllTribe http.HandlerFunc
|
killAllTribe http.HandlerFunc
|
||||||
killAttTribe http.HandlerFunc
|
killAttTribe http.HandlerFunc
|
||||||
killDefTribe http.HandlerFunc
|
killDefTribe http.HandlerFunc
|
||||||
getPlayers http.HandlerFunc
|
player http.HandlerFunc
|
||||||
getTribes http.HandlerFunc
|
tribe http.HandlerFunc
|
||||||
getVillages http.HandlerFunc
|
village http.HandlerFunc
|
||||||
|
conquer http.HandlerFunc
|
||||||
|
getConquer http.HandlerFunc
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *handlers) init() {
|
func (h *handlers) init() {
|
||||||
|
@ -66,14 +68,20 @@ func (h *handlers) init() {
|
||||||
if h.killDefTribe == nil {
|
if h.killDefTribe == nil {
|
||||||
h.killDefTribe = noop
|
h.killDefTribe = noop
|
||||||
}
|
}
|
||||||
if h.getPlayers == nil {
|
if h.player == nil {
|
||||||
h.getPlayers = noop
|
h.player = noop
|
||||||
}
|
}
|
||||||
if h.getTribes == nil {
|
if h.tribe == nil {
|
||||||
h.getTribes = noop
|
h.tribe = noop
|
||||||
}
|
}
|
||||||
if h.getVillages == nil {
|
if h.village == nil {
|
||||||
h.getVillages = noop
|
h.village = noop
|
||||||
|
}
|
||||||
|
if h.conquer == nil {
|
||||||
|
h.conquer = noop
|
||||||
|
}
|
||||||
|
if h.getConquer == nil {
|
||||||
|
h.getConquer = noop
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -114,13 +122,19 @@ func prepareTestServer(h *handlers) *httptest.Server {
|
||||||
h.killDefTribe(w, r)
|
h.killDefTribe(w, r)
|
||||||
return
|
return
|
||||||
case EndpointPlayer:
|
case EndpointPlayer:
|
||||||
h.getPlayers(w, r)
|
h.player(w, r)
|
||||||
return
|
return
|
||||||
case EndpointTribe:
|
case EndpointTribe:
|
||||||
h.getTribes(w, r)
|
h.tribe(w, r)
|
||||||
return
|
return
|
||||||
case EndpointVillage:
|
case EndpointVillage:
|
||||||
h.getVillages(w, r)
|
h.village(w, r)
|
||||||
|
return
|
||||||
|
case EndpointConquer:
|
||||||
|
h.conquer(w, r)
|
||||||
|
return
|
||||||
|
case EndpointGetConquer:
|
||||||
|
h.getConquer(w, r)
|
||||||
return
|
return
|
||||||
default:
|
default:
|
||||||
w.WriteHeader(http.StatusNotFound)
|
w.WriteHeader(http.StatusNotFound)
|
||||||
|
|
|
@ -250,7 +250,7 @@ func TestLoadPlayers(t *testing.T) {
|
||||||
|
|
||||||
for _, scenario := range scenarios {
|
for _, scenario := range scenarios {
|
||||||
ts := prepareTestServer(&handlers{
|
ts := prepareTestServer(&handlers{
|
||||||
getPlayers: createWriteCompressedStringHandler(scenario.resp),
|
player: createWriteCompressedStringHandler(scenario.resp),
|
||||||
})
|
})
|
||||||
|
|
||||||
dl := NewServerDataLoader(&ServerDataLoaderConfig{
|
dl := NewServerDataLoader(&ServerDataLoaderConfig{
|
||||||
|
@ -360,7 +360,7 @@ func TestLoadTribes(t *testing.T) {
|
||||||
|
|
||||||
for _, scenario := range scenarios {
|
for _, scenario := range scenarios {
|
||||||
ts := prepareTestServer(&handlers{
|
ts := prepareTestServer(&handlers{
|
||||||
getTribes: createWriteCompressedStringHandler(scenario.resp),
|
tribe: createWriteCompressedStringHandler(scenario.resp),
|
||||||
})
|
})
|
||||||
|
|
||||||
dl := NewServerDataLoader(&ServerDataLoaderConfig{
|
dl := NewServerDataLoader(&ServerDataLoaderConfig{
|
||||||
|
@ -465,7 +465,7 @@ func TestLoadVillages(t *testing.T) {
|
||||||
|
|
||||||
for _, scenario := range scenarios {
|
for _, scenario := range scenarios {
|
||||||
ts := prepareTestServer(&handlers{
|
ts := prepareTestServer(&handlers{
|
||||||
getVillages: createWriteCompressedStringHandler(scenario.resp),
|
village: createWriteCompressedStringHandler(scenario.resp),
|
||||||
})
|
})
|
||||||
|
|
||||||
dl := NewServerDataLoader(&ServerDataLoaderConfig{
|
dl := NewServerDataLoader(&ServerDataLoaderConfig{
|
||||||
|
|
Reference in New Issue