From bcc1cdf22257441dd46c03f8bfcc6ea86d7b8d70 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 2 Sep 2026 18:03:45 +0800
Subject: [PATCH 1/3] Add a test for the `ChildUnitOfWork` event remove
 accessor

---
 .../Abp/Uow/UnitOfWork_Child_Events_Tests.cs  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/framework/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Child_Events_Tests.cs b/framework/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Child_Events_Tests.cs
index faa8d8ef61..0d141590ed 100644
--- a/framework/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Child_Events_Tests.cs
+++ b/framework/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Child_Events_Tests.cs
@@ -56,6 +56,32 @@ public class UnitOfWork_Child_Events_Tests : AbpIntegratedTest<AbpUnitOfWorkModu
         disposed.ShouldBeTrue();
     }
 
+    [Fact]
+    public void Should_Not_Trigger_Disposed_Event_Unsubscribed_Over_A_Child_UnitOfWork()
+    {
+        var disposed = false;
+
+        using (var parentUow = _unitOfWorkManager.Begin())
+        {
+            var handlerCount = GetEventHandlerCount(parentUow, nameof(IUnitOfWork.Disposed));
+
+            using (var childUow = _unitOfWorkManager.Begin())
+            {
+                childUow.Disposed += OnDisposed;
+                childUow.Disposed -= OnDisposed;
+            }
+
+            GetEventHandlerCount(parentUow, nameof(IUnitOfWork.Disposed)).ShouldBe(handlerCount);
+        }
+
+        disposed.ShouldBeFalse();
+
+        void OnDisposed(object? sender, UnitOfWorkEventArgs args)
+        {
+            disposed = true;
+        }
+    }
+
     private static int GetEventHandlerCount(IUnitOfWork unitOfWork, string eventName)
     {
         var field = unitOfWork.GetType().GetField(eventName, BindingFlags.Instance | BindingFlags.NonPublic);

From 438476d8455e03b92568fae9cfe0da6e573cdc8f Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 2 Sep 2026 18:03:45 +0800
Subject: [PATCH 2/3] Stop asserting the default provider in the enum adapter
 test

---
 .../AbpValidationAttributeAdapterProvider_Tests.cs          | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/DataAnnotations/AbpValidationAttributeAdapterProvider_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/DataAnnotations/AbpValidationAttributeAdapterProvider_Tests.cs
index d5bb122939..365ed6b3cc 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/DataAnnotations/AbpValidationAttributeAdapterProvider_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/DataAnnotations/AbpValidationAttributeAdapterProvider_Tests.cs
@@ -17,11 +17,7 @@ public class AbpValidationAttributeAdapterProvider_Tests
     [Fact]
     public void Should_Return_An_Adapter_For_The_EnumDataTypeAttribute()
     {
-        //ASP.NET Core does not provide an adapter for the EnumDataTypeAttribute.
-        new ValidationAttributeAdapterProvider()
-            .GetAttributeAdapter(new EnumDataTypeAttribute(typeof(MyEnum)), null)
-            .ShouldBeNull();
-
+        //The default ASP.NET Core provider returns null for it, that's why we supply our own adapter.
         _provider.GetAttributeAdapter(new EnumDataTypeAttribute(typeof(MyEnum)), null)
             .ShouldBeOfType<EnumDataTypeAttributeAdapter>();
     }

From b875866949dea90c6ad2029ad3cbfbfc0479be30 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 2 Sep 2026 10:17:43 +0000
Subject: [PATCH 3/3] Address review feedback on enum adapter comment and child
 UoW test

Co-authored-by: maliming <6908465+maliming@users.noreply.github.com>
---
 .../AbpValidationAttributeAdapterProvider_Tests.cs              | 2 +-
 .../Volo/Abp/Uow/UnitOfWork_Child_Events_Tests.cs               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/DataAnnotations/AbpValidationAttributeAdapterProvider_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/DataAnnotations/AbpValidationAttributeAdapterProvider_Tests.cs
index 365ed6b3cc..f2041f5919 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/DataAnnotations/AbpValidationAttributeAdapterProvider_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/DataAnnotations/AbpValidationAttributeAdapterProvider_Tests.cs
@@ -17,7 +17,7 @@ public class AbpValidationAttributeAdapterProvider_Tests
     [Fact]
     public void Should_Return_An_Adapter_For_The_EnumDataTypeAttribute()
     {
-        //The default ASP.NET Core provider returns null for it, that's why we supply our own adapter.
+        //ABP supplies its own adapter for the EnumDataTypeAttribute.
         _provider.GetAttributeAdapter(new EnumDataTypeAttribute(typeof(MyEnum)), null)
             .ShouldBeOfType<EnumDataTypeAttributeAdapter>();
     }
diff --git a/framework/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Child_Events_Tests.cs b/framework/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Child_Events_Tests.cs
index 0d141590ed..127494b020 100644
--- a/framework/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Child_Events_Tests.cs
+++ b/framework/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Child_Events_Tests.cs
@@ -67,6 +67,8 @@ public class UnitOfWork_Child_Events_Tests : AbpIntegratedTest<AbpUnitOfWorkModu
 
             using (var childUow = _unitOfWorkManager.Begin())
             {
+                childUow.Id.ShouldBe(parentUow.Id); //It's a child of the parent UOW.
+
                 childUow.Disposed += OnDisposed;
                 childUow.Disposed -= OnDisposed;
             }