Skip to content

Refactor tests in http-server for readability #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2019
Merged

Refactor tests in http-server for readability #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 34 additions & 26 deletions http-server/v2/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
60 changes: 34 additions & 26 deletions http-server/v3/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
60 changes: 34 additions & 26 deletions http-server/v4/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
60 changes: 34 additions & 26 deletions http-server/v5/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down