Skip to content

Commit e795b11

Browse files
committed
feat: remove quoting for all params passed to xadd, xrange
1 parent 84d26d8 commit e795b11

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

internal/test_streams_xadd.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (t *XADDTest) Run(client *redis.Client, logger *logger.Logger) error {
3030
values = append(values, key, fmt.Sprintf("%v", value))
3131
}
3232

33-
logger.Infof("$ redis-cli xadd %q %q %q", t.streamKey, t.id, strings.Join(values, " "))
33+
logger.Infof("$ redis-cli xadd %v %v %v", t.streamKey, t.id, strings.Join(values, " "))
3434

3535
resp, err := client.XAdd(&redis.XAddArgs{
3636
Stream: t.streamKey,
@@ -48,18 +48,18 @@ func (t *XADDTest) Run(client *redis.Client, logger *logger.Logger) error {
4848
return fmt.Errorf("Expected %q, got %q", t.expectedError, err.Error())
4949
}
5050

51-
logger.Successf("Received error: \"%q\"", err.Error())
51+
logger.Successf("Received error: %q", err.Error())
5252
return nil
5353
}
5454

5555
if resp != t.expectedResponse && t.expectedError != "" {
56-
logger.Infof("Received response: \"%q\"", resp)
56+
logger.Infof("Received response: %q", resp)
5757
return fmt.Errorf("Expected an error as the response, got %q", resp)
5858
} else if resp != t.expectedResponse {
59-
logger.Infof("Received response: \"%q\"", resp)
59+
logger.Infof("Received response: %q", resp)
6060
return fmt.Errorf("Expected %q, got %q", t.expectedResponse, resp)
6161
} else {
62-
logger.Successf("Received response: \"%q\"", resp)
62+
logger.Successf("Received response: %q", resp)
6363
}
6464

6565
return nil

internal/test_streams_xrange.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package internal
33
import (
44
"encoding/json"
55
"fmt"
6-
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
76
"reflect"
87
"strconv"
98

9+
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
10+
1011
testerutils_random "github.com/codecrafters-io/tester-utils/random"
1112
"github.com/codecrafters-io/tester-utils/test_case_harness"
1213
"github.com/go-redis/redis"
@@ -55,7 +56,7 @@ func testStreamsXrange(stageHarness *test_case_harness.TestCaseHarness) error {
5556
maxID := "0-" + strconv.Itoa(randomNumber)
5657
expectedResp = expectedResp[1:]
5758

58-
logger.Infof("$ redis-cli xrange %q 0-2 %q", randomKey, maxID)
59+
logger.Infof("$ redis-cli xrange %v 0-2 %v", randomKey, maxID)
5960
resp, err := client.XRange(randomKey, "0-2", maxID).Result()
6061

6162
if err != nil {

internal/test_streams_xrange_max_id.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package internal
33
import (
44
"encoding/json"
55
"fmt"
6-
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
76
"reflect"
87
"strconv"
98

9+
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
10+
1011
testerutils_random "github.com/codecrafters-io/tester-utils/random"
1112
"github.com/codecrafters-io/tester-utils/test_case_harness"
1213
"github.com/go-redis/redis"
@@ -56,7 +57,7 @@ func testStreamsXrangeMaxID(stageHarness *test_case_harness.TestCaseHarness) err
5657
})
5758
}
5859

59-
logger.Infof("$ redis-cli xrange %q 0-2 +", randomKey)
60+
logger.Infof("$ redis-cli xrange %v 0-2 +", randomKey)
6061
resp, err := client.XRange(randomKey, "0-2", "+").Result()
6162

6263
if err != nil {

internal/test_streams_xrange_min_id.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package internal
33
import (
44
"encoding/json"
55
"fmt"
6-
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
76
"reflect"
87
"strconv"
98

9+
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
10+
1011
testerutils_random "github.com/codecrafters-io/tester-utils/random"
1112
"github.com/codecrafters-io/tester-utils/test_case_harness"
1213
"github.com/go-redis/redis"
@@ -58,7 +59,7 @@ func testStreamsXrangeMinID(stageHarness *test_case_harness.TestCaseHarness) err
5859
})
5960
}
6061

61-
logger.Infof("$ redis-cli xrange %q - %q", randomKey, maxID)
62+
logger.Infof("$ redis-cli xrange %v - %v", randomKey, maxID)
6263
resp, err := client.XRange(randomKey, "-", maxID).Result()
6364

6465
if err != nil {

internal/test_streams_xread.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (t *XREADTest) Run(client *redis.Client, logger *logger.Logger) error {
2727
var err error
2828

2929
if t.block == nil {
30-
logger.Infof("$ redis-cli xread streams %q", strings.Join(t.streams, " "))
30+
logger.Infof("$ redis-cli xread streams %v", strings.Join(t.streams, " "))
3131

3232
resp, err = client.XRead(&redis.XReadArgs{
3333
Streams: t.streams,

0 commit comments

Comments
 (0)