chore: Fix testifylint errors in middleware (#2805)

middleware/adaptor/adaptor_test.go

@@ -47,7 +47,7 @@ func Test_HTTPHandler(t *testing.T) {
 		require.Equal(t, expectedProtoMinor, r.ProtoMinor, "ProtoMinor")
 		require.Equal(t, expectedRequestURI, r.RequestURI, "RequestURI")
 		require.Equal(t, expectedContentLength, int(r.ContentLength), "ContentLength")
-		require.Equal(t, 0, len(r.TransferEncoding), "TransferEncoding")
+		require.Empty(t, r.TransferEncoding, "TransferEncoding")
 		require.Equal(t, expectedHost, r.Host, "Host")
 		require.Equal(t, expectedRemoteAddr, r.RemoteAddr, "RemoteAddr")
 
@@ -190,8 +190,8 @@ func Test_HTTPMiddleware(t *testing.T) {
 
 	resp, err := app.Test(req)
 	require.NoError(t, err)
-	require.Equal(t, resp.Header.Get("context_okay"), "okay")
-	require.Equal(t, resp.Header.Get("context_second_okay"), "okay")
+	require.Equal(t, "okay", resp.Header.Get("context_okay"))
+	require.Equal(t, "okay", resp.Header.Get("context_second_okay"))
 }
 
 func Test_FiberHandler(t *testing.T) {
@@ -390,7 +390,7 @@ func Test_ConvertRequest(t *testing.T) {
 	})
 
 	resp, err := app.Test(httptest.NewRequest(fiber.MethodGet, "/test?hello=world&another=test", http.NoBody))
-	require.Equal(t, nil, err, "app.Test(req)")
+	require.NoError(t, err, "app.Test(req)")
 	require.Equal(t, http.StatusOK, resp.StatusCode, "Status code")
 
 	body, err := io.ReadAll(resp.Body)

middleware/cache/cache_test.go

@@ -467,14 +467,14 @@ func Test_Cache_CustomNext(t *testing.T) {
 	bodyCached, err := io.ReadAll(respCached.Body)
 	require.NoError(t, err)
 	require.True(t, bytes.Equal(body, bodyCached))
-	require.True(t, respCached.Header.Get(fiber.HeaderCacheControl) != "")
+	require.NotEmpty(t, respCached.Header.Get(fiber.HeaderCacheControl))
 
 	_, err = app.Test(httptest.NewRequest(fiber.MethodGet, "/error", nil))
 	require.NoError(t, err)
 
 	errRespCached, err := app.Test(httptest.NewRequest(fiber.MethodGet, "/error", nil))
 	require.NoError(t, err)
-	require.True(t, errRespCached.Header.Get(fiber.HeaderCacheControl) == "")
+	require.Empty(t, errRespCached.Header.Get(fiber.HeaderCacheControl))
 }
 
 func Test_CustomKey(t *testing.T) {
@@ -809,7 +809,7 @@ func Benchmark_Cache(b *testing.B) {
 	}
 
 	require.Equal(b, fiber.StatusTeapot, fctx.Response.Header.StatusCode())
-	require.True(b, len(fctx.Response.Body()) > 30000)
+	require.Greater(b, len(fctx.Response.Body()), 30000)
 }
 
 // go test -v -run=^$ -bench=Benchmark_Cache_Storage -benchmem -count=4
@@ -839,7 +839,7 @@ func Benchmark_Cache_Storage(b *testing.B) {
 	}
 
 	require.Equal(b, fiber.StatusTeapot, fctx.Response.Header.StatusCode())
-	require.True(b, len(fctx.Response.Body()) > 30000)
+	require.Greater(b, len(fctx.Response.Body()), 30000)
 }
 
 func Benchmark_Cache_AdditionalHeaders(b *testing.B) {

middleware/compress/compress_test.go

@@ -45,7 +45,7 @@ func Test_Compress_Gzip(t *testing.T) {
 	// Validate that the file size has shrunk
 	body, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
-	require.True(t, len(body) < len(filedata))
+	require.Less(t, len(body), len(filedata))
 }
 
 // go test -run Test_Compress_Different_Level
@@ -76,7 +76,7 @@ func Test_Compress_Different_Level(t *testing.T) {
 			// Validate that the file size has shrunk
 			body, err := io.ReadAll(resp.Body)
 			require.NoError(t, err)
-			require.True(t, len(body) < len(filedata))
+			require.Less(t, len(body), len(filedata))
 		})
 	}
 }
@@ -102,7 +102,7 @@ func Test_Compress_Deflate(t *testing.T) {
 	// Validate that the file size has shrunk
 	body, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
-	require.True(t, len(body) < len(filedata))
+	require.Less(t, len(body), len(filedata))
 }
 
 func Test_Compress_Brotli(t *testing.T) {
@@ -126,7 +126,7 @@ func Test_Compress_Brotli(t *testing.T) {
 	// Validate that the file size has shrunk
 	body, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
-	require.True(t, len(body) < len(filedata))
+	require.Less(t, len(body), len(filedata))
 }
 
 func Test_Compress_Disabled(t *testing.T) {
@@ -150,7 +150,7 @@ func Test_Compress_Disabled(t *testing.T) {
 	// Validate the file size is not shrunk
 	body, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
-	require.True(t, len(body) == len(filedata))
+	require.Equal(t, len(body), len(filedata))
 }
 
 func Test_Compress_Next_Error(t *testing.T) {

middleware/csrf/csrf_test.go

@@ -83,8 +83,8 @@ func Test_CSRF_WithSession(t *testing.T) {
 
 	// get session
 	sess, err := store.Get(app.NewCtx(ctx))
-	require.Equal(t, nil, err)
-	require.Equal(t, true, sess.Fresh())
+	require.NoError(t, err)
+	require.True(t, sess.Fresh())
 
 	// the session string is no longer be 123
 	newSessionIDString := sess.ID()
@@ -216,8 +216,8 @@ func Test_CSRF_ExpiredToken_WithSession(t *testing.T) {
 
 	// get session
 	sess, err := store.Get(app.NewCtx(ctx))
-	require.Equal(t, nil, err)
-	require.Equal(t, true, sess.Fresh())
+	require.NoError(t, err)
+	require.True(t, sess.Fresh())
 
 	// get session id
 	newSessionIDString := sess.ID()
@@ -747,8 +747,8 @@ func Test_CSRF_DeleteToken_WithSession(t *testing.T) {
 
 	// get session
 	sess, err := store.Get(app.NewCtx(ctx))
-	require.Equal(t, nil, err)
-	require.Equal(t, true, sess.Fresh())
+	require.NoError(t, err)
+	require.True(t, sess.Fresh())
 
 	// the session string is no longer be 123
 	newSessionIDString := sess.ID()

middleware/envvar/envvar_test.go

@@ -22,10 +22,10 @@ func TestEnvVarStructWithExportVarsExcludeVars(t *testing.T) {
 		ExcludeVars: map[string]string{"excludeKey": ""},
 	})
 
-	require.Equal(t, vars.Vars["testKey"], "testEnvValue")
-	require.Equal(t, vars.Vars["testDefaultKey"], "testDefaultVal")
-	require.Equal(t, vars.Vars["excludeKey"], "")
-	require.Equal(t, vars.Vars["anotherEnvKey"], "")
+	require.Equal(t, "testEnvValue", vars.Vars["testKey"])
+	require.Equal(t, "testDefaultVal", vars.Vars["testDefaultKey"])
+	require.Equal(t, "", vars.Vars["excludeKey"])
+	require.Equal(t, "", vars.Vars["anotherEnvKey"])
 }
 
 func TestEnvVarHandler(t *testing.T) {
@@ -92,7 +92,7 @@ func TestEnvVarHandlerDefaultConfig(t *testing.T) {
 	require.NoError(t, err)
 
 	var envVars EnvVar
-	require.Equal(t, nil, json.Unmarshal(respBody, &envVars))
+	require.NoError(t, json.Unmarshal(respBody, &envVars))
 	val := envVars.Vars["testEnvKey"]
 	require.Equal(t, "testEnvVal", val)
 }
@@ -126,7 +126,7 @@ func TestEnvVarHandlerSpecialValue(t *testing.T) {
 	require.NoError(t, err)
 
 	var envVars EnvVar
-	require.Equal(t, nil, json.Unmarshal(respBody, &envVars))
+	require.NoError(t, json.Unmarshal(respBody, &envVars))
 	val := envVars.Vars[testEnvKey]
 	require.Equal(t, fakeBase64, val)
 
@@ -139,7 +139,7 @@ func TestEnvVarHandlerSpecialValue(t *testing.T) {
 	require.NoError(t, err)
 
 	var envVarsExport EnvVar
-	require.Equal(t, nil, json.Unmarshal(respBody, &envVarsExport))
+	require.NoError(t, json.Unmarshal(respBody, &envVarsExport))
 	val = envVarsExport.Vars[testEnvKey]
 	require.Equal(t, fakeBase64, val)
 }

middleware/etag/etag_test.go

@@ -124,7 +124,7 @@ func testETagNewEtag(t *testing.T, headerIfNoneMatch, matched bool) { //nolint:r
 		require.Equal(t, fiber.StatusNotModified, resp.StatusCode)
 		b, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
-		require.Equal(t, 0, len(b))
+		require.Empty(t, b)
 	}
 }
 
@@ -178,7 +178,7 @@ func testETagWeakEtag(t *testing.T, headerIfNoneMatch, matched bool) { //nolint:
 		require.Equal(t, fiber.StatusNotModified, resp.StatusCode)
 		b, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
-		require.Equal(t, 0, len(b))
+		require.Empty(t, b)
 	}
 }
 
@@ -236,7 +236,7 @@ func testETagCustomEtag(t *testing.T, headerIfNoneMatch, matched bool) { //nolin
 		require.Equal(t, fiber.StatusNotModified, resp.StatusCode)
 		b, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
-		require.Equal(t, 0, len(b))
+		require.Empty(t, b)
 	}
 }
 

middleware/favicon/favicon_test.go

@@ -71,7 +71,7 @@ func Test_Middleware_Favicon_Found(t *testing.T) {
 	})
 
 	resp, err := app.Test(httptest.NewRequest(fiber.MethodGet, "/favicon.ico", nil))
-	require.NoError(t, nil, err, "app.Test(req)")
+	require.NoError(t, err, "app.Test(req)")
 	require.Equal(t, fiber.StatusOK, resp.StatusCode, "Status code")
 	require.Equal(t, "image/x-icon", resp.Header.Get(fiber.HeaderContentType))
 	require.Equal(t, "public, max-age=31536000", resp.Header.Get(fiber.HeaderCacheControl), "CacheControl Control")
@@ -92,15 +92,15 @@ func Test_Custom_Favicon_URL(t *testing.T) {
 
 	resp, err := app.Test(httptest.NewRequest(http.MethodGet, customURL, nil))
 
-	require.Equal(t, nil, err, "app.Test(req)")
+	require.NoError(t, err, "app.Test(req)")
 	require.Equal(t, fiber.StatusOK, resp.StatusCode, "Status code")
 	require.Equal(t, "image/x-icon", resp.Header.Get(fiber.HeaderContentType))
 }
 
 // go test -run Test_Custom_Favicon_Data
 func Test_Custom_Favicon_Data(t *testing.T) {
 	data, err := os.ReadFile("../../.github/testdata/favicon.ico")
-	require.Equal(t, nil, err)
+	require.NoError(t, err)
 
 	app := fiber.New()
 

middleware/filesystem/filesystem_test.go

@@ -162,7 +162,7 @@ func Test_FileSystem_Download(t *testing.T) {
 	resp, err := app.Test(httptest.NewRequest(fiber.MethodGet, "/img/fiber.png", nil))
 	require.NoError(t, err, "app.Test(req)")
 	require.Equal(t, 200, resp.StatusCode, "Status code")
-	require.False(t, resp.Header.Get(fiber.HeaderContentLength) == "")
+	require.NotEmpty(t, resp.Header.Get(fiber.HeaderContentLength))
 	require.Equal(t, "image/png", resp.Header.Get(fiber.HeaderContentType))
 	require.Equal(t, "attachment", resp.Header.Get(fiber.HeaderContentDisposition))
 }