Fie: test case

sj-distributor · May 7, 2022 · a8dad5a · a8dad5a
1 parent 1c870ae
commit a8dad5a
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 32 deletions.
diff --git a/EasyCache.InMemory/Drivers/MultiBucketsMemoryCache.cs b/EasyCache.InMemory/Drivers/MultiBucketsMemoryCache.cs
@@ -72,7 +72,7 @@ public Task Delete(string key)
             {
                 if (key.First() == '*')
                 {
-                    key = key.Substring(1, key.Length);
+                    key = key.Substring(1, key.Length - 1);
                 }
                 else if (key.Last() == '*')
                 {
@@ -106,7 +106,7 @@ private ConcurrentDictionary<string, CacheItem> GetBucket(uint bucketId)
             {
                 return bucket;
             }
-
+            
             throw new Exception($"Not Found Bucket: {bucketId}");
         }
 

diff --git a/EasyCache.Redis/Driver/RedisCache.cs b/EasyCache.Redis/Driver/RedisCache.cs
@@ -52,7 +52,7 @@ public Task Delete(string key)
             {
                 if (key.First() == '*')
                 {
-                    key = key.Substring(1, key.Length);
+                    key = key.Substring(1, key.Length - 1);
                 }
                 else if (key.Last() == '*')
                 {

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # NetCoreCache.Extensions.Redis
 
-[![Build Status](https://github.com/sj-distributor/EasyCache/actions/workflows/dotnet.yml/badge.svg?branch=main)](https://github.com/sj-distributor/EasyCache/actions?query=branch%3Amain)
-[![codecov](https://codecov.io/gh/sj-distributor/EasyCache/branch/master/graph/badge.svg?token=XV3W873RGV)](https://codecov.io/gh/sj-distributor/core-cache.Extensions.Redis)
+[![Build Status](https://github.com/sj-distributor/EasyCache/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/sj-distributor/EasyCache/actions?query=branch%3Amaster)
+[![codecov](https://codecov.io/gh/sj-distributor/EasyCache/branch/master/graph/badge.svg?token=XV3W873RGV)](https://codecov.io/gh/sj-distributor/EasyCache)
 [![NuGet version (NetCoreCache)](https://img.shields.io/nuget/v/NetCoreCacheRedis.svg?style=flat-square)](https://www.nuget.org/packages/NetCoreCacheRedis/)
 ![](https://img.shields.io/badge/license-MIT-green)
 

diff --git a/TestApi/Program.cs b/TestApi/Program.cs
@@ -6,6 +6,7 @@
 var builder = WebApplication.CreateBuilder(args);
 builder.Host.UseServiceProviderFactory(new DynamicProxyServiceProviderFactory());
 builder.Services.AddMultiBucketsInMemoryCache();
+// builder.Services.AddInMemoryCache();
 
 builder.Services.RegisterServices();
 

diff --git a/TestApi/Service/UserService.cs b/TestApi/Service/UserService.cs
@@ -1,7 +1,6 @@
 using EasyCache.Core.Attributes;
 using TestApi.DB;
 using TestApi.Entity;
-using TestApi.Utils;
 
 namespace TestApi.Service;
 
@@ -55,10 +54,4 @@ public virtual IEnumerable<User> List(string page)
         Thread.Sleep(TimeSpan.FromSeconds(1));
         return _dbContext.Set<User>().ToList();
     }
-
-    [Cacheable("users", "{number}")]
-    public virtual IEnumerable<User> Performance(string number)
-    {
-        return DataUtils.GetData();
-    }
 }
diff --git a/TestApi/Utils/DataUtils.cs b/TestApi/Utils/DataUtils.cs
diff --git a/UnitTests/MulitBucketsMemoryCacheTests.cs b/UnitTests/MulitBucketsMemoryCacheTests.cs
@@ -82,7 +82,7 @@ public async void TestMemoryCacheCanDelete(string key, string value, string resu
     [Theory]
     [InlineData("anson555", "18", null)]
     [InlineData("anson555555", "19", null)]
-    public async void TestMemoryCacheCanDeleteByPattern(string key, string value, string result)
+    public async void TestMemoryCacheCanDeleteByFirstPattern(string key, string value, string result)
     {
         await _memoryCache.Set(key, new CacheItem()
         {
@@ -94,6 +94,22 @@ public async void TestMemoryCacheCanDeleteByPattern(string key, string value, st
         Assert.Equal(s.Value, result);
     }
 
+
+    [Theory]
+    [InlineData("555Joe", "18", null)]
+    [InlineData("555555Joe", "19", null)]
+    public async void TestMemoryCacheCanDeleteByLastPattern(string key, string value, string result)
+    {
+        await _memoryCache.Set(key, new CacheItem()
+        {
+            Value = value,
+            Expire = DateTime.Now.AddSeconds(20).Ticks
+        });
+        await _memoryCache.Delete("*Joe");
+        var s = await _memoryCache.Get(key);
+        Assert.Equal(s.Value, result);
+    }
+
     [Theory]
     [InlineData("ansonExpire11", "18", null)]
     [InlineData("ansonExpire22", "19", null)]

diff --git a/UnitTests/RedisCacheTests.cs b/UnitTests/RedisCacheTests.cs
@@ -61,7 +61,7 @@ public async void TestRedisCacheCanDelete(string key, string value, string resul
     [Theory]
     [InlineData("anson1111", "18", null)]
     [InlineData("anson2222", "19", null)]
-    public async void TestRedisCacheCanDeleteByPattern(string key, string value, string result)
+    public async void TestRedisCacheCanDeleteByLastPattern(string key, string value, string result)
     {
         await _redisClient.Set(key, new CacheItem()
         {
@@ -71,4 +71,18 @@ public async void TestRedisCacheCanDeleteByPattern(string key, string value, str
         var s = await _redisClient.Get(key);
         Assert.Equal(s.Value, result);
     }
+
+    [Theory]
+    [InlineData("1111Joe", "18", null)]
+    [InlineData("2222Joe", "19", null)]
+    public async void TestRedisCacheCanDeleteByFirstPattern(string key, string value, string result)
+    {
+        await _redisClient.Set(key, new CacheItem()
+        {
+            Value = value,
+        });
+        await _redisClient.Delete("*Joe");
+        var s = await _redisClient.Get(key);
+        Assert.Equal(s.Value, result);
+    }
 }