From dbcd7dbcb9386a4771d9430181b2d9accf5b0605 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 29 Jan 2026 19:37:04 +0800
Subject: [PATCH] Add ProductCacheItem2 and update entity cache tests

---
 .../Volo/Abp/TestApp/TestAppModule.cs         |  1 +
 .../Abp/TestApp/Testing/EntityCache_Tests.cs  | 35 +++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs
index 1be226febb..438bf4b3b9 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs
@@ -38,6 +38,7 @@ public class TestAppModule : AbpModule
         {
             AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(9)
         });
+        context.Services.AddEntityCache<Product, ProductCacheItem2, Guid>();
     }
 
     public override void OnApplicationInitialization(ApplicationInitializationContext context)
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityCache_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityCache_Tests.cs
index 347d244567..6ef8da9b7c 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityCache_Tests.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityCache_Tests.cs
@@ -2,8 +2,6 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Distributed;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 using Shouldly;
 using Volo.Abp.Caching;
 using Volo.Abp.Domain.Entities;
@@ -122,30 +120,28 @@ public abstract class EntityCache_Tests<TStartupModule> : TestAppTestBase<TStart
     }
 
     [Fact]
-    public void EntityCache_DefaultOptions_Should_Be_Applied()
+    public void EntityCache_Default_Options_Should_Be_2_Minutes()
     {
-        var productCache = GetRequiredService<IDistributedCache<EntityCacheItemWrapper<Product>, Guid>>();
-        var productCacheItemCache = GetRequiredService<IDistributedCache<EntityCacheItemWrapper<ProductCacheItem>, Guid>>();
+        var productCache = GetRequiredService<IDistributedCache<EntityCacheItemWrapper<ProductCacheItem2>, Guid>>();
 
         var productOptions = GetDefaultCachingOptions(productCache);
-        productOptions.AbsoluteExpirationRelativeToNow.ShouldBe(TimeSpan.FromMinutes(7));
+        productOptions.AbsoluteExpirationRelativeToNow.ShouldBe(TimeSpan.FromMinutes(2));
         productOptions.SlidingExpiration.ShouldBeNull();
-
-        var productCacheItemOptions = GetDefaultCachingOptions(productCacheItemCache);
-        productCacheItemOptions.AbsoluteExpirationRelativeToNow.ShouldBe(TimeSpan.FromMinutes(9));
-        productCacheItemOptions.SlidingExpiration.ShouldBeNull();
     }
 
     [Fact]
     public void EntityCache_Configured_Options_Should_Be_Applied()
     {
-        // This test verifies that the cache options configured during AddEntityCache are properly applied
-        // The options are configured in TestAppModule.ConfigureServices
         var productCache = GetRequiredService<IDistributedCache<EntityCacheItemWrapper<Product>, Guid>>();
         var productCacheItemCache = GetRequiredService<IDistributedCache<EntityCacheItemWrapper<ProductCacheItem>, Guid>>();
 
-        GetDefaultCachingOptions(productCache).AbsoluteExpirationRelativeToNow.ShouldBe(TimeSpan.FromMinutes(7));
-        GetDefaultCachingOptions(productCacheItemCache).AbsoluteExpirationRelativeToNow.ShouldBe(TimeSpan.FromMinutes(9));
+        var productOptions = GetDefaultCachingOptions(productCache);
+        productOptions.AbsoluteExpirationRelativeToNow.ShouldBe(TimeSpan.FromMinutes(7));
+        productOptions.SlidingExpiration.ShouldBeNull();
+
+        var productCacheItemOptions = GetDefaultCachingOptions(productCacheItemCache);
+        productCacheItemOptions.AbsoluteExpirationRelativeToNow.ShouldBe(TimeSpan.FromMinutes(9));
+        productCacheItemOptions.SlidingExpiration.ShouldBeNull();
     }
 
     private static DistributedCacheEntryOptions GetDefaultCachingOptions(object instance)
@@ -197,3 +193,14 @@ public class ProductCacheItem
 
     public decimal Price { get; set; }
 }
+
+[Serializable]
+[CacheName("ProductCacheItem2")]
+public class ProductCacheItem2
+{
+    public Guid Id { get; set; }
+
+    public string Name { get; set; }
+
+    public decimal Price { get; set; }
+}