Merge pull request #60 from monkey92t/new_cmd

feat: add LMPop,BLMPop command

Author: monkey92t

commands_test.go

@@ -943,6 +943,14 @@ var _ = Describe("Commands", func() {
 			})
 		})
 
+		It("BLMPop", func() {
+			operationKeyValuesCmd(clientMock, func() *ExpectedKeyValues {
+				return clientMock.ExpectBLMPop(1*time.Second, "left", 3, "key1", "key2")
+			}, func() *redis.KeyValuesCmd {
+				return client.BLMPop(ctx, 1*time.Second, "left", 3, "key1", "key2")
+			})
+		})
+
 		It("BRPop", func() {
 			operationStringSliceCmd(clientMock, func() *ExpectedStringSlice {
 				return clientMock.ExpectBRPop(1*time.Second, "key1", "key2")
@@ -1015,6 +1023,14 @@ var _ = Describe("Commands", func() {
 			})
 		})
 
+		It("LMPop", func() {
+			operationKeyValuesCmd(clientMock, func() *ExpectedKeyValues {
+				return clientMock.ExpectLMPop("left", 3, "key1", "key2")
+			}, func() *redis.KeyValuesCmd {
+				return client.LMPop(ctx, "left", 3, "key1", "key2")
+			})
+		})
+
 		It("LPos", func() {
 			operationIntCmd(clientMock, func() *ExpectedInt {
 				return clientMock.ExpectLPos("list", "b", redis.LPosArgs{Rank: 2})

expect.go

@@ -123,6 +123,7 @@ type baseMock interface {
 	ExpectHRandFieldWithValues(key string, count int) *ExpectedKeyValueSlice
 
 	ExpectBLPop(timeout time.Duration, keys ...string) *ExpectedStringSlice
+	ExpectBLMPop(timeout time.Duration, direction string, count int64, keys ...string) *ExpectedKeyValues
 	ExpectBRPop(timeout time.Duration, keys ...string) *ExpectedStringSlice
 	ExpectBRPopLPush(source, destination string, timeout time.Duration) *ExpectedString
 	ExpectLIndex(key string, index int64) *ExpectedString
@@ -132,6 +133,7 @@ type baseMock interface {
 	ExpectLLen(key string) *ExpectedInt
 	ExpectLPop(key string) *ExpectedString
 	ExpectLPopCount(key string, count int) *ExpectedStringSlice
+	ExpectLMPop(direction string, count int64, keys ...string) *ExpectedKeyValues
 	ExpectLPos(key string, value string, args redis.LPosArgs) *ExpectedInt
 	ExpectLPosCount(key string, value string, count int64, args redis.LPosArgs) *ExpectedIntSlice
 	ExpectLPush(key string, values ...interface{}) *ExpectedInt
@@ -1109,6 +1111,27 @@ func (cmd *ExpectedGeoSearchLocation) inflow(c redis.Cmder) {
 
 // ------------------------------------------------------------
 
+type ExpectedKeyValues struct {
+	expectedBase
+
+	key string
+	val []string
+}
+
+func (cmd *ExpectedKeyValues) SetVal(key string, val []string) {
+	cmd.setVal = true
+	cmd.key = key
+	cmd.val = make([]string, len(val))
+	copy(cmd.val, val)
+}
+
+func (cmd *ExpectedKeyValues) inflow(c redis.Cmder) {
+	inflow(c, "key", cmd.key)
+	inflow(c, "val", cmd.val)
+}
+
+// ------------------------------------------------------------
+
 type ExpectedSlowLog struct {
 	expectedBase
 

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.25.0
-	github.com/redis/go-redis/v9 v9.0.3-0.20230207104127-9d5e48507ef3
+	github.com/redis/go-redis/v9 v9.0.3-0.20230217130544-3b5361dc1067
 )
 
 require (

go.sum

@@ -1,3 +1,5 @@
+github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
+github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -38,16 +40,8 @@ github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/redis/go-redis/v9 v9.0.0-rc.4 h1:JUhsiZMTZknz3vn50zSVlkwcSeTGPd51lMO3IKUrWpY=
-github.com/redis/go-redis/v9 v9.0.0-rc.4/go.mod h1:Vo3EsyWnicKnSKCA7HhgnvnyA74wOA69Cd2Meli5mmA=
-github.com/redis/go-redis/v9 v9.0.0 h1:r2ctp2J2+TcXTVIyPU6++FniED/Nyo4SDMKvLtpszx0=
-github.com/redis/go-redis/v9 v9.0.0/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
-github.com/redis/go-redis/v9 v9.0.1 h1:L1B0L2Y7dQMnKxwfzSwemceGlQwVUsqJ1kjkdaoNhts=
-github.com/redis/go-redis/v9 v9.0.1/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
-github.com/redis/go-redis/v9 v9.0.2 h1:BA426Zqe/7r56kCcvxYLWe1mkaz71LKF77GwgFzSxfE=
-github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
-github.com/redis/go-redis/v9 v9.0.3-0.20230207104127-9d5e48507ef3 h1:kyVjUJXiL4ucwG4wEw/JcvSUOeG4foJO1c1J0GecWo0=
-github.com/redis/go-redis/v9 v9.0.3-0.20230207104127-9d5e48507ef3/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
+github.com/redis/go-redis/v9 v9.0.3-0.20230217130544-3b5361dc1067 h1:e+fsCwY18jOIumrC71yG6ZcLUB7AwyS/GX+bspxzaOs=
+github.com/redis/go-redis/v9 v9.0.3-0.20230217130544-3b5361dc1067/go.mod h1:6kjiKPy72LcR7xJX4bMLuf+2Rd/tpBFk4YKJTZ1jTNA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=

mock.go

@@ -1089,6 +1089,13 @@ func (m *mock) ExpectBLPop(timeout time.Duration, keys ...string) *ExpectedStrin
 	return e
 }
 
+func (m *mock) ExpectBLMPop(timeout time.Duration, direction string, count int64, keys ...string) *ExpectedKeyValues {
+	e := &ExpectedKeyValues{}
+	e.cmd = m.factory.BLMPop(m.ctx, timeout, direction, count, keys...)
+	m.pushExpect(e)
+	return e
+}
+
 func (m *mock) ExpectBRPop(timeout time.Duration, keys ...string) *ExpectedStringSlice {
 	e := &ExpectedStringSlice{}
 	e.cmd = m.factory.BRPop(m.ctx, timeout, keys...)
@@ -1152,6 +1159,13 @@ func (m *mock) ExpectLPopCount(key string, count int) *ExpectedStringSlice {
 	return e
 }
 
+func (m *mock) ExpectLMPop(direction string, count int64, keys ...string) *ExpectedKeyValues {
+	e := &ExpectedKeyValues{}
+	e.cmd = m.factory.LMPop(m.ctx, direction, count, keys...)
+	m.pushExpect(e)
+	return e
+}
+
 func (m *mock) ExpectLPos(key string, value string, args redis.LPosArgs) *ExpectedInt {
 	e := &ExpectedInt{}
 	e.cmd = m.factory.LPos(m.ctx, key, value, args)

mock_test.go

@@ -1336,3 +1336,33 @@ func operationSlowLogCmd(base baseMock, expected func() *ExpectedSlowLog, actual
 		},
 	}))
 }
+
+func operationKeyValuesCmd(base baseMock, expected func() *ExpectedKeyValues, actual func() *redis.KeyValuesCmd) {
+	var (
+		setErr = errors.New("key values cmd error")
+		key    string
+		val    []string
+		err    error
+	)
+
+	base.ClearExpect()
+	expected().SetErr(setErr)
+	key, val, err = actual().Result()
+	Expect(err).To(Equal(setErr))
+	Expect(key).To(Equal(""))
+	Expect(val).To(Equal([]string(nil)))
+
+	base.ClearExpect()
+	expected()
+	key, val, err = actual().Result()
+	Expect(err).To(HaveOccurred())
+	Expect(key).To(Equal(""))
+	Expect(val).To(Equal([]string(nil)))
+
+	base.ClearExpect()
+	expected().SetVal("key1", []string{"v1", "v2"})
+	key, val, err = actual().Result()
+	Expect(err).NotTo(HaveOccurred())
+	Expect(key).To(Equal("key1"))
+	Expect(val).To(Equal([]string{"v1", "v2"}))
+}