From f1197940359ae4d5e219921125f76f331b3d815a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Muhammed=20Efe=20=C3=87etin?= Date: Wed, 1 Jun 2022 18:34:22 +0300 Subject: [PATCH] v3: replace io/ioutil by io and os, update version constant --- app.go | 5 +-- app_test.go | 49 +++++++++++----------- client.go | 3 +- client_test.go | 4 +- ctx.go | 3 +- ctx_test.go | 19 ++++----- middleware/basicauth/basicauth_test.go | 4 +- middleware/cache/cache_test.go | 57 +++++++++++++------------- middleware/compress/compress_test.go | 17 ++++---- middleware/etag/etag_test.go | 8 ++-- middleware/expvar/expvar_test.go | 8 ++-- middleware/favicon/favicon.go | 7 ++-- middleware/limiter/limiter_test.go | 6 +-- middleware/logger/logger_test.go | 4 +- middleware/monitor/monitor_test.go | 10 ++--- middleware/pprof/pprof_test.go | 6 +-- middleware/proxy/proxy_test.go | 12 +++--- middleware/timeout/timeout_test.go | 6 +-- prefork_test.go | 4 +- router_test.go | 47 ++++++++++----------- 20 files changed, 139 insertions(+), 140 deletions(-) diff --git a/app.go b/app.go index 14eeb6f0..4bdd7e2c 100644 --- a/app.go +++ b/app.go @@ -13,7 +13,6 @@ import ( "crypto/x509" "errors" "fmt" - "io/ioutil" "net" "net/http" "net/http/httputil" @@ -38,7 +37,7 @@ import ( ) // Version of current fiber package -const Version = "2.34.0" +const Version = "3.0.0-beta.1" // Handler defines a function to serve HTTP requests. type Handler = func(*Ctx) error @@ -847,7 +846,7 @@ func (app *App) ListenMutualTLS(addr, certFile, keyFile, clientCertFile string) return fmt.Errorf("tls: cannot load TLS key pair from certFile=%q and keyFile=%q: %s", certFile, keyFile, err) } - clientCACert, err := ioutil.ReadFile(filepath.Clean(clientCertFile)) + clientCACert, err := os.ReadFile(filepath.Clean(clientCertFile)) if err != nil { return err } diff --git a/app_test.go b/app_test.go index d942277f..364b0564 100644 --- a/app_test.go +++ b/app_test.go @@ -10,7 +10,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" "mime/multipart" "net" @@ -47,7 +46,7 @@ func testErrorResponse(t *testing.T, err error, resp *http.Response, expectedBod utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 500, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, expectedBodyError, string(body), "Response body") } @@ -165,7 +164,7 @@ func Test_App_Errors(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 500, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "hi, i'm an error", string(body)) @@ -190,7 +189,7 @@ func Test_App_ErrorHandler_Custom(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "hi, i'm an custom error", string(body)) } @@ -219,7 +218,7 @@ func Test_App_ErrorHandler_HandlerStack(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 500, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "1: USE error", string(body)) } @@ -244,7 +243,7 @@ func Test_App_ErrorHandler_RouteStack(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 500, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "1: USE error", string(body)) } @@ -385,7 +384,7 @@ func Test_App_Use_UnescapedPath(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") // check the param result utils.AssertEqual(t, "اختبار", app.getString(body)) @@ -420,7 +419,7 @@ func Test_App_Use_CaseSensitive(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") // check the detected path result utils.AssertEqual(t, "/AbC", app.getString(body)) @@ -522,7 +521,7 @@ func Test_App_Order(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "123", string(body)) } @@ -644,7 +643,7 @@ func Test_App_Static_Index_Default(t *testing.T) { utils.AssertEqual(t, false, resp.Header.Get(HeaderContentLength) == "") utils.AssertEqual(t, MIMETextHTMLCharsetUTF8, resp.Header.Get(HeaderContentType)) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, strings.Contains(string(body), "Hello, World!")) @@ -654,7 +653,7 @@ func Test_App_Static_Index_Default(t *testing.T) { utils.AssertEqual(t, false, resp.Header.Get(HeaderContentLength) == "") utils.AssertEqual(t, MIMETextPlainCharsetUTF8, resp.Header.Get(HeaderContentType)) - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "Cannot GET /not-found", string(body)) } @@ -671,7 +670,7 @@ func Test_App_Static_Direct(t *testing.T) { utils.AssertEqual(t, false, resp.Header.Get(HeaderContentLength) == "") utils.AssertEqual(t, MIMETextHTMLCharsetUTF8, resp.Header.Get(HeaderContentType)) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, strings.Contains(string(body), "Hello, World!")) @@ -682,7 +681,7 @@ func Test_App_Static_Direct(t *testing.T) { utils.AssertEqual(t, MIMEApplicationJSON, resp.Header.Get("Content-Type")) utils.AssertEqual(t, "", resp.Header.Get(HeaderCacheControl), "CacheControl Control") - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, strings.Contains(string(body), "testRoutes")) } @@ -759,7 +758,7 @@ func Test_App_Static_Wildcard(t *testing.T) { utils.AssertEqual(t, false, resp.Header.Get(HeaderContentLength) == "") utils.AssertEqual(t, MIMETextHTMLCharsetUTF8, resp.Header.Get(HeaderContentType)) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, strings.Contains(string(body), "Test file")) } @@ -784,7 +783,7 @@ func Test_App_Static_Prefix_Wildcard(t *testing.T) { utils.AssertEqual(t, false, resp.Header.Get(HeaderContentLength) == "") utils.AssertEqual(t, MIMETextHTMLCharsetUTF8, resp.Header.Get(HeaderContentType)) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, strings.Contains(string(body), "Test file")) } @@ -887,7 +886,7 @@ func Test_App_Static_Next(t *testing.T) { utils.AssertEqual(t, false, resp.Header.Get(HeaderContentLength) == "") utils.AssertEqual(t, MIMETextPlainCharsetUTF8, resp.Header.Get(HeaderContentType)) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, strings.Contains(string(body), "You've skipped app.Static")) }) @@ -901,7 +900,7 @@ func Test_App_Static_Next(t *testing.T) { utils.AssertEqual(t, false, resp.Header.Get(HeaderContentLength) == "") utils.AssertEqual(t, MIMETextHTMLCharsetUTF8, resp.Header.Get(HeaderContentType)) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, strings.Contains(string(body), "Hello, World!")) }) @@ -932,7 +931,7 @@ func Test_App_Mixed_Routes_WithSameLen(t *testing.T) { utils.AssertEqual(t, "TestValue", resp.Header.Get("TestHeader")) utils.AssertEqual(t, "text/html", resp.Header.Get(HeaderContentType)) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "FOO_BAR", string(body)) @@ -945,7 +944,7 @@ func Test_App_Mixed_Routes_WithSameLen(t *testing.T) { utils.AssertEqual(t, "TestValue", resp.Header.Get("TestHeader")) utils.AssertEqual(t, "text/html; charset=utf-8", resp.Header.Get(HeaderContentType)) - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, strings.Contains(string(body), "Hello, World!"), "Response: "+string(body)) utils.AssertEqual(t, true, strings.HasPrefix(string(body), ""), "Response: "+string(body)) @@ -1545,8 +1544,8 @@ func Test_App_ReadBodyStream(t *testing.T) { testString := "this is a test" resp, err := app.Test(httptest.NewRequest("POST", "/", bytes.NewBufferString(testString))) utils.AssertEqual(t, nil, err, "app.Test(req)") - body, err := ioutil.ReadAll(resp.Body) - utils.AssertEqual(t, nil, err, "ioutil.ReadAll(resp.Body)") + body, err := io.ReadAll(resp.Body) + utils.AssertEqual(t, nil, err, "io.ReadAll(resp.Body)") utils.AssertEqual(t, fmt.Sprintf("true %s", testString), string(body)) } @@ -1591,8 +1590,8 @@ func Test_App_DisablePreParseMultipartForm(t *testing.T) { req.Header.Set("Content-Type", w.FormDataContentType()) resp, err := app.Test(req) utils.AssertEqual(t, nil, err, "app.Test(req)") - body, err := ioutil.ReadAll(resp.Body) - utils.AssertEqual(t, nil, err, "ioutil.ReadAll(resp.Body)") + body, err := io.ReadAll(resp.Body) + utils.AssertEqual(t, nil, err, "io.ReadAll(resp.Body)") utils.AssertEqual(t, testString, string(body)) } @@ -1674,7 +1673,7 @@ func Test_App_UseMountedErrorHandlerForBestPrefixMatch(t *testing.T) { utils.AssertEqual(t, nil, err, "/api/sub req") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "iotuil.ReadAll()") utils.AssertEqual(t, "hi, i'm a custom sub fiber error", string(b), "Response body") @@ -1682,7 +1681,7 @@ func Test_App_UseMountedErrorHandlerForBestPrefixMatch(t *testing.T) { utils.AssertEqual(t, nil, err, "/api/sub/third req") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - b, err = ioutil.ReadAll(resp2.Body) + b, err = io.ReadAll(resp2.Body) utils.AssertEqual(t, nil, err, "iotuil.ReadAll()") utils.AssertEqual(t, "hi, i'm a custom sub sub fiber error", string(b), "Third fiber Response body") } diff --git a/client.go b/client.go index 94da20f2..9a8a7475 100644 --- a/client.go +++ b/client.go @@ -7,7 +7,6 @@ import ( "encoding/xml" "fmt" "io" - "io/ioutil" "mime/multipart" "net" "os" @@ -542,7 +541,7 @@ func (a *Agent) FileData(formFiles ...*FormFile) *Agent { // SendFile reads file and appends it to multipart form request. func (a *Agent) SendFile(filename string, fieldname ...string) *Agent { - content, err := ioutil.ReadFile(filepath.Clean(filename)) + content, err := os.ReadFile(filepath.Clean(filename)) if err != nil { a.errs = append(a.errs, err) return a diff --git a/client_test.go b/client_test.go index 02ffacdb..f51c5326 100644 --- a/client_test.go +++ b/client_test.go @@ -7,9 +7,9 @@ import ( "errors" "fmt" "io" - "io/ioutil" "mime/multipart" "net" + "os" "path/filepath" "regexp" "strings" @@ -812,7 +812,7 @@ func checkFormFile(t *testing.T, fh *multipart.FileHeader, filename string) { basename := filepath.Base(filename) utils.AssertEqual(t, fh.Filename, basename) - b1, err := ioutil.ReadFile(filename) + b1, err := os.ReadFile(filename) utils.AssertEqual(t, nil, err) b2 := make([]byte, fh.Size) diff --git a/ctx.go b/ctx.go index 3930e6d6..6f1f1a77 100644 --- a/ctx.go +++ b/ctx.go @@ -12,7 +12,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "mime/multipart" "net" "net/http" @@ -1316,7 +1315,7 @@ func (c *Ctx) SaveFileToStorage(fileheader *multipart.FileHeader, path string, s return err } - content, err := ioutil.ReadAll(file) + content, err := io.ReadAll(file) if err != nil { return err } diff --git a/ctx_test.go b/ctx_test.go index a2408b8f..5c3b3ffa 100644 --- a/ctx_test.go +++ b/ctx_test.go @@ -15,7 +15,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "mime/multipart" "net/http/httptest" "net/url" @@ -644,7 +643,7 @@ func Test_Ctx_UserContext_Multiple_Requests(t *testing.T) { utils.AssertEqual(t, nil, err, "Unexpected error from response") utils.AssertEqual(t, StatusOK, resp.StatusCode, "context.Context returned from c.UserContext() is reused") - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "Unexpected error from reading response body") utils.AssertEqual(t, fmt.Sprintf("resp_%d_returned", i), string(b), "response text incorrect") }) @@ -1067,7 +1066,7 @@ func Test_Ctx_PortInHandler(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "0", string(body)) } @@ -1700,14 +1699,14 @@ func Test_Ctx_SaveFile(t *testing.T) { fh, err := c.FormFile("file") utils.AssertEqual(t, nil, err) - tempFile, err := ioutil.TempFile(os.TempDir(), "test-") + tempFile, err := os.CreateTemp(os.TempDir(), "test-") utils.AssertEqual(t, nil, err) defer os.Remove(tempFile.Name()) err = c.SaveFile(fh, tempFile.Name()) utils.AssertEqual(t, nil, err) - bs, err := ioutil.ReadFile(tempFile.Name()) + bs, err := os.ReadFile(tempFile.Name()) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "hello world", string(bs)) return nil @@ -1851,7 +1850,7 @@ func Test_Ctx_Download(t *testing.T) { utils.AssertEqual(t, nil, err) defer f.Close() - expect, err := ioutil.ReadAll(f) + expect, err := io.ReadAll(f) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, expect, c.Response().Body()) utils.AssertEqual(t, `attachment; filename="Awesome+File%21"`, string(c.Response().Header.Peek(HeaderContentDisposition))) @@ -1869,7 +1868,7 @@ func Test_Ctx_SendFile(t *testing.T) { f, err := os.Open("./ctx.go") utils.AssertEqual(t, nil, err) defer f.Close() - expectFileContent, err := ioutil.ReadAll(f) + expectFileContent, err := io.ReadAll(f) utils.AssertEqual(t, nil, err) // fetch file info for the not modified test case fI, err := os.Stat("./ctx.go") @@ -2335,7 +2334,7 @@ func Test_Ctx_Render_Mount(t *testing.T) { utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code") utils.AssertEqual(t, nil, err, "app.Test(req)") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "

Hello a!

", string(body)) } @@ -2361,7 +2360,7 @@ func Test_Ctx_Render_MountGroup(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "

Hello doe!

", string(body)) } @@ -2810,7 +2809,7 @@ func Test_Ctx_Render_Engine_Error(t *testing.T) { func Test_Ctx_Render_Go_Template(t *testing.T) { t.Parallel() - file, err := ioutil.TempFile(os.TempDir(), "fiber") + file, err := os.CreateTemp(os.TempDir(), "fiber") utils.AssertEqual(t, nil, err) defer os.Remove(file.Name()) diff --git a/middleware/basicauth/basicauth_test.go b/middleware/basicauth/basicauth_test.go index fc57c204..82dd0821 100644 --- a/middleware/basicauth/basicauth_test.go +++ b/middleware/basicauth/basicauth_test.go @@ -2,7 +2,7 @@ package basicauth import ( "fmt" - "io/ioutil" + "io" "net/http/httptest" "testing" @@ -82,7 +82,7 @@ func Test_Middleware_BasicAuth(t *testing.T) { resp, err := app.Test(req) utils.AssertEqual(t, nil, err) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, tt.statusCode, resp.StatusCode) diff --git a/middleware/cache/cache_test.go b/middleware/cache/cache_test.go index 7d2d6033..706c90d0 100644 --- a/middleware/cache/cache_test.go +++ b/middleware/cache/cache_test.go @@ -5,10 +5,11 @@ package cache import ( "bytes" "fmt" - "io/ioutil" + "io" "math" "net/http" "net/http/httptest" + "os" "strconv" "testing" "time" @@ -53,7 +54,7 @@ func Test_Cache_Expired(t *testing.T) { resp, err := app.Test(httptest.NewRequest("GET", "/", nil)) utils.AssertEqual(t, nil, err) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) // Sleep until the cache is expired @@ -61,7 +62,7 @@ func Test_Cache_Expired(t *testing.T) { respCached, err := app.Test(httptest.NewRequest("GET", "/", nil)) utils.AssertEqual(t, nil, err) - bodyCached, err := ioutil.ReadAll(respCached.Body) + bodyCached, err := io.ReadAll(respCached.Body) utils.AssertEqual(t, nil, err) if bytes.Equal(body, bodyCached) { @@ -71,7 +72,7 @@ func Test_Cache_Expired(t *testing.T) { // Next response should be also cached respCachedNextRound, err := app.Test(httptest.NewRequest("GET", "/", nil)) utils.AssertEqual(t, nil, err) - bodyCachedNextRound, err := ioutil.ReadAll(respCachedNextRound.Body) + bodyCachedNextRound, err := io.ReadAll(respCachedNextRound.Body) utils.AssertEqual(t, nil, err) if !bytes.Equal(bodyCachedNextRound, bodyCached) { @@ -98,9 +99,9 @@ func Test_Cache(t *testing.T) { cachedResp, err := app.Test(cachedReq) utils.AssertEqual(t, nil, err) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) - cachedBody, err := ioutil.ReadAll(cachedResp.Body) + cachedBody, err := io.ReadAll(cachedResp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, cachedBody, body) @@ -128,7 +129,7 @@ func Test_Cache_WithSeveralRequests(t *testing.T) { defer rsp.Body.Close() - idFromServ, err := ioutil.ReadAll(rsp.Body) + idFromServ, err := io.ReadAll(rsp.Body) utils.AssertEqual(t, nil, err) a, err := strconv.Atoi(string(idFromServ)) @@ -161,9 +162,9 @@ func Test_Cache_Invalid_Expiration(t *testing.T) { cachedResp, err := app.Test(cachedReq) utils.AssertEqual(t, nil, err) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) - cachedBody, err := ioutil.ReadAll(cachedResp.Body) + cachedBody, err := io.ReadAll(cachedResp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, cachedBody, body) @@ -186,25 +187,25 @@ func Test_Cache_Invalid_Method(t *testing.T) { resp, err := app.Test(httptest.NewRequest("POST", "/?cache=123", nil)) utils.AssertEqual(t, nil, err) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "123", string(body)) resp, err = app.Test(httptest.NewRequest("POST", "/?cache=12345", nil)) utils.AssertEqual(t, nil, err) - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "12345", string(body)) resp, err = app.Test(httptest.NewRequest("GET", "/get?cache=123", nil)) utils.AssertEqual(t, nil, err) - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "123", string(body)) resp, err = app.Test(httptest.NewRequest("GET", "/get?cache=12345", nil)) utils.AssertEqual(t, nil, err) - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "123", string(body)) } @@ -222,14 +223,14 @@ func Test_Cache_NothingToCache(t *testing.T) { resp, err := app.Test(httptest.NewRequest("GET", "/", nil)) utils.AssertEqual(t, nil, err) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) time.Sleep(500 * time.Millisecond) respCached, err := app.Test(httptest.NewRequest("GET", "/", nil)) utils.AssertEqual(t, nil, err) - bodyCached, err := ioutil.ReadAll(respCached.Body) + bodyCached, err := io.ReadAll(respCached.Body) utils.AssertEqual(t, nil, err) if bytes.Equal(body, bodyCached) { @@ -259,12 +260,12 @@ func Test_Cache_CustomNext(t *testing.T) { resp, err := app.Test(httptest.NewRequest("GET", "/", nil)) utils.AssertEqual(t, nil, err) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) respCached, err := app.Test(httptest.NewRequest("GET", "/", nil)) utils.AssertEqual(t, nil, err) - bodyCached, err := ioutil.ReadAll(respCached.Body) + bodyCached, err := io.ReadAll(respCached.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, bytes.Equal(body, bodyCached)) utils.AssertEqual(t, true, respCached.Header.Get(fiber.HeaderCacheControl) != "") @@ -326,9 +327,9 @@ func Test_CustomExpiration(t *testing.T) { cachedResp, err := app.Test(httptest.NewRequest("GET", "/", nil)) utils.AssertEqual(t, nil, err) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) - cachedBody, err := ioutil.ReadAll(cachedResp.Body) + cachedBody, err := io.ReadAll(cachedResp.Body) utils.AssertEqual(t, nil, err) if bytes.Equal(body, cachedBody) { @@ -338,7 +339,7 @@ func Test_CustomExpiration(t *testing.T) { // Next response should be cached cachedRespNextRound, err := app.Test(httptest.NewRequest("GET", "/", nil)) utils.AssertEqual(t, nil, err) - cachedBodyNextRound, err := ioutil.ReadAll(cachedRespNextRound.Body) + cachedBodyNextRound, err := io.ReadAll(cachedRespNextRound.Body) utils.AssertEqual(t, nil, err) if !bytes.Equal(cachedBodyNextRound, cachedBody) { @@ -430,9 +431,9 @@ func Test_Cache_WithHead(t *testing.T) { cachedResp, err := app.Test(cachedReq) utils.AssertEqual(t, cacheHit, cachedResp.Header.Get("X-Cache")) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) - cachedBody, err := ioutil.ReadAll(cachedResp.Body) + cachedBody, err := io.ReadAll(cachedResp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, cachedBody, body) @@ -449,28 +450,28 @@ func Test_Cache_WithHeadThenGet(t *testing.T) { headResp, err := app.Test(httptest.NewRequest("HEAD", "/?cache=123", nil)) utils.AssertEqual(t, nil, err) - headBody, err := ioutil.ReadAll(headResp.Body) + headBody, err := io.ReadAll(headResp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "", string(headBody)) utils.AssertEqual(t, cacheMiss, headResp.Header.Get("X-Cache")) headResp, err = app.Test(httptest.NewRequest("HEAD", "/?cache=123", nil)) utils.AssertEqual(t, nil, err) - headBody, err = ioutil.ReadAll(headResp.Body) + headBody, err = io.ReadAll(headResp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "", string(headBody)) utils.AssertEqual(t, cacheHit, headResp.Header.Get("X-Cache")) getResp, err := app.Test(httptest.NewRequest("GET", "/?cache=123", nil)) utils.AssertEqual(t, nil, err) - getBody, err := ioutil.ReadAll(getResp.Body) + getBody, err := io.ReadAll(getResp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "123", string(getBody)) utils.AssertEqual(t, cacheMiss, getResp.Header.Get("X-Cache")) getResp, err = app.Test(httptest.NewRequest("GET", "/?cache=123", nil)) utils.AssertEqual(t, nil, err) - getBody, err = ioutil.ReadAll(getResp.Body) + getBody, err = io.ReadAll(getResp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "123", string(getBody)) utils.AssertEqual(t, cacheHit, getResp.Header.Get("X-Cache")) @@ -583,7 +584,7 @@ func Benchmark_Cache(b *testing.B) { app.Use(New()) app.Get("/demo", func(c *fiber.Ctx) error { - data, _ := ioutil.ReadFile("../../.github/README.md") + data, _ := os.ReadFile("../../.github/README.md") return c.Status(fiber.StatusTeapot).Send(data) }) @@ -613,7 +614,7 @@ func Benchmark_Cache_Storage(b *testing.B) { })) app.Get("/demo", func(c *fiber.Ctx) error { - data, _ := ioutil.ReadFile("../../.github/README.md") + data, _ := os.ReadFile("../../.github/README.md") return c.Status(fiber.StatusTeapot).Send(data) }) diff --git a/middleware/compress/compress_test.go b/middleware/compress/compress_test.go index 1aeaca2c..13ea820d 100644 --- a/middleware/compress/compress_test.go +++ b/middleware/compress/compress_test.go @@ -3,8 +3,9 @@ package compress import ( "errors" "fmt" - "io/ioutil" + "io" "net/http/httptest" + "os" "testing" "github.com/gofiber/fiber/v3" @@ -14,7 +15,7 @@ import ( var filedata []byte func init() { - dat, err := ioutil.ReadFile("../../.github/README.md") + dat, err := os.ReadFile("../../.github/README.md") if err != nil { panic(err) } @@ -41,7 +42,7 @@ func Test_Compress_Gzip(t *testing.T) { utils.AssertEqual(t, "gzip", resp.Header.Get(fiber.HeaderContentEncoding)) // Validate that the file size has shrunk - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, len(body) < len(filedata)) } @@ -69,7 +70,7 @@ func Test_Compress_Different_Level(t *testing.T) { utils.AssertEqual(t, "gzip", resp.Header.Get(fiber.HeaderContentEncoding)) // Validate that the file size has shrunk - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, len(body) < len(filedata)) }) @@ -94,7 +95,7 @@ func Test_Compress_Deflate(t *testing.T) { utils.AssertEqual(t, "deflate", resp.Header.Get(fiber.HeaderContentEncoding)) // Validate that the file size has shrunk - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, len(body) < len(filedata)) } @@ -117,7 +118,7 @@ func Test_Compress_Brotli(t *testing.T) { utils.AssertEqual(t, "br", resp.Header.Get(fiber.HeaderContentEncoding)) // Validate that the file size has shrunk - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, len(body) < len(filedata)) } @@ -140,7 +141,7 @@ func Test_Compress_Disabled(t *testing.T) { utils.AssertEqual(t, "", resp.Header.Get(fiber.HeaderContentEncoding)) // Validate the file size is not shrunk - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, len(body) == len(filedata)) } @@ -162,7 +163,7 @@ func Test_Compress_Next_Error(t *testing.T) { utils.AssertEqual(t, 500, resp.StatusCode, "Status code") utils.AssertEqual(t, "", resp.Header.Get(fiber.HeaderContentEncoding)) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "next error", string(body)) } diff --git a/middleware/etag/etag_test.go b/middleware/etag/etag_test.go index b4568cb4..d309d2b8 100644 --- a/middleware/etag/etag_test.go +++ b/middleware/etag/etag_test.go @@ -2,7 +2,7 @@ package etag import ( "bytes" - "io/ioutil" + "io" "net/http/httptest" "testing" @@ -114,7 +114,7 @@ func testETagNewEtag(t *testing.T, headerIfNoneMatch, matched bool) { if matched { utils.AssertEqual(t, fiber.StatusNotModified, resp.StatusCode) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, 0, len(b)) } @@ -164,7 +164,7 @@ func testETagWeakEtag(t *testing.T, headerIfNoneMatch, matched bool) { if matched { utils.AssertEqual(t, fiber.StatusNotModified, resp.StatusCode) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, 0, len(b)) } @@ -218,7 +218,7 @@ func testETagCustomEtag(t *testing.T, headerIfNoneMatch, matched bool) { if matched { utils.AssertEqual(t, fiber.StatusNotModified, resp.StatusCode) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, 0, len(b)) } diff --git a/middleware/expvar/expvar_test.go b/middleware/expvar/expvar_test.go index 3e8a38b7..41afba95 100644 --- a/middleware/expvar/expvar_test.go +++ b/middleware/expvar/expvar_test.go @@ -2,7 +2,7 @@ package expvar import ( "bytes" - "io/ioutil" + "io" "net/http/httptest" "testing" @@ -23,7 +23,7 @@ func Test_Non_Expvar_Path(t *testing.T) { utils.AssertEqual(t, nil, err) utils.AssertEqual(t, 200, resp.StatusCode) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "escaped", string(b)) } @@ -42,7 +42,7 @@ func Test_Expvar_Index(t *testing.T) { utils.AssertEqual(t, 200, resp.StatusCode) utils.AssertEqual(t, fiber.MIMEApplicationJSONCharsetUTF8, resp.Header.Get(fiber.HeaderContentType)) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, bytes.Contains(b, []byte("cmdline"))) utils.AssertEqual(t, true, bytes.Contains(b, []byte("memstat"))) @@ -62,7 +62,7 @@ func Test_Expvar_Filter(t *testing.T) { utils.AssertEqual(t, 200, resp.StatusCode) utils.AssertEqual(t, fiber.MIMEApplicationJSONCharsetUTF8, resp.Header.Get(fiber.HeaderContentType)) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, bytes.Contains(b, []byte("cmdline"))) utils.AssertEqual(t, false, bytes.Contains(b, []byte("memstat"))) diff --git a/middleware/favicon/favicon.go b/middleware/favicon/favicon.go index f6e7a7e9..f9d39399 100644 --- a/middleware/favicon/favicon.go +++ b/middleware/favicon/favicon.go @@ -1,8 +1,9 @@ package favicon import ( - "io/ioutil" + "io" "net/http" + "os" "strconv" "github.com/gofiber/fiber/v3" @@ -80,10 +81,10 @@ func New(config ...Config) fiber.Handler { if err != nil { panic(err) } - if icon, err = ioutil.ReadAll(f); err != nil { + if icon, err = io.ReadAll(f); err != nil { panic(err) } - } else if icon, err = ioutil.ReadFile(cfg.File); err != nil { + } else if icon, err = os.ReadFile(cfg.File); err != nil { panic(err) } diff --git a/middleware/limiter/limiter_test.go b/middleware/limiter/limiter_test.go index 010632e3..63e12e96 100644 --- a/middleware/limiter/limiter_test.go +++ b/middleware/limiter/limiter_test.go @@ -1,7 +1,7 @@ package limiter import ( - "io/ioutil" + "io" "net/http" "net/http/httptest" "sync" @@ -37,7 +37,7 @@ func Test_Limiter_Concurrency_Store(t *testing.T) { utils.AssertEqual(t, nil, err) utils.AssertEqual(t, fiber.StatusOK, resp.StatusCode) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "Hello tester!", string(body)) } @@ -82,7 +82,7 @@ func Test_Limiter_Concurrency(t *testing.T) { utils.AssertEqual(t, nil, err) utils.AssertEqual(t, fiber.StatusOK, resp.StatusCode) - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "Hello tester!", string(body)) } diff --git a/middleware/logger/logger_test.go b/middleware/logger/logger_test.go index 82db112d..667da0af 100644 --- a/middleware/logger/logger_test.go +++ b/middleware/logger/logger_test.go @@ -3,7 +3,7 @@ package logger import ( "errors" "fmt" - "io/ioutil" + "io" "net/http" "net/http/httptest" "os" @@ -265,7 +265,7 @@ func Benchmark_Logger(b *testing.B) { app.Use(New(Config{ Format: "${bytesReceived} ${bytesSent} ${status}", - Output: ioutil.Discard, + Output: io.Discard, })) app.Get("/", func(c *fiber.Ctx) error { return c.SendString("Hello, World!") diff --git a/middleware/monitor/monitor_test.go b/middleware/monitor/monitor_test.go index 18ea1426..ac6d0607 100644 --- a/middleware/monitor/monitor_test.go +++ b/middleware/monitor/monitor_test.go @@ -3,7 +3,7 @@ package monitor import ( "bytes" "fmt" - "io/ioutil" + "io" "net/http/httptest" "testing" "time" @@ -38,7 +38,7 @@ func Test_Monitor_Html(t *testing.T) { utils.AssertEqual(t, 200, resp.StatusCode) utils.AssertEqual(t, fiber.MIMETextHTMLCharsetUTF8, resp.Header.Get(fiber.HeaderContentType)) - buf, err := ioutil.ReadAll(resp.Body) + buf, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, bytes.Contains(buf, []byte(""+defaultTitle+""))) timeoutLine := fmt.Sprintf("setTimeout(fetchJSON, %d)", @@ -54,7 +54,7 @@ func Test_Monitor_Html(t *testing.T) { utils.AssertEqual(t, 200, resp.StatusCode) utils.AssertEqual(t, fiber.MIMETextHTMLCharsetUTF8, resp.Header.Get(fiber.HeaderContentType)) - buf, err = ioutil.ReadAll(resp.Body) + buf, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, bytes.Contains(buf, []byte(""+conf.Title+""))) timeoutLine = fmt.Sprintf("setTimeout(fetchJSON, %d)", @@ -77,7 +77,7 @@ func Test_Monitor_JSON(t *testing.T) { utils.AssertEqual(t, 200, resp.StatusCode) utils.AssertEqual(t, fiber.MIMEApplicationJSON, resp.Header.Get(fiber.HeaderContentType)) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, bytes.Contains(b, []byte("pid"))) utils.AssertEqual(t, true, bytes.Contains(b, []byte("os"))) @@ -145,7 +145,7 @@ func Test_Monitor_APIOnly(t *testing.T) { utils.AssertEqual(t, 200, resp.StatusCode) utils.AssertEqual(t, fiber.MIMEApplicationJSON, resp.Header.Get(fiber.HeaderContentType)) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, bytes.Contains(b, []byte("pid"))) utils.AssertEqual(t, true, bytes.Contains(b, []byte("os"))) diff --git a/middleware/pprof/pprof_test.go b/middleware/pprof/pprof_test.go index 3114b014..448e2c2e 100644 --- a/middleware/pprof/pprof_test.go +++ b/middleware/pprof/pprof_test.go @@ -2,7 +2,7 @@ package pprof import ( "bytes" - "io/ioutil" + "io" "net/http/httptest" "testing" @@ -23,7 +23,7 @@ func Test_Non_Pprof_Path(t *testing.T) { utils.AssertEqual(t, nil, err) utils.AssertEqual(t, 200, resp.StatusCode) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "escaped", string(b)) } @@ -42,7 +42,7 @@ func Test_Pprof_Index(t *testing.T) { utils.AssertEqual(t, 200, resp.StatusCode) utils.AssertEqual(t, fiber.MIMETextHTMLCharsetUTF8, resp.Header.Get(fiber.HeaderContentType)) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, true, bytes.Contains(b, []byte("/debug/pprof/"))) } diff --git a/middleware/proxy/proxy_test.go b/middleware/proxy/proxy_test.go index c572f65b..1ebfeebf 100644 --- a/middleware/proxy/proxy_test.go +++ b/middleware/proxy/proxy_test.go @@ -2,7 +2,7 @@ package proxy import ( "crypto/tls" - "io/ioutil" + "io" "net" "net/http/httptest" "strings" @@ -172,7 +172,7 @@ func Test_Proxy_Forward(t *testing.T) { utils.AssertEqual(t, nil, err) utils.AssertEqual(t, fiber.StatusOK, resp.StatusCode) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "forwarded", string(b)) } @@ -232,7 +232,7 @@ func Test_Proxy_Modify_Response(t *testing.T) { utils.AssertEqual(t, nil, err) utils.AssertEqual(t, fiber.StatusOK, resp.StatusCode) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "modified response", string(b)) } @@ -259,7 +259,7 @@ func Test_Proxy_Modify_Request(t *testing.T) { utils.AssertEqual(t, nil, err) utils.AssertEqual(t, fiber.StatusOK, resp.StatusCode) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "modified request", string(b)) } @@ -283,7 +283,7 @@ func Test_Proxy_Timeout_Slow_Server(t *testing.T) { utils.AssertEqual(t, nil, err) utils.AssertEqual(t, fiber.StatusOK, resp.StatusCode) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "fiber is awesome", string(b)) } @@ -307,7 +307,7 @@ func Test_Proxy_With_Timeout(t *testing.T) { utils.AssertEqual(t, nil, err) utils.AssertEqual(t, fiber.StatusInternalServerError, resp.StatusCode) - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, "timeout", string(b)) } diff --git a/middleware/timeout/timeout_test.go b/middleware/timeout/timeout_test.go index dc60e2eb..98d4af22 100644 --- a/middleware/timeout/timeout_test.go +++ b/middleware/timeout/timeout_test.go @@ -16,7 +16,7 @@ package timeout // utils.AssertEqual(t, nil, err, "app.Test(req)") // utils.AssertEqual(t, fiber.StatusRequestTimeout, resp.StatusCode, "Status code") -// body, err := ioutil.ReadAll(resp.Body) +// body, err := io.ReadAll(resp.Body) // utils.AssertEqual(t, nil, err) // utils.AssertEqual(t, "Request Timeout", string(body)) // } @@ -25,7 +25,7 @@ package timeout // utils.AssertEqual(t, nil, err, "app.Test(req)") // utils.AssertEqual(t, fiber.StatusOK, resp.StatusCode, "Status code") -// body, err := ioutil.ReadAll(resp.Body) +// body, err := io.ReadAll(resp.Body) // utils.AssertEqual(t, nil, err) // utils.AssertEqual(t, "After "+timeoutStr+"ms sleeping", string(body)) // } @@ -49,7 +49,7 @@ package timeout // utils.AssertEqual(t, nil, err, "app.Test(req)") // utils.AssertEqual(t, fiber.StatusRequestTimeout, resp.StatusCode, "Status code") -// body, err := ioutil.ReadAll(resp.Body) +// body, err := io.ReadAll(resp.Body) // utils.AssertEqual(t, nil, err) // utils.AssertEqual(t, "Request Timeout", string(body)) // } diff --git a/prefork_test.go b/prefork_test.go index 08a40cc0..f318ac37 100644 --- a/prefork_test.go +++ b/prefork_test.go @@ -6,7 +6,7 @@ package fiber import ( "crypto/tls" - "io/ioutil" + "io" "os" "testing" "time" @@ -83,7 +83,7 @@ func Test_App_Prefork_Child_Process_Never_Show_Startup_Message(t *testing.T) { utils.AssertEqual(t, nil, w.Close()) - out, err := ioutil.ReadAll(r) + out, err := io.ReadAll(r) utils.AssertEqual(t, nil, err) utils.AssertEqual(t, 0, len(out)) } diff --git a/router_test.go b/router_test.go index 49834966..e3adad10 100644 --- a/router_test.go +++ b/router_test.go @@ -10,8 +10,9 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "io" "net/http/httptest" + "os" "strings" "testing" @@ -22,7 +23,7 @@ import ( var routesFixture = routeJSON{} func init() { - dat, err := ioutil.ReadFile("./.github/testdata/testRoutes.json") + dat, err := os.ReadFile("./.github/testdata/testRoutes.json") if err != nil { panic(err) } @@ -42,7 +43,7 @@ func Test_Route_Match_SameLength(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, ":param", app.getString(body)) @@ -51,7 +52,7 @@ func Test_Route_Match_SameLength(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "test", app.getString(body)) } @@ -67,7 +68,7 @@ func Test_Route_Match_Star(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "*", app.getString(body)) @@ -76,7 +77,7 @@ func Test_Route_Match_Star(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "test", app.getString(body)) @@ -113,7 +114,7 @@ func Test_Route_Match_Root(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "root", app.getString(body)) } @@ -131,7 +132,7 @@ func Test_Route_Match_Parser(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "bar", app.getString(body)) @@ -140,7 +141,7 @@ func Test_Route_Match_Parser(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "test", app.getString(body)) } @@ -156,7 +157,7 @@ func Test_Route_Match_Middleware(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "*", app.getString(body)) @@ -165,7 +166,7 @@ func Test_Route_Match_Middleware(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "bar/fasel", app.getString(body)) } @@ -181,7 +182,7 @@ func Test_Route_Match_UnescapedPath(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "test", app.getString(body)) // without special chars @@ -217,7 +218,7 @@ func Test_Route_Match_WithEscapeChar(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "static", app.getString(body)) @@ -226,7 +227,7 @@ func Test_Route_Match_WithEscapeChar(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code") - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "group", app.getString(body)) @@ -235,7 +236,7 @@ func Test_Route_Match_WithEscapeChar(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, StatusOK, resp.StatusCode, "Status code") - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "awesome", app.getString(body)) } @@ -251,7 +252,7 @@ func Test_Route_Match_Middleware_HasPrefix(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "middleware", app.getString(body)) } @@ -267,7 +268,7 @@ func Test_Route_Match_Middleware_Root(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, "middleware", app.getString(body)) } @@ -324,7 +325,7 @@ func Test_Route_Static_Root(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, true, strings.Contains(app.getString(body), "color")) @@ -339,7 +340,7 @@ func Test_Route_Static_Root(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, true, strings.Contains(app.getString(body), "color")) } @@ -363,7 +364,7 @@ func Test_Route_Static_HasPrefix(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, true, strings.Contains(app.getString(body), "color")) @@ -384,7 +385,7 @@ func Test_Route_Static_HasPrefix(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, true, strings.Contains(app.getString(body), "color")) @@ -403,7 +404,7 @@ func Test_Route_Static_HasPrefix(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, true, strings.Contains(app.getString(body), "color")) @@ -422,7 +423,7 @@ func Test_Route_Static_HasPrefix(t *testing.T) { utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, 200, resp.StatusCode, "Status code") - body, err = ioutil.ReadAll(resp.Body) + body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, true, strings.Contains(app.getString(body), "color")) }