合并代码

src/Hotline.Application.Tests/Infrastructure/TestSettingConstants.cs

@@ -8,6 +8,8 @@ namespace Hotline.Application.Tests.Infrastructure;
 public static class TestSettingConstants
 {
     public const string PaiDanYuanAccountName = "UnitTestPDY";
+    public const string FirstOrgAccountName = "cs";
+    public const string SecondOrgAccountName = "cs21";
 }
 
 public static class TestSessionConstants

src/Hotline.Application.Tests/TestBase.cs

@@ -36,9 +36,9 @@ public class TestBase
         _userRepository = userRepository;
     }
 
-    public async Task SetPaiDanYuan()
+    public void SetPaiDanYuan()
     {
-        await SetOperator("派单员", "市民热线服务中心", "单元测试派单员", "001", "13408389849", EUserType.Normal, TestSettingConstants.PaiDanYuanAccountName);
+        SetOperator("派单员", "市民热线服务中心", "单元测试派单员", "001", "13408389849", EUserType.Normal, TestSettingConstants.PaiDanYuanAccountName);
     }
 
     public void Set一级部门()
@@ -52,23 +52,23 @@ public class TestBase
     }
 
 
-    public async Task SetZuoXi()
+    public void SetZuoXi()
     {
-        await SetOperator("坐席", "市民热线服务中心", "单元测试派单员", "001", "13408389849", EUserType.Seat, TestSettingConstants.PaiDanYuanAccountName);
+        SetOperator("坐席", "市民热线服务中心", "单元测试派单员", "001", "13408389849", EUserType.Seat, TestSettingConstants.PaiDanYuanAccountName);
     }
 
-    private async Task SetOperator(string displayName, string fullOrgName, string name, string orgId, string phoneNo, EUserType userType, string userName)
+    private void SetOperator(string displayName, string fullOrgName, string name, string orgId, string phoneNo, EUserType userType, string userName)
     {
-        var account = await _accountRepository.GetExtAsync(
+        var account = _accountRepository.GetExtAsync(
             d => d.UserName == userName,
-            d => d.Includes(x => x.Roles));
+            d => d.Includes(x => x.Roles)).GetAwaiter().GetResult();
 
         if (account == null)
         {
-            var roleId = await _roleRepository.Queryable()
+            var roleId = _roleRepository.Queryable()
                 .Where(m => m.DisplayName == displayName)
                 .Select(m => m.Id)
-                .FirstAsync();
+                .First();
             var newUser = new AddUserDto
             {
                 FullOrgName = fullOrgName,
@@ -80,13 +80,13 @@ public class TestBase
                 UserType = userType,
                 UserName = userName 
             };
-            var accountId = await _userController.Add(newUser);
+            var accountId = _userController.Add(newUser).GetAwaiter().GetResult();
             TestSessionConstants.UserId = accountId;
-            account = await _accountRepository.GetExtAsync(
+            account = _accountRepository.GetExtAsync(
                 d => d.UserName == userName,
-                d => d.Includes(x => x.Roles));
+                d => d.Includes(x => x.Roles)).GetAwaiter().GetResult();
         }
-        var user = await _userRepository.GetAsync(account.Id);
+        var user = _userRepository.GetAsync(account.Id).GetAwaiter().GetResult();
         TestSessionConstants.UserId = account.Id;
         TestSessionConstants.Roles = account.Roles.Select(m => m.Id).ToArray();
         TestSessionConstants.UserName = account.UserName;