@@ -9,13 +9,10 @@ import (
99 "strconv"
1010 "strings"
1111 "sync"
12- "testing"
1312 "time"
1413
1514 . "github.com/bsm/ginkgo/v2"
1615 . "github.com/bsm/gomega"
17- "github.com/stretchr/testify/assert"
18-
1916 "github.com/redis/go-redis/v9"
2017 "github.com/redis/go-redis/v9/internal/hashtag"
2118)
@@ -1360,8 +1357,8 @@ var _ = Describe("ClusterClient timeout", func() {
13601357 })
13611358})
13621359
1363- func TestParseClusterURL ( t * testing. T ) {
1364- cases : =struct {
1360+ var _ = Describe ( "ClusterClient ParseURL" , func ( ) {
1361+ var cases = []struct {
13651362 test string
13661363 url string
13671364 o * redis.ClusterOptions // expected value
@@ -1454,47 +1451,36 @@ func TestParseClusterURL(t *testing.T) {
14541451 },
14551452 }
14561453
1457- for i := range cases {
1458- tc := cases [i ]
1459- t .Run (tc .test , func (t * testing.T ) {
1460- t .Parallel ()
1461-
1454+ It ("match ParseClusterURL" , func () {
1455+ for i := range cases {
1456+ tc := cases [i ]
14621457 actual , err := redis .ParseClusterURL (tc .url )
1463- if tc .err == nil && err != nil {
1464- t .Fatalf ("unexpected error: %q" , err )
1465- return
1466- }
1467- if tc .err != nil && err == nil {
1468- t .Fatalf ("expected error: got %+v" , actual )
1469- return
1470- }
1471- if tc .err != nil && err != nil {
1472- if tc .err .Error () != err .Error () {
1473- t .Fatalf ("got %q, expected %q" , err , tc .err )
1474- }
1475- return
1458+ if tc .err != nil {
1459+ Expect (err ).Should (MatchError (tc .err ))
1460+ } else {
1461+ Expect (err ).NotTo (HaveOccurred ())
14761462 }
1477- comprareOptions (t , actual , tc .o )
1478- })
1479- }
1480- }
14811463
1482- func comprareOptions (t * testing.T , actual , expected * redis.ClusterOptions ) {
1483- t .Helper ()
1484- assert .Equal (t , expected .Addrs , actual .Addrs )
1485- assert .Equal (t , expected .TLSConfig , actual .TLSConfig )
1486- assert .Equal (t , expected .Username , actual .Username )
1487- assert .Equal (t , expected .Password , actual .Password )
1488- assert .Equal (t , expected .MaxRetries , actual .MaxRetries )
1489- assert .Equal (t , expected .MinRetryBackoff , actual .MinRetryBackoff )
1490- assert .Equal (t , expected .MaxRetryBackoff , actual .MaxRetryBackoff )
1491- assert .Equal (t , expected .DialTimeout , actual .DialTimeout )
1492- assert .Equal (t , expected .ReadTimeout , actual .ReadTimeout )
1493- assert .Equal (t , expected .WriteTimeout , actual .WriteTimeout )
1494- assert .Equal (t , expected .PoolFIFO , actual .PoolFIFO )
1495- assert .Equal (t , expected .PoolSize , actual .PoolSize )
1496- assert .Equal (t , expected .MinIdleConns , actual .MinIdleConns )
1497- assert .Equal (t , expected .ConnMaxLifetime , actual .ConnMaxLifetime )
1498- assert .Equal (t , expected .ConnMaxIdleTime , actual .ConnMaxIdleTime )
1499- assert .Equal (t , expected .PoolTimeout , actual .PoolTimeout )
1500- }
1464+ if err == nil {
1465+ Expect (tc .o ).NotTo (BeNil ())
1466+
1467+ Expect (tc .o .Addrs ).To (Equal (actual .Addrs ))
1468+ Expect (tc .o .TLSConfig ).To (Equal (actual .TLSConfig ))
1469+ Expect (tc .o .Username ).To (Equal (actual .Username ))
1470+ Expect (tc .o .Password ).To (Equal (actual .Password ))
1471+ Expect (tc .o .MaxRetries ).To (Equal (actual .MaxRetries ))
1472+ Expect (tc .o .MinRetryBackoff ).To (Equal (actual .MinRetryBackoff ))
1473+ Expect (tc .o .MaxRetryBackoff ).To (Equal (actual .MaxRetryBackoff ))
1474+ Expect (tc .o .DialTimeout ).To (Equal (actual .DialTimeout ))
1475+ Expect (tc .o .ReadTimeout ).To (Equal (actual .ReadTimeout ))
1476+ Expect (tc .o .WriteTimeout ).To (Equal (actual .WriteTimeout ))
1477+ Expect (tc .o .PoolFIFO ).To (Equal (actual .PoolFIFO ))
1478+ Expect (tc .o .PoolSize ).To (Equal (actual .PoolSize ))
1479+ Expect (tc .o .MinIdleConns ).To (Equal (actual .MinIdleConns ))
1480+ Expect (tc .o .ConnMaxLifetime ).To (Equal (actual .ConnMaxLifetime ))
1481+ Expect (tc .o .ConnMaxIdleTime ).To (Equal (actual .ConnMaxIdleTime ))
1482+ Expect (tc .o .PoolTimeout ).To (Equal (actual .PoolTimeout ))
1483+ }
1484+ }
1485+ })
1486+ })
0 commit comments