redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-11-02 15:33:16 +03:00
Code Activity

chore(tests): internal/proto/peek_push_notification_test : Refactor test helpers to… (#3563)

Browse Source 
* internal/proto/peek_push_notification_test : Refactor test helpers to use fmt.Fprintf for buffers

Replaced buf.WriteString(fmt.Sprintf(...)) with fmt.Fprintf or fmt.Fprint in test helper functions for improved clarity and efficiency. This change affects push notification and RESP3 test utilities.

* peek_push_notification_test: revert prev formatting

* all: replace buf.WriteString with fmt.FprintF for consistency

---------

Co-authored-by: Nedyalko Dyakov <1547186+ndyakov@users.noreply.github.com>
This commit is contained in:
iliya
2025-10-28 18:41:45 +09:00
committed by GitHub
parent 7be00c8725
commit 9c77386b08
3 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
internal/proto/peek_push_notification_test.go
View File

@@ -95,7 +95,7 @@ func TestPeekPushNotificationName(t *testing.T) {
t.Run("NotPushNotification", func(t *testing.T) {
// Test with regular array instead of push notification
buf := &bytes.Buffer{}
buf.WriteString("*2\r\n$6\r\nMOVING\r\n$4\r\ndata\r\n")
fmt.Fprint(buf, "*2\r\n$6\r\nMOVING\r\n$4\r\ndata\r\n")
reader := NewReader(buf)
_, err := reader.PeekPushNotificationName()
@@ -112,7 +112,7 @@ func TestPeekPushNotificationName(t *testing.T) {
t.Run("InsufficientData", func(t *testing.T) {
// Test with buffer smaller than peek size - this might panic due to bounds checking
buf := &bytes.Buffer{}
buf.WriteString(">")
fmt.Fprint(buf, ">")
reader := NewReader(buf)
func() {
@@ -146,7 +146,7 @@ func TestPeekPushNotificationName(t *testing.T) {
t.Run(fmt.Sprintf("Type_%c", respType), func(t *testing.T) {
buf := &bytes.Buffer{}
buf.WriteByte(respType)
buf.WriteString("test data that fills the buffer completely")
fmt.Fprint(buf, "test data that fills the buffer completely")
reader := NewReader(buf)
_, err := reader.PeekPushNotificationName()
@@ -167,7 +167,7 @@ func TestPeekPushNotificationName(t *testing.T) {
t.Run("ZeroLengthArray", func(t *testing.T) {
// Create push notification with zero elements: >0\r\n
buf := &bytes.Buffer{}
buf.WriteString(">0\r\npadding_data_to_fill_buffer_completely")
fmt.Fprint(buf, ">0\r\npadding_data_to_fill_buffer_completely")
reader := NewReader(buf)
_, err := reader.PeekPushNotificationName()
@@ -209,7 +209,7 @@ func TestPeekPushNotificationName(t *testing.T) {
for _, tc := range corruptedCases {
t.Run(tc.name, func(t *testing.T) {
buf := &bytes.Buffer{}
buf.WriteString(tc.data)
fmt.Fprint(buf, tc.data)
reader := NewReader(buf)
// Some corrupted data might not error but return unexpected results
@@ -230,7 +230,7 @@ func TestPeekPushNotificationName(t *testing.T) {
// Create buffer that is exactly 36 bytes (the peek window size)
buf := &bytes.Buffer{}
// ">1\r\n$4\r\nTEST\r\n" = 14 bytes, need 22 more
buf.WriteString(">1\r\n$4\r\nTEST\r\n1234567890123456789012")
fmt.Fprint(buf, ">1\r\n$4\r\nTEST\r\n1234567890123456789012")
if buf.Len() != 36 {
t.Errorf("Expected buffer length 36, got %d", buf.Len())
}
@@ -295,25 +295,26 @@ func createValidPushNotification(notificationName, data string) *bytes.Buffer {
buf := &bytes.Buffer{}
simpleOrString := rand.Intn(2) == 0
defMsg := fmt.Sprintf("$%d\r\n%s\r\n", len(notificationName), notificationName)
if data == "" {
// Single element notification
buf.WriteString(">1\r\n")
fmt.Fprint(buf, ">1\r\n")
if simpleOrString {
buf.WriteString(fmt.Sprintf("+%s\r\n", notificationName))
fmt.Fprintf(buf, "+%s\r\n", notificationName)
} else {
buf.WriteString(fmt.Sprintf("$%d\r\n%s\r\n", len(notificationName), notificationName))
fmt.Fprint(buf, defMsg)
}
} else {
// Two element notification
buf.WriteString(">2\r\n")
fmt.Fprint(buf, ">2\r\n")
if simpleOrString {
buf.WriteString(fmt.Sprintf("+%s\r\n", notificationName))
buf.WriteString(fmt.Sprintf("+%s\r\n", data))
fmt.Fprintf(buf, "+%s\r\n", notificationName)
fmt.Fprintf(buf, "+%s\r\n", data)
} else {
buf.WriteString(fmt.Sprintf("$%d\r\n%s\r\n", len(notificationName), notificationName))
buf.WriteString(fmt.Sprintf("$%d\r\n%s\r\n", len(notificationName), notificationName))
fmt.Fprint(buf, defMsg)
fmt.Fprint(buf, defMsg)
}
}
@@ -333,14 +334,14 @@ func createPushNotificationWithArgs(notificationName string, args ...string) *by
buf := &bytes.Buffer{}
totalElements := 1 + len(args)
buf.WriteString(fmt.Sprintf(">%d\r\n", totalElements))
fmt.Fprintf(buf, ">%d\r\n", totalElements)
// Write notification name
buf.WriteString(fmt.Sprintf("$%d\r\n%s\r\n", len(notificationName), notificationName))
fmt.Fprintf(buf, "$%d\r\n%s\r\n", len(notificationName), notificationName)
// Write arguments
for _, arg := range args {
buf.WriteString(fmt.Sprintf("$%d\r\n%s\r\n", len(arg), arg))
fmt.Fprintf(buf, "$%d\r\n%s\r\n", len(arg), arg)
}
return buf
@@ -349,8 +350,8 @@ func createPushNotificationWithArgs(notificationName string, args ...string) *by
// createSingleElementPushNotification creates a push notification with single element
func createSingleElementPushNotification(notificationName string) *bytes.Buffer {
buf := &bytes.Buffer{}
buf.WriteString(">1\r\n")
buf.WriteString(fmt.Sprintf("$%d\r\n%s\r\n", len(notificationName), notificationName))
fmt.Fprint(buf, ">1\r\n")
fmt.Fprintf(buf, "$%d\r\n%s\r\n", len(notificationName), notificationName)
return buf
}

3
internal/proto/reader_test.go
View File

@@ -2,6 +2,7 @@ package proto_test
import (
"bytes"
"fmt"
"io"
"testing"
@@ -86,7 +87,7 @@ func TestReader_ReadLine(t *testing.T) {
func benchmarkParseReply(b *testing.B, reply string, wanterr bool) {
buf := new(bytes.Buffer)
for i := 0; i < b.N; i++ {
buf.WriteString(reply)
fmt.Fprint(buf, reply)
}
p := proto.NewReader(buf)
b.ResetTimer()

34
push/push_test.go
View File

@@ -837,14 +837,14 @@ func createFakeRESP3PushNotification(notificationType string, args ...string) *b
// RESP3 Push notification format: ><len>\r\n<elements>\r\n
totalElements := 1 + len(args) // notification type + arguments
buf.WriteString(fmt.Sprintf(">%d\r\n", totalElements))
fmt.Fprintf(buf, ">%d\r\n", totalElements)
// Write notification type as bulk string
buf.WriteString(fmt.Sprintf("$%d\r\n%s\r\n", len(notificationType), notificationType))
fmt.Fprintf(buf, "$%d\r\n%s\r\n", len(notificationType), notificationType)
// Write arguments as bulk strings
for _, arg := range args {
buf.WriteString(fmt.Sprintf("$%d\r\n%s\r\n", len(arg), arg))
fmt.Fprintf(buf, "$%d\r\n%s\r\n", len(arg), arg)
}
return buf
@@ -868,11 +868,11 @@ func createFakeRESP3Array(elements ...string) *bytes.Buffer {
buf := &bytes.Buffer{}
// RESP3 Array format: *<len>\r\n<elements>\r\n
buf.WriteString(fmt.Sprintf("*%d\r\n", len(elements)))
fmt.Fprintf(buf, "*%d\r\n", len(elements))
// Write elements as bulk strings
for _, element := range elements {
buf.WriteString(fmt.Sprintf("$%d\r\n%s\r\n", len(element), element))
fmt.Fprintf(buf, "$%d\r\n%s\r\n", len(element), element)
}
return buf
@@ -881,7 +881,7 @@ func createFakeRESP3Array(elements ...string) *bytes.Buffer {
// createFakeRESP3Error creates a fake RESP3 error
func createFakeRESP3Error(message string) *bytes.Buffer {
buf := &bytes.Buffer{}
buf.WriteString(fmt.Sprintf("-%s\r\n", message))
fmt.Fprintf(buf, "-%s\r\n", message)
return buf
}
@@ -1117,7 +1117,7 @@ func TestProcessorWithFakeBuffer(t *testing.T) {
// Create fake RESP3 push notification with no elements
buf := &bytes.Buffer{}
buf.WriteString(">0\r\n") // Empty push notification
fmt.Fprint(buf, ">0\r\n") // Empty push notification
reader := createReaderWithPrimedBuffer(buf)
ctx := context.Background()
@@ -1154,9 +1154,9 @@ func TestProcessorWithFakeBuffer(t *testing.T) {
// Create fake RESP3 push notification with integer as first element
buf := &bytes.Buffer{}
buf.WriteString(">2\r\n") // 2 elements
buf.WriteString(":123\r\n") // Integer instead of string
buf.WriteString("$4\r\ndata\r\n") // String data
fmt.Fprint(buf, ">2\r\n") // 2 elements
fmt.Fprint(buf, ":123\r\n") // Integer instead of string
fmt.Fprint(buf, "$4\r\ndata\r\n") // String data
reader := proto.NewReader(buf)
ctx := context.Background()
@@ -1273,8 +1273,8 @@ func TestVoidProcessorWithFakeBuffer(t *testing.T) {
// Create invalid RESP3 data
buf := &bytes.Buffer{}
buf.WriteString(">1\r\n") // Push notification with 1 element
buf.WriteString("invalid\r\n") // Invalid format (should be $<len>\r\n<data>\r\n)
fmt.Fprint(buf, ">1\r\n") // Push notification with 1 element
fmt.Fprint(buf, "invalid\r\n") // Invalid format (should be $<len>\r\n<data>\r\n)
reader := proto.NewReader(buf)
ctx := context.Background()
@@ -1332,9 +1332,9 @@ func TestProcessorErrorHandling(t *testing.T) {
// Create buffer with corrupted RESP3 data
buf := &bytes.Buffer{}
buf.WriteString(">2\r\n") // Says 2 elements
buf.WriteString("$6\r\nMOVING\r\n") // First element OK
buf.WriteString("corrupted") // Second element corrupted (no proper format)
fmt.Fprint(buf, ">2\r\n") // Says 2 elements
fmt.Fprint(buf, "$6\r\nMOVING\r\n") // First element OK
fmt.Fprint(buf, "corrupted") // Second element corrupted (no proper format)
reader := proto.NewReader(buf)
ctx := context.Background()
@@ -1360,8 +1360,8 @@ func TestProcessorErrorHandling(t *testing.T) {
// Create buffer with partial RESP3 data
buf := &bytes.Buffer{}
buf.WriteString(">2\r\n") // Says 2 elements
buf.WriteString("$6\r\nMOVING\r\n") // First element OK
fmt.Fprint(buf, ">2\r\n") // Says 2 elements
fmt.Fprint(buf, "$6\r\nMOVING\r\n") // First element OK
// Missing second element
reader := proto.NewReader(buf)