From 20847b1fc101974f1f096884c1310cae5e365d6b Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 6 Jul 2026 10:07:28 +0800
Subject: [PATCH] Isolate Thread.CurrentPrincipal in CurrentPrincipalAccessor
 test

---
 .../Claims/CurrentPrincipalAccessor_Tests.cs  | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/framework/test/Volo.Abp.Security.Tests/Volo/Abp/Security/Claims/CurrentPrincipalAccessor_Tests.cs b/framework/test/Volo.Abp.Security.Tests/Volo/Abp/Security/Claims/CurrentPrincipalAccessor_Tests.cs
index ed4e6e49ee..6480af9c74 100644
--- a/framework/test/Volo.Abp.Security.Tests/Volo/Abp/Security/Claims/CurrentPrincipalAccessor_Tests.cs
+++ b/framework/test/Volo.Abp.Security.Tests/Volo/Abp/Security/Claims/CurrentPrincipalAccessor_Tests.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Security.Claims;
+using System.Threading;
 using Shouldly;
 using Volo.Abp.Testing;
 using Xunit;
@@ -30,27 +31,36 @@ public class CurrentPrincipalAccessor_Tests : AbpIntegratedTest<AbpSecurityTestM
                 new Claim(ClaimTypes.NameIdentifier,"654321")
             }));
 
-
-        var anonymousPrincipal = _currentPrincipalAccessor.Principal;
-        anonymousPrincipal.ShouldNotBeNull();
-        anonymousPrincipal.Identity.ShouldNotBeNull();
-        anonymousPrincipal.Identity.IsAuthenticated.ShouldBeFalse();
-
-        using (_currentPrincipalAccessor.Change(claimsPrincipal))
+        var previousPrincipal = Thread.CurrentPrincipal;
+        Thread.CurrentPrincipal = null;
+        try
         {
-            _currentPrincipalAccessor.Principal.ShouldBe(claimsPrincipal);
+            var anonymousPrincipal = _currentPrincipalAccessor.Principal;
+            anonymousPrincipal.ShouldNotBeNull();
+            anonymousPrincipal.Identity.ShouldNotBeNull();
+            anonymousPrincipal.Identity.IsAuthenticated.ShouldBeFalse();
 
-            using (_currentPrincipalAccessor.Change(claimsPrincipal2))
+            using (_currentPrincipalAccessor.Change(claimsPrincipal))
             {
-                _currentPrincipalAccessor.Principal.ShouldBe(claimsPrincipal2);
+                _currentPrincipalAccessor.Principal.ShouldBe(claimsPrincipal);
+
+                using (_currentPrincipalAccessor.Change(claimsPrincipal2))
+                {
+                    _currentPrincipalAccessor.Principal.ShouldBe(claimsPrincipal2);
+                }
+
+                _currentPrincipalAccessor.Principal.ShouldBe(claimsPrincipal);
             }
 
-            _currentPrincipalAccessor.Principal.ShouldBe(claimsPrincipal);
+            var currentPrincipal = _currentPrincipalAccessor.Principal;
+            currentPrincipal.ShouldNotBeNull();
+            currentPrincipal.Identity.ShouldNotBeNull();
+            currentPrincipal.Identity.IsAuthenticated.ShouldBeFalse();
+        }
+        finally
+        {
+            Thread.CurrentPrincipal = previousPrincipal;
         }
-        var currentPrincipal = _currentPrincipalAccessor.Principal;
-        currentPrincipal.ShouldNotBeNull();
-        currentPrincipal.Identity.ShouldNotBeNull();
-        currentPrincipal.Identity.IsAuthenticated.ShouldBeFalse();
     }
 
     [Fact]