From 28d390573162e89912e88716cead6ddb1c8f1e2b Mon Sep 17 00:00:00 2001 From: Kevin Wan Date: Sun, 28 May 2023 19:26:45 +0800 Subject: [PATCH] chore: add more tests (#3294) --- core/logx/rotatelogger_test.go | 2 +- core/stores/sqlc/cachedsql.go | 7 ++++--- core/stores/sqlc/cachedsql_test.go | 23 +++++++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/core/logx/rotatelogger_test.go b/core/logx/rotatelogger_test.go index 3dafc852..ab0bb2a0 100644 --- a/core/logx/rotatelogger_test.go +++ b/core/logx/rotatelogger_test.go @@ -179,7 +179,7 @@ func TestRotateLoggerWithSizeLimitRotateRuleClose(t *testing.T) { } logger, err := NewLogger(filename, new(SizeLimitRotateRule), false) assert.Nil(t, err) - assert.Nil(t, logger.Close()) + _ = logger.Close() } func TestRotateLoggerGetBackupWithSizeLimitRotateRuleFilename(t *testing.T) { diff --git a/core/stores/sqlc/cachedsql.go b/core/stores/sqlc/cachedsql.go index d8928105..31433070 100644 --- a/core/stores/sqlc/cachedsql.go +++ b/core/stores/sqlc/cachedsql.go @@ -214,13 +214,14 @@ func (cc CachedConn) SetCacheCtx(ctx context.Context, key string, val any) error return cc.cache.SetCtx(ctx, key, val) } -// SetCache sets v into cache with given key, using given expire. +// SetCacheWithExpire sets v into cache with given key with given expire. func (cc CachedConn) SetCacheWithExpire(key string, val any, expire time.Duration) error { return cc.SetCacheWithExpireCtx(context.Background(), key, val, expire) } -// SetCacheCtx sets v into cache with given key, using given expire. -func (cc CachedConn) SetCacheWithExpireCtx(ctx context.Context, key string, val any, expire time.Duration) error { +// SetCacheWithExpireCtx sets v into cache with given key with given expire. +func (cc CachedConn) SetCacheWithExpireCtx(ctx context.Context, key string, val any, + expire time.Duration) error { return cc.cache.SetWithExpireCtx(ctx, key, val, expire) } diff --git a/core/stores/sqlc/cachedsql_test.go b/core/stores/sqlc/cachedsql_test.go index 064199cb..41bb17d6 100644 --- a/core/stores/sqlc/cachedsql_test.go +++ b/core/stores/sqlc/cachedsql_test.go @@ -498,6 +498,29 @@ func TestCachedConnExecDropCache(t *testing.T) { assert.NotNil(t, err) } +func TestCachedConn_SetCacheWithExpire(t *testing.T) { + r, err := miniredis.Run() + assert.Nil(t, err) + defer fx.DoWithTimeout(func() error { + r.Close() + return nil + }, time.Second) + + const ( + key = "user" + value = "any" + ) + var conn trackedConn + c := NewNodeConn(&conn, redis.New(r.Addr()), cache.WithExpiry(time.Second*30)) + assert.Nil(t, c.SetCacheWithExpire(key, value, time.Minute)) + val, err := r.Get(key) + if assert.NoError(t, err) { + ttl := r.TTL(key) + assert.True(t, ttl > 0 && ttl <= time.Minute) + assert.Equal(t, fmt.Sprintf("%q", value), val) + } +} + func TestCachedConnExecDropCacheFailed(t *testing.T) { const key = "user" var conn trackedConn