From d55b3ea776466bf7be7ea7f22afa4e8056ee5821 Mon Sep 17 00:00:00 2001 From: Glebsnigirev Date: Tue, 25 Feb 2025 11:36:26 +0300 Subject: [PATCH 1/2] ferst commit --- go.mod | 10 ++++++ go.sum | 9 ++++++ precode.go | 83 +++++++++++++++++++++---------------------------- precode_test.go | 47 ++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 48 deletions(-) create mode 100644 go.mod create mode 100644 go.sum create mode 100644 precode_test.go diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..9dff3305 --- /dev/null +++ b/go.mod @@ -0,0 +1,10 @@ +module go-testify + +go 1.22.2 + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/stretchr/testify v1.10.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 00000000..fe99d711 --- /dev/null +++ b/go.sum @@ -0,0 +1,9 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/precode.go b/precode.go index 5139755e..b433dd8a 100644 --- a/precode.go +++ b/precode.go @@ -1,58 +1,45 @@ package main import ( - "net/http" - "net/http/httptest" - "strconv" - "strings" - "testing" + "net/http" + "strconv" + "strings" ) var cafeList = map[string][]string{ - "moscow": []string{"Мир кофе", "Сладкоежка", "Кофе и завтраки", "Сытый студент"}, + "moscow": []string{"Мир кофе", "Сладкоежка", "Кофе и завтраки", "Сытый студент"}, } func mainHandle(w http.ResponseWriter, req *http.Request) { - countStr := req.URL.Query().Get("count") - if countStr == "" { - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte("count missing")) - return - } - - count, err := strconv.Atoi(countStr) - if err != nil { - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte("wrong count value")) - return - } - - city := req.URL.Query().Get("city") - - cafe, ok := cafeList[city] - if !ok { - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte("wrong city value")) - return - } - - if count > len(cafe) { - count = len(cafe) - } - - answer := strings.Join(cafe[:count], ",") - - w.WriteHeader(http.StatusOK) - w.Write([]byte(answer)) -} - -func TestMainHandlerWhenCountMoreThanTotal(t *testing.T) { - totalCount := 4 - req := ... // здесь нужно создать запрос к сервису - - responseRecorder := httptest.NewRecorder() - handler := http.HandlerFunc(mainHandle) - handler.ServeHTTP(responseRecorder, req) - - // здесь нужно добавить необходимые проверки + countStr := req.URL.Query().Get("count") + if countStr == "" { + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte("count missing")) + return + } + + count, err := strconv.Atoi(countStr) + if err != nil { + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte("wrong count value")) + return + } + + city := req.URL.Query().Get("city") + + cafe, ok := cafeList[city] + if !ok { + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte("wrong city value")) + return + } + + if count > len(cafe) { + count = len(cafe) + } + + answer := strings.Join(cafe[:count], ",") + + w.WriteHeader(http.StatusOK) + w.Write([]byte(answer)) } diff --git a/precode_test.go b/precode_test.go new file mode 100644 index 00000000..d3837b33 --- /dev/null +++ b/precode_test.go @@ -0,0 +1,47 @@ +package main + +import ( + "net/http" + "net/http/httptest" + "strconv" + "strings" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestMainHandlerWhenCountMoreThanTotal(t *testing.T) { + totalCount := 4 + req := httptest.NewRequest("GET", "/cafe?count="+strconv.Itoa(totalCount+1)+"&city=moscow", nil) + + responseRecorder := httptest.NewRecorder() + handler := http.HandlerFunc(mainHandle) + handler.ServeHTTP(responseRecorder, req) + + assert.Equal(t, http.StatusOK, responseRecorder.Code) + assert.NotEmpty(t, responseRecorder.Body.String()) + assert.Len(t, strings.Split(responseRecorder.Body.String(), ","), totalCount) +} + +func TestMainHandlerWhenCityNotSupported(t *testing.T) { + req := httptest.NewRequest("GET", "/cafe?count=1&city=unknown", nil) + + responseRecorder := httptest.NewRecorder() + handler := http.HandlerFunc(mainHandle) + handler.ServeHTTP(responseRecorder, req) + + assert.Equal(t, http.StatusBadRequest, responseRecorder.Code) + assert.Equal(t, "wrong city value", responseRecorder.Body.String()) +} + +func TestMainHandlerWhenRequestCorrect(t *testing.T) { + req := httptest.NewRequest("GET", "/cafe?count=2&city=moscow", nil) + + responseRecorder := httptest.NewRecorder() + handler := http.HandlerFunc(mainHandle) + handler.ServeHTTP(responseRecorder, req) + + assert.Equal(t, http.StatusOK, responseRecorder.Code) + assert.NotEmpty(t, responseRecorder.Body.String()) + assert.Len(t, strings.Split(responseRecorder.Body.String(), ","), 2) +} From 125bf6ea0140a2ac0bcf9cb1eeec037cf444727f Mon Sep 17 00:00:00 2001 From: Glebsnigirev Date: Tue, 25 Feb 2025 12:13:55 +0300 Subject: [PATCH 2/2] new commit --- precode.go | 2 ++ precode_test.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/precode.go b/precode.go index b433dd8a..15830499 100644 --- a/precode.go +++ b/precode.go @@ -43,3 +43,5 @@ func mainHandle(w http.ResponseWriter, req *http.Request) { w.WriteHeader(http.StatusOK) w.Write([]byte(answer)) } + +//finish code diff --git a/precode_test.go b/precode_test.go index d3837b33..381780eb 100644 --- a/precode_test.go +++ b/precode_test.go @@ -45,3 +45,5 @@ func TestMainHandlerWhenRequestCorrect(t *testing.T) { assert.NotEmpty(t, responseRecorder.Body.String()) assert.Len(t, strings.Split(responseRecorder.Body.String(), ","), 2) } + +//test