完善redis中test代码。

TestsLing · Nov 17, 2022 · d67f309 · d67f309
1 parent c3cf2ef
commit d67f309
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 51 deletions.
diff --git a/config/config.go b/config/config.go
@@ -33,7 +33,9 @@ type RedisConfig struct {
 	//最大连接数
 	DBMaxActive int `yaml:"dbMaxActive"`
 	//redis表示空闲连接保活时间
-	DBIdleTimeout int `yaml:"DBIdleTimeout"`
+	DBIdleTimeout int `yaml:"dbIdleTimeout"`
+	//redis用户
+	DBUserName string `yaml:"dbUserName"`
 	//redis密码
 	DBPassWord string `yaml:"dbPassWord"`
 	//是否使用redis集群

diff --git a/service/redis_cache_service.go b/service/redis_cache_service.go
@@ -11,7 +11,7 @@ type RedisCacheService struct {
 
 // NewConfigRedisCacheService 初始化自定义redis配置
 func NewConfigRedisCacheService(rdsAddr []string, dbUserName, dbPassword string, enableCluster bool, db int) CaptchaCacheInterface {
-	redisUtils := util.NewConfigRedisUtil(rdsAddr, dbPassword, enableCluster, db)
+	redisUtils := util.NewConfigRedisUtil(rdsAddr, dbUserName, dbPassword, enableCluster, db)
 	return &RedisCacheService{Cache: redisUtils}
 }
 

diff --git a/test/redis_util_test.go b/test/redis_util_test.go
@@ -6,20 +6,8 @@ import (
 	"time"
 )
 
-func TestDftRedisUtil_Delete(t *testing.T) {
-	cache := util.NewDftRedisUtil()
-	val := "testval"
-	key := "testdft"
-	cache.Set(key, val, 10)
-	cache.Delete(key)
-
-	if cache.Get(key) != "" {
-		t.Fatal("default 缓存删除值失败")
-	}
-}
-
 func TestConfigRedisUtil_Delete(t *testing.T) {
-	cache := util.NewConfigRedisUtil([]string{"192.168.1.111:6379"}, "", false, 0)
+	cache := util.NewConfigRedisUtil([]string{"192.168.1.111:6379"}, "", "", false, 0)
 	val := "testvalconfig"
 	key := "testconfig"
 	cache.Set(key, val, 10)
@@ -30,25 +18,8 @@ func TestConfigRedisUtil_Delete(t *testing.T) {
 	}
 }
 
-func TestDftRedisUtil_Exists(t *testing.T) {
-	cache := util.NewDftRedisUtil()
-	val := "testvaldft"
-	key := "testdft"
-	key1 := "test1dft"
-	cache.Set(key, val, 10)
-	cache.Set(key1, val, 0)
-
-	if cache.Exists(key) != true {
-		t.Fatal("default Exists 获取的值不符合要求")
-	}
-
-	if cache.Exists(key1) != true {
-		t.Fatal("default Exists 获取的值不符合要求")
-	}
-}
-
 func TestConfigRedisUtil_Exists(t *testing.T) {
-	cache := util.NewConfigRedisUtil([]string{"192.168.1.111:6379"}, "", false, 0)
+	cache := util.NewConfigRedisUtil([]string{"192.168.1.111:6379"}, "", "", false, 0)
 	val := "testvalconfig"
 	key := "testconfig"
 	key1 := "test1config"
@@ -64,25 +35,8 @@ func TestConfigRedisUtil_Exists(t *testing.T) {
 	}
 }
 
-func TestDftRedisUtil_Get(t *testing.T) {
-	cache := util.NewDftRedisUtil()
-	val := "testvaldft"
-	key := "testdft"
-	cache.Set(key, val, 10)
-
-	if cache.Get(key) != val {
-		t.Fatal("default 获取的值不符合要求")
-	}
-
-	time.Sleep(time.Duration(11) * time.Second)
-
-	if cache.Get(key) != "" {
-		t.Fatal("default 时间失效失败")
-	}
-}
-
 func TestConfigRedisUtil_Get(t *testing.T) {
-	cache := util.NewConfigRedisUtil([]string{"192.168.1.111:6379"}, "", false, 0)
+	cache := util.NewConfigRedisUtil([]string{"192.168.1.111:6379"}, "", "", false, 0)
 	val := "testvalconfig"
 	key := "testconfig"
 	cache.Set(key, val, 10)