http-server: Refactor for readability, table driven tests (quii#281)

Signed-off-by: nicnicknicky <5416460+nicnicknicky@users.noreply.github.com>

Author: nicnicknicky

http-server/v2/server_test.go

@@ -25,34 +25,42 @@ func TestGETPlayers(t *testing.T) {
 }
 server := &PlayerServer{&store}
 
-t.Run("returns Pepper's score", func(t *testing.T) {
-request := newGetScoreRequest("Pepper")
-response := httptest.NewRecorder()
-
-server.ServeHTTP(response, request)
-
-assertStatus(t, response.Code, http.StatusOK)
-assertResponseBody(t, response.Body.String(), "20")
-})
-
-t.Run("returns Floyd's score", func(t *testing.T) {
-request := newGetScoreRequest("Floyd")
-response := httptest.NewRecorder()
-
-server.ServeHTTP(response, request)
-
-assertStatus(t, response.Code, http.StatusOK)
-assertResponseBody(t, response.Body.String(), "10")
-})
-
-t.Run("returns 404 on missing players", func(t *testing.T) {
-request := newGetScoreRequest("Apollo")
-response := httptest.NewRecorder()
+tests := []struct {
+name string
+player string
+expectedHTTPStatus int
+expectedScore string
+}{
+{
+name: "Returns Pepper's score",
+player: "Pepper",
+expectedHTTPStatus: http.StatusOK,
+expectedScore: "20",
+},
+{
+name: "Returns Floyd's score",
+player: "Floyd",
+expectedHTTPStatus: http.StatusOK,
+expectedScore: "10",
+},
+{
+name: "Returns 404 on missing players",
+player: "Apollo",
+expectedHTTPStatus: http.StatusNotFound,
+expectedScore: "0",
+},
+}
+for _, tt := range tests {
+t.Run(tt.name, func(t *testing.T) {
+request := newGetScoreRequest(tt.player)
+response := httptest.NewRecorder()
 
-server.ServeHTTP(response, request)
+server.ServeHTTP(response, request)
 
-assertStatus(t, response.Code, http.StatusNotFound)
-})
+assertStatus(t, response.Code, tt.expectedHTTPStatus)
+assertResponseBody(t, response.Body.String(), tt.expectedScore)
+})
+}
 }
 
 func assertStatus(t *testing.T, got, want int) {

http-server/v3/server_test.go

@@ -25,34 +25,42 @@ func TestGETPlayers(t *testing.T) {
 }
 server := &PlayerServer{&store}
 
-t.Run("returns Pepper's score", func(t *testing.T) {
-request := newGetScoreRequest("Pepper")
-response := httptest.NewRecorder()
-
-server.ServeHTTP(response, request)
-
-assertStatus(t, response.Code, http.StatusOK)
-assertResponseBody(t, response.Body.String(), "20")
-})
-
-t.Run("returns Floyd's score", func(t *testing.T) {
-request := newGetScoreRequest("Floyd")
-response := httptest.NewRecorder()
-
-server.ServeHTTP(response, request)
-
-assertStatus(t, response.Code, http.StatusOK)
-assertResponseBody(t, response.Body.String(), "10")
-})
-
-t.Run("returns 404 on missing players", func(t *testing.T) {
-request := newGetScoreRequest("Apollo")
-response := httptest.NewRecorder()
+tests := []struct {
+name string
+player string
+expectedHTTPStatus int
+expectedScore string
+}{
+{
+name: "Returns Pepper's score",
+player: "Pepper",
+expectedHTTPStatus: http.StatusOK,
+expectedScore: "20",
+},
+{
+name: "Returns Floyd's score",
+player: "Floyd",
+expectedHTTPStatus: http.StatusOK,
+expectedScore: "10",
+},
+{
+name: "Returns 404 on missing players",
+player: "Apollo",
+expectedHTTPStatus: http.StatusNotFound,
+expectedScore: "0",
+},
+}
+for _, tt := range tests {
+t.Run(tt.name, func(t *testing.T) {
+request := newGetScoreRequest(tt.player)
+response := httptest.NewRecorder()
 
-server.ServeHTTP(response, request)
+server.ServeHTTP(response, request)
 
-assertStatus(t, response.Code, http.StatusNotFound)
-})
+assertStatus(t, response.Code, tt.expectedHTTPStatus)
+assertResponseBody(t, response.Body.String(), tt.expectedScore)
+})
+}
 }
 
 func TestStoreWins(t *testing.T) {

http-server/v4/server_test.go

@@ -31,34 +31,42 @@ func TestGETPlayers(t *testing.T) {
 }
 server := &PlayerServer{&store}
 
-t.Run("returns Pepper's score", func(t *testing.T) {
-request := newGetScoreRequest("Pepper")
-response := httptest.NewRecorder()
-
-server.ServeHTTP(response, request)
-
-assertStatus(t, response.Code, http.StatusOK)
-assertResponseBody(t, response.Body.String(), "20")
-})
-
-t.Run("returns Floyd's score", func(t *testing.T) {
-request := newGetScoreRequest("Floyd")
-response := httptest.NewRecorder()
-
-server.ServeHTTP(response, request)
-
-assertStatus(t, response.Code, http.StatusOK)
-assertResponseBody(t, response.Body.String(), "10")
-})
-
-t.Run("returns 404 on missing players", func(t *testing.T) {
-request := newGetScoreRequest("Apollo")
-response := httptest.NewRecorder()
+tests := []struct {
+name string
+player string
+expectedHTTPStatus int
+expectedScore string
+}{
+{
+name: "Returns Pepper's score",
+player: "Pepper",
+expectedHTTPStatus: http.StatusOK,
+expectedScore: "20",
+},
+{
+name: "Returns Floyd's score",
+player: "Floyd",
+expectedHTTPStatus: http.StatusOK,
+expectedScore: "10",
+},
+{
+name: "Returns 404 on missing players",
+player: "Apollo",
+expectedHTTPStatus: http.StatusNotFound,
+expectedScore: "0",
+},
+}
+for _, tt := range tests {
+t.Run(tt.name, func(t *testing.T) {
+request := newGetScoreRequest(tt.player)
+response := httptest.NewRecorder()
 
-server.ServeHTTP(response, request)
+server.ServeHTTP(response, request)
 
-assertStatus(t, response.Code, http.StatusNotFound)
-})
+assertStatus(t, response.Code, tt.expectedHTTPStatus)
+assertResponseBody(t, response.Body.String(), tt.expectedScore)
+})
+}
 }
 
 func TestStoreWins(t *testing.T) {

http-server/v5/server_test.go

@@ -31,34 +31,42 @@ func TestGETPlayers(t *testing.T) {
 }
 server := &PlayerServer{&store}
 
-t.Run("returns Pepper's score", func(t *testing.T) {
-request := newGetScoreRequest("Pepper")
-response := httptest.NewRecorder()
-
-server.ServeHTTP(response, request)
-
-assertStatus(t, response.Code, http.StatusOK)
-assertResponseBody(t, response.Body.String(), "20")
-})
-
-t.Run("returns Floyd's score", func(t *testing.T) {
-request := newGetScoreRequest("Floyd")
-response := httptest.NewRecorder()
-
-server.ServeHTTP(response, request)
-
-assertStatus(t, response.Code, http.StatusOK)
-assertResponseBody(t, response.Body.String(), "10")
-})
-
-t.Run("returns 404 on missing players", func(t *testing.T) {
-request := newGetScoreRequest("Apollo")
-response := httptest.NewRecorder()
+tests := []struct {
+name string
+player string
+expectedHTTPStatus int
+expectedScore string
+}{
+{
+name: "Returns Pepper's score",
+player: "Pepper",
+expectedHTTPStatus: http.StatusOK,
+expectedScore: "20",
+},
+{
+name: "Returns Floyd's score",
+player: "Floyd",
+expectedHTTPStatus: http.StatusOK,
+expectedScore: "10",
+},
+{
+name: "Returns 404 on missing players",
+player: "Apollo",
+expectedHTTPStatus: http.StatusNotFound,
+expectedScore: "0",
+},
+}
+for _, tt := range tests {
+t.Run(tt.name, func(t *testing.T) {
+request := newGetScoreRequest(tt.player)
+response := httptest.NewRecorder()
 
-server.ServeHTTP(response, request)
+server.ServeHTTP(response, request)
 
-assertStatus(t, response.Code, http.StatusNotFound)
-})
+assertStatus(t, response.Code, tt.expectedHTTPStatus)
+assertResponseBody(t, response.Body.String(), tt.expectedScore)
+})
+}
 }
 
 func TestStoreWins(t *testing.T) {