GOMODULES
/
fiber
mirror of https://github.com/gofiber/fiber.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: use utils.AssertEqual instead of t.Fatal on some tests (#2653)

pull/2654/head
M. Efe Çetin 2023-09-28 15:40:42 +03:00 committed by GitHub
parent a9447a5b49
commit 6e443f6026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 82 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app_test.go
View File

@ -755,9 +755,7 @@ func Test_App_Shutdown(t *testing.T) {
t.Parallel() t.Parallel()
app := &App{} app := &App{}
if err := app.Shutdown(); err != nil { if err := app.Shutdown(); err != nil {
if err.Error() != "shutdown: server is not running" { utils.AssertEqual(t, "shutdown: server is not running", err.Error())
t.Fatal()
}
} }
}) })
} }

68
ctx_test.go
View File

@ -386,16 +386,15 @@ func Test_Ctx_Body_With_Compression(t *testing.T) {
if strings.Contains(tCase.contentEncoding, "gzip") { if strings.Contains(tCase.contentEncoding, "gzip") {
var b bytes.Buffer var b bytes.Buffer
gz := gzip.NewWriter(&b) gz := gzip.NewWriter(&b)
_, err := gz.Write(tCase.body) _, err := gz.Write(tCase.body)
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatal(err)
} err = gz.Flush()
if err = gz.Flush(); err != nil { utils.AssertEqual(t, nil, err)
t.Fatal(err)
} err = gz.Close()
if err = gz.Close(); err != nil { utils.AssertEqual(t, nil, err)
t.Fatal(err)
}
tCase.body = b.Bytes() tCase.body = b.Bytes()
} }
@ -619,9 +618,8 @@ func Test_Ctx_ParamParser(t *testing.T) {
RoleID uint `params:"roleId"` RoleID uint `params:"roleId"`
} }
d := new(Demo) d := new(Demo)
if err := ctx.ParamsParser(d); err != nil {
t.Fatal(err) utils.AssertEqual(t, nil, ctx.ParamsParser(d))
}
utils.AssertEqual(t, uint(111), d.UserID) utils.AssertEqual(t, uint(111), d.UserID)
utils.AssertEqual(t, uint(222), d.RoleID) utils.AssertEqual(t, uint(222), d.RoleID)
return nil return nil
@ -4946,21 +4944,17 @@ func Test_Ctx_BodyStreamWriter(t *testing.T) {
} }
fmt.Fprintf(w, "body writer line 2\n") fmt.Fprintf(w, "body writer line 2\n")
}) })
if !ctx.IsBodyStream() {
t.Fatal("IsBodyStream must return true") utils.AssertEqual(t, true, ctx.IsBodyStream())
}
s := ctx.Response.String() s := ctx.Response.String()
br := bufio.NewReader(bytes.NewBufferString(s)) br := bufio.NewReader(bytes.NewBufferString(s))
var resp fasthttp.Response var resp fasthttp.Response
if err := resp.Read(br); err != nil { utils.AssertEqual(t, nil, resp.Read(br))
t.Fatalf("Error when reading response: %s", err)
}
body := string(resp.Body()) body := string(resp.Body())
expectedBody := "body writer line 1\nbody writer line 2\n" expectedBody := "body writer line 1\nbody writer line 2\n"
if body != expectedBody { utils.AssertEqual(t, expectedBody, body)
t.Fatalf("unexpected body: %q. Expecting %q", body, expectedBody)
}
} }
// go test -v -run=^$ -bench=Benchmark_Ctx_BodyStreamWriter -benchmem -count=4 // go test -v -run=^$ -bench=Benchmark_Ctx_BodyStreamWriter -benchmem -count=4
@ -5010,14 +5004,10 @@ func TestCtx_ParamsInt(t *testing.T) {
num, err := c.ParamsInt("user") num, err := c.ParamsInt("user")
// Check the number matches // Check the number matches
if num != 1111 { utils.AssertEqual(t, 1111, num)
t.Fatalf("Expected number 1111 from the path, got %d", num)
}
// Check no errors are returned, because we want NO errors in this one // Check no errors are returned, because we want NO errors in this one
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf("Expected nil error for 1111 test, got " + err.Error())
}
return nil return nil
}) })
@ -5030,14 +5020,10 @@ func TestCtx_ParamsInt(t *testing.T) {
num, err := c.ParamsInt("user") num, err := c.ParamsInt("user")
// Check the number matches // Check the number matches
if num != 0 { utils.AssertEqual(t, 0, num)
t.Fatalf("Expected number 0 from the path, got %d", num)
}
// Check an error is returned, because we want NO errors in this one // Check an error is returned, because we want NO errors in this one
if err == nil { utils.AssertEqual(t, true, err != nil)
t.Fatal("Expected non nil error for bad req test, got nil")
}
return nil return nil
}) })
@ -5050,14 +5036,10 @@ func TestCtx_ParamsInt(t *testing.T) {
num, err := c.ParamsInt("user", 1111) num, err := c.ParamsInt("user", 1111)
// Check the number matches // Check the number matches
if num != 2222 { utils.AssertEqual(t, 2222, num)
t.Fatalf("Expected number 2222 from the path, got %d", num)
}
// Check no errors are returned, because we want NO errors in this one // Check no errors are returned, because we want NO errors in this one
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf("Expected nil error for 2222 test, got " + err.Error())
}
return nil return nil
}) })
@ -5070,14 +5052,10 @@ func TestCtx_ParamsInt(t *testing.T) {
num, err := c.ParamsInt("user", 1111) num, err := c.ParamsInt("user", 1111)
// Check the number matches // Check the number matches
if num != 1111 { utils.AssertEqual(t, 1111, num)
t.Fatalf("Expected number 1111 from the path, got %d", num)
}
// Check an error is returned, because we want NO errors in this one // Check an error is returned, because we want NO errors in this one
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf("Expected nil error for 1111 test, got " + err.Error())
}
return nil return nil
}) })

197
middleware/adaptor/adaptor_test.go
View File

@ -10,7 +10,6 @@ import (
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"net/url" "net/url"
"reflect"
"testing" "testing"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
@ -34,61 +33,33 @@ func Test_HTTPHandler(t *testing.T) {
"XXX-Remote-Addr": "123.43.4543.345", "XXX-Remote-Addr": "123.43.4543.345",
} }
expectedURL, err := url.ParseRequestURI(expectedRequestURI) expectedURL, err := url.ParseRequestURI(expectedRequestURI)
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf("unexpected error: %s", err)
}
expectedContextKey := "contextKey" expectedContextKey := "contextKey"
expectedContextValue := "contextValue" expectedContextValue := "contextValue"
callsCount := 0 callsCount := 0
nethttpH := func(w http.ResponseWriter, r *http.Request) { nethttpH := func(w http.ResponseWriter, r *http.Request) {
callsCount++ callsCount++
if r.Method != expectedMethod { utils.AssertEqual(t, expectedMethod, r.Method, "Method")
t.Fatalf("unexpected method %q. Expecting %q", r.Method, expectedMethod) utils.AssertEqual(t, expectedProto, r.Proto, "Proto")
} utils.AssertEqual(t, expectedProtoMajor, r.ProtoMajor, "ProtoMajor")
if r.Proto != expectedProto { utils.AssertEqual(t, expectedProtoMinor, r.ProtoMinor, "ProtoMinor")
t.Fatalf("unexpected proto %q. Expecting %q", r.Proto, expectedProto) utils.AssertEqual(t, expectedRequestURI, r.RequestURI, "RequestURI")
} utils.AssertEqual(t, expectedContentLength, int(r.ContentLength), "ContentLength")
if r.ProtoMajor != expectedProtoMajor { utils.AssertEqual(t, 0, len(r.TransferEncoding), "TransferEncoding")
t.Fatalf("unexpected protoMajor %d. Expecting %d", r.ProtoMajor, expectedProtoMajor) utils.AssertEqual(t, expectedHost, r.Host, "Host")
} utils.AssertEqual(t, expectedRemoteAddr, r.RemoteAddr, "RemoteAddr")
if r.ProtoMinor != expectedProtoMinor {
t.Fatalf("unexpected protoMinor %d. Expecting %d", r.ProtoMinor, expectedProtoMinor)
}
if r.RequestURI != expectedRequestURI {
t.Fatalf("unexpected requestURI %q. Expecting %q", r.RequestURI, expectedRequestURI)
}
if r.ContentLength != int64(expectedContentLength) {
t.Fatalf("unexpected contentLength %d. Expecting %d", r.ContentLength, expectedContentLength)
}
if len(r.TransferEncoding) != 0 {
t.Fatalf("unexpected transferEncoding %q. Expecting []", r.TransferEncoding)
}
if r.Host != expectedHost {
t.Fatalf("unexpected host %q. Expecting %q", r.Host, expectedHost)
}
if r.RemoteAddr != expectedRemoteAddr {
t.Fatalf("unexpected remoteAddr %q. Expecting %q", r.RemoteAddr, expectedRemoteAddr)
}
body, err := io.ReadAll(r.Body) body, err := io.ReadAll(r.Body)
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf("unexpected error when reading request body: %s", err) utils.AssertEqual(t, expectedBody, string(body), "Body")
} utils.AssertEqual(t, expectedURL, r.URL, "URL")
if string(body) != expectedBody { utils.AssertEqual(t, expectedContextValue, r.Context().Value(expectedContextKey), "Context")
t.Fatalf("unexpected body %q. Expecting %q", body, expectedBody)
}
if !reflect.DeepEqual(r.URL, expectedURL) {
t.Fatalf("unexpected URL: %#v. Expecting %#v", r.URL, expectedURL)
}
if r.Context().Value(expectedContextKey) != expectedContextValue {
t.Fatalf("unexpected context value for key %q. Expecting %q", expectedContextKey, expectedContextValue)
}
for k, expectedV := range expectedHeader { for k, expectedV := range expectedHeader {
v := r.Header.Get(k) v := r.Header.Get(k)
if v != expectedV { utils.AssertEqual(t, expectedV, v, "Header")
t.Fatalf("unexpected header value %q for key %q. Expecting %q", v, k, expectedV)
}
} }
w.Header().Set("Header1", "value1") w.Header().Set("Header1", "value1")
@ -111,37 +82,24 @@ func Test_HTTPHandler(t *testing.T) {
} }
remoteAddr, err := net.ResolveTCPAddr("tcp", expectedRemoteAddr) remoteAddr, err := net.ResolveTCPAddr("tcp", expectedRemoteAddr)
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf("unexpected error: %s", err)
}
fctx.Init(&req, remoteAddr, nil) fctx.Init(&req, remoteAddr, nil)
app := fiber.New() app := fiber.New()
ctx := app.AcquireCtx(&fctx) ctx := app.AcquireCtx(&fctx)
defer app.ReleaseCtx(ctx) defer app.ReleaseCtx(ctx)
err = fiberH(ctx) err = fiberH(ctx)
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf("unexpected error: %s", err) utils.AssertEqual(t, 1, callsCount, "callsCount")
}
if callsCount != 1 {
t.Fatalf("unexpected callsCount: %d. Expecting 1", callsCount)
}
resp := &fctx.Response resp := &fctx.Response
if resp.StatusCode() != fiber.StatusBadRequest { utils.AssertEqual(t, http.StatusBadRequest, resp.StatusCode(), "StatusCode")
t.Fatalf("unexpected statusCode: %d. Expecting %d", resp.StatusCode(), fiber.StatusBadRequest) utils.AssertEqual(t, "value1", string(resp.Header.Peek("Header1")), "Header1")
} utils.AssertEqual(t, "value2", string(resp.Header.Peek("Header2")), "Header2")
if string(resp.Header.Peek("Header1")) != "value1" {
t.Fatalf("unexpected header value: %q. Expecting %q", resp.Header.Peek("Header1"), "value1")
}
if string(resp.Header.Peek("Header2")) != "value2" {
t.Fatalf("unexpected header value: %q. Expecting %q", resp.Header.Peek("Header2"), "value2")
}
expectedResponseBody := fmt.Sprintf("request body is %q", expectedBody) expectedResponseBody := fmt.Sprintf("request body is %q", expectedBody)
if string(resp.Body()) != expectedResponseBody { utils.AssertEqual(t, expectedResponseBody, string(resp.Body()), "Body")
t.Fatalf("unexpected response body %q. Expecting %q", resp.Body(), expectedResponseBody)
}
} }
type contextKey string type contextKey string
@ -220,32 +178,20 @@ func Test_HTTPMiddleware(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
req, err := http.NewRequestWithContext(context.Background(), tt.method, tt.url, nil) req, err := http.NewRequestWithContext(context.Background(), tt.method, tt.url, nil)
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf(`%s: %s`, t.Name(), err)
}
resp, err := app.Test(req) resp, err := app.Test(req)
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf(`%s: %s`, t.Name(), err) utils.AssertEqual(t, tt.statusCode, resp.StatusCode, "StatusCode")
}
if resp.StatusCode != tt.statusCode {
t.Fatalf(`%s: StatusCode: got %v - expected %v`, t.Name(), resp.StatusCode, tt.statusCode)
}
} }
req, err := http.NewRequestWithContext(context.Background(), fiber.MethodPost, "/", nil) req, err := http.NewRequestWithContext(context.Background(), fiber.MethodPost, "/", nil)
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf(`%s: %s`, t.Name(), err)
}
resp, err := app.Test(req) resp, err := app.Test(req)
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf(`%s: %s`, t.Name(), err) utils.AssertEqual(t, resp.Header.Get("context_okay"), "okay")
} utils.AssertEqual(t, resp.Header.Get("context_second_okay"), "okay")
if resp.Header.Get("context_okay") != "okay" {
t.Fatalf(`%s: Header context_okay: got %v - expected %v`, t.Name(), resp.Header.Get("context_okay"), "okay")
}
if resp.Header.Get("context_second_okay") != "okay" {
t.Fatalf(`%s: Header context_second_okay: got %v - expected %v`, t.Name(), resp.Header.Get("context_second_okay"), "okay")
}
} }
func Test_FiberHandler(t *testing.T) { func Test_FiberHandler(t *testing.T) {
@ -282,43 +228,24 @@ func testFiberToHandlerFunc(t *testing.T, checkDefaultPort bool, app ...*fiber.A
"XXX-Remote-Addr": "123.43.4543.345", "XXX-Remote-Addr": "123.43.4543.345",
} }
expectedURL, err := url.ParseRequestURI(expectedRequestURI) expectedURL, err := url.ParseRequestURI(expectedRequestURI)
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatalf("unexpected error: %s", err)
}
callsCount := 0 callsCount := 0
fiberH := func(c *fiber.Ctx) error { fiberH := func(c *fiber.Ctx) error {
callsCount++ callsCount++
if c.Method() != expectedMethod { utils.AssertEqual(t, expectedMethod, c.Method(), "Method")
t.Fatalf("unexpected method %q. Expecting %q", c.Method(), expectedMethod) utils.AssertEqual(t, expectedRequestURI, string(c.Context().RequestURI()), "RequestURI")
} utils.AssertEqual(t, expectedContentLength, c.Context().Request.Header.ContentLength(), "ContentLength")
if string(c.Context().RequestURI()) != expectedRequestURI { utils.AssertEqual(t, expectedHost, c.Hostname(), "Host")
t.Fatalf("unexpected requestURI %q. Expecting %q", string(c.Context().RequestURI()), expectedRequestURI) utils.AssertEqual(t, expectedRemoteAddr, c.Context().RemoteAddr().String(), "RemoteAddr")
}
contentLength := c.Context().Request.Header.ContentLength()
if contentLength != expectedContentLength {
t.Fatalf("unexpected contentLength %d. Expecting %d", contentLength, expectedContentLength)
}
if c.Hostname() != expectedHost {
t.Fatalf("unexpected host %q. Expecting %q", c.Hostname(), expectedHost)
}
remoteAddr := c.Context().RemoteAddr().String()
if remoteAddr != expectedRemoteAddr {
t.Fatalf("unexpected remoteAddr %q. Expecting %q", remoteAddr, expectedRemoteAddr)
}
body := string(c.Body()) body := string(c.Body())
if body != expectedBody { utils.AssertEqual(t, expectedBody, body, "Body")
t.Fatalf("unexpected body %q. Expecting %q", body, expectedBody) utils.AssertEqual(t, expectedURL.String(), c.OriginalURL(), "URL")
}
if c.OriginalURL() != expectedURL.String() {
t.Fatalf("unexpected URL: %#v. Expecting %#v", c.OriginalURL(), expectedURL)
}
for k, expectedV := range expectedHeader { for k, expectedV := range expectedHeader {
v := c.Get(k) v := c.Get(k)
if v != expectedV { utils.AssertEqual(t, expectedV, v, "Header")
t.Fatalf("unexpected header value %q for key %q. Expecting %q", v, k, expectedV)
}
} }
c.Set("Header1", "value1") c.Set("Header1", "value1")
@ -357,19 +284,12 @@ func testFiberToHandlerFunc(t *testing.T, checkDefaultPort bool, app ...*fiber.A
var w netHTTPResponseWriter var w netHTTPResponseWriter
handlerFunc.ServeHTTP(&w, &r) handlerFunc.ServeHTTP(&w, &r)
if w.StatusCode() != http.StatusBadRequest { utils.AssertEqual(t, http.StatusBadRequest, w.StatusCode(), "StatusCode")
t.Fatalf("unexpected statusCode: %d. Expecting %d", w.StatusCode(), http.StatusBadRequest) utils.AssertEqual(t, "value1", w.Header().Get("Header1"), "Header1")
} utils.AssertEqual(t, "value2", w.Header().Get("Header2"), "Header2")
if w.Header().Get("Header1") != "value1" {
t.Fatalf("unexpected header value: %q. Expecting %q", w.Header().Get("Header1"), "value1")
}
if w.Header().Get("Header2") != "value2" {
t.Fatalf("unexpected header value: %q. Expecting %q", w.Header().Get("Header2"), "value2")
}
expectedResponseBody := fmt.Sprintf("request body is %q", expectedBody) expectedResponseBody := fmt.Sprintf("request body is %q", expectedBody)
if string(w.body) != expectedResponseBody { utils.AssertEqual(t, expectedResponseBody, string(w.body), "Body")
t.Fatalf("unexpected response body %q. Expecting %q", string(w.body), expectedResponseBody)
}
} }
func setFiberContextValueMiddleware(next fiber.Handler, key string, value interface{}) fiber.Handler { func setFiberContextValueMiddleware(next fiber.Handler, key string, value interface{}) fiber.Handler {
@ -387,16 +307,9 @@ func Test_FiberHandler_RequestNilBody(t *testing.T) {
callsCount := 0 callsCount := 0
fiberH := func(c *fiber.Ctx) error { fiberH := func(c *fiber.Ctx) error {
callsCount++ callsCount++
if c.Method() != expectedMethod { utils.AssertEqual(t, expectedMethod, c.Method(), "Method")
t.Fatalf("unexpected method %q. Expecting %q", c.Method(), expectedMethod) utils.AssertEqual(t, expectedRequestURI, string(c.Context().RequestURI()), "RequestURI")
} utils.AssertEqual(t, expectedContentLength, c.Context().Request.Header.ContentLength(), "ContentLength")
if string(c.Request().RequestURI()) != expectedRequestURI {
t.Fatalf("unexpected requestURI %q. Expecting %q", string(c.Request().RequestURI()), expectedRequestURI)
}
contentLength := c.Request().Header.ContentLength()
if contentLength != expectedContentLength {
t.Fatalf("unexpected contentLength %d. Expecting %d", contentLength, expectedContentLength)
}
_, err := c.Write([]byte("request body is nil")) _, err := c.Write([]byte("request body is nil"))
return err return err
@ -412,9 +325,7 @@ func Test_FiberHandler_RequestNilBody(t *testing.T) {
nethttpH.ServeHTTP(&w, &r) nethttpH.ServeHTTP(&w, &r)
expectedResponseBody := "request body is nil" expectedResponseBody := "request body is nil"
if string(w.body) != expectedResponseBody { utils.AssertEqual(t, expectedResponseBody, string(w.body), "Body")
t.Fatalf("unexpected response body %q. Expecting %q", string(w.body), expectedResponseBody)
}
} }
type netHTTPBody struct { type netHTTPBody struct {

4
middleware/favicon/favicon_test.go
View File

@ -102,9 +102,7 @@ func Test_Custom_Favicon_Url(t *testing.T) {
// go test -run Test_Custom_Favicon_Data // go test -run Test_Custom_Favicon_Data
func Test_Custom_Favicon_Data(t *testing.T) { func Test_Custom_Favicon_Data(t *testing.T) {
data, err := os.ReadFile("../../.github/testdata/favicon.ico") data, err := os.ReadFile("../../.github/testdata/favicon.ico")
if err != nil { utils.AssertEqual(t, nil, err)
t.Fatal(err)
}
app := fiber.New() app := fiber.New()

5
middleware/session/session_test.go
View File

@ -496,9 +496,8 @@ func Test_Session_Regenerate(t *testing.T) {
err = acquiredSession.Regenerate() err = acquiredSession.Regenerate()
utils.AssertEqual(t, nil, err) utils.AssertEqual(t, nil, err)
if acquiredSession.ID() == originalSessionUUIDString { utils.AssertEqual(t, false, acquiredSession.ID() == originalSessionUUIDString)
t.Fatal("regenerate should generate another different id")
}
// acquiredSession.fresh should be true after regenerating // acquiredSession.fresh should be true after regenerating
utils.AssertEqual(t, true, acquiredSession.Fresh()) utils.AssertEqual(t, true, acquiredSession.Fresh())
}) })

4
middleware/session/store_test.go
View File

@ -82,8 +82,6 @@ func TestStore_Get(t *testing.T) {
acquiredSession, err := store.Get(ctx) acquiredSession, err := store.Get(ctx)
utils.AssertEqual(t, err, nil) utils.AssertEqual(t, err, nil)
if acquiredSession.ID() != unexpectedID { utils.AssertEqual(t, unexpectedID, acquiredSession.ID())
t.Fatal("server should not accept the unexpectedID which is not in the store")
}
}) })
} }