diff --git a/tw/twdataloader/helpers.go b/tw/twdataloader/helpers.go index 5633aa4..a41e2e2 100644 --- a/tw/twdataloader/helpers.go +++ b/tw/twdataloader/helpers.go @@ -33,9 +33,11 @@ type handlers struct { killAllTribe http.HandlerFunc killAttTribe http.HandlerFunc killDefTribe http.HandlerFunc - getPlayers http.HandlerFunc - getTribes http.HandlerFunc - getVillages http.HandlerFunc + player http.HandlerFunc + tribe http.HandlerFunc + village http.HandlerFunc + conquer http.HandlerFunc + getConquer http.HandlerFunc } func (h *handlers) init() { @@ -66,14 +68,20 @@ func (h *handlers) init() { if h.killDefTribe == nil { h.killDefTribe = noop } - if h.getPlayers == nil { - h.getPlayers = noop + if h.player == nil { + h.player = noop } - if h.getTribes == nil { - h.getTribes = noop + if h.tribe == nil { + h.tribe = noop } - if h.getVillages == nil { - h.getVillages = noop + if h.village == nil { + 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) return case EndpointPlayer: - h.getPlayers(w, r) + h.player(w, r) return case EndpointTribe: - h.getTribes(w, r) + h.tribe(w, r) return 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 default: w.WriteHeader(http.StatusNotFound) diff --git a/tw/twdataloader/server_data_loader_test.go b/tw/twdataloader/server_data_loader_test.go index 1c56bd7..be0e363 100644 --- a/tw/twdataloader/server_data_loader_test.go +++ b/tw/twdataloader/server_data_loader_test.go @@ -250,7 +250,7 @@ func TestLoadPlayers(t *testing.T) { for _, scenario := range scenarios { ts := prepareTestServer(&handlers{ - getPlayers: createWriteCompressedStringHandler(scenario.resp), + player: createWriteCompressedStringHandler(scenario.resp), }) dl := NewServerDataLoader(&ServerDataLoaderConfig{ @@ -360,7 +360,7 @@ func TestLoadTribes(t *testing.T) { for _, scenario := range scenarios { ts := prepareTestServer(&handlers{ - getTribes: createWriteCompressedStringHandler(scenario.resp), + tribe: createWriteCompressedStringHandler(scenario.resp), }) dl := NewServerDataLoader(&ServerDataLoaderConfig{ @@ -465,7 +465,7 @@ func TestLoadVillages(t *testing.T) { for _, scenario := range scenarios { ts := prepareTestServer(&handlers{ - getVillages: createWriteCompressedStringHandler(scenario.resp), + village: createWriteCompressedStringHandler(scenario.resp), }) dl := NewServerDataLoader(&ServerDataLoaderConfig{