Merge pull request #59 from monkey92t/new_cmd

feat: add Expiretime and PExpireTime cmd

Author: monkey92t

commands_test.go

@@ -163,6 +163,14 @@ var _ = Describe("Commands", func() {
 			})
 		})
 
+		It("ExpireTime", func() {
+			operationDurationCmd(clientMock, func() *ExpectedDuration {
+				return clientMock.ExpectExpireTime("key")
+			}, func() *redis.DurationCmd {
+				return client.ExpireTime(ctx, "key")
+			})
+		})
+
 		It("ExpireNX", func() {
 			operationBoolCmd(clientMock, func() *ExpectedBool {
 				return clientMock.ExpectExpireNX("key", 2*time.Second)
@@ -268,6 +276,14 @@ var _ = Describe("Commands", func() {
 			})
 		})
 
+		It("PExpireTime", func() {
+			operationDurationCmd(clientMock, func() *ExpectedDuration {
+				return clientMock.ExpectPExpireTime("key")
+			}, func() *redis.DurationCmd {
+				return client.PExpireTime(ctx, "key")
+			})
+		})
+
 		It("PTTL", func() {
 			operationDurationCmd(clientMock, func() *ExpectedDuration {
 				return clientMock.ExpectPTTL("key")

expect.go

@@ -39,6 +39,7 @@ type baseMock interface {
 	ExpectExists(keys ...string) *ExpectedInt
 	ExpectExpire(key string, expiration time.Duration) *ExpectedBool
 	ExpectExpireAt(key string, tm time.Time) *ExpectedBool
+	ExpectExpireTime(key string) *ExpectedDuration
 	ExpectExpireNX(key string, expiration time.Duration) *ExpectedBool
 	ExpectExpireXX(key string, expiration time.Duration) *ExpectedBool
 	ExpectExpireGT(key string, expiration time.Duration) *ExpectedBool
@@ -52,6 +53,7 @@ type baseMock interface {
 	ExpectPersist(key string) *ExpectedBool
 	ExpectPExpire(key string, expiration time.Duration) *ExpectedBool
 	ExpectPExpireAt(key string, tm time.Time) *ExpectedBool
+	ExpectPExpireTime(key string) *ExpectedDuration
 	ExpectPTTL(key string) *ExpectedDuration
 	ExpectRandomKey() *ExpectedString
 	ExpectRename(key, newkey string) *ExpectedStatus

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.2
+	github.com/redis/go-redis/v9 v9.0.3-0.20230207104127-9d5e48507ef3
 )
 
 require (

go.sum

@@ -46,6 +46,8 @@ github.com/redis/go-redis/v9 v9.0.1 h1:L1B0L2Y7dQMnKxwfzSwemceGlQwVUsqJ1kjkdaoNh
 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/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

@@ -529,6 +529,13 @@ func (m *mock) ExpectExpireAt(key string, tm time.Time) *ExpectedBool {
 	return e
 }
 
+func (m *mock) ExpectExpireTime(key string) *ExpectedDuration {
+	e := &ExpectedDuration{}
+	e.cmd = m.factory.ExpireTime(m.ctx, key)
+	m.pushExpect(e)
+	return e
+}
+
 func (m *mock) ExpectExpireNX(key string, expiration time.Duration) *ExpectedBool {
 	e := &ExpectedBool{}
 	e.cmd = m.factory.ExpireNX(m.ctx, key, expiration)
@@ -620,6 +627,13 @@ func (m *mock) ExpectPExpireAt(key string, tm time.Time) *ExpectedBool {
 	return e
 }
 
+func (m *mock) ExpectPExpireTime(key string) *ExpectedDuration {
+	e := &ExpectedDuration{}
+	e.cmd = m.factory.PExpireTime(m.ctx, key)
+	m.pushExpect(e)
+	return e
+}
+
 func (m *mock) ExpectPTTL(key string) *ExpectedDuration {
 	e := &ExpectedDuration{}
 	e.cmd = m.factory.PTTL(m.ctx, key)