pull/5300 Refactor & Unit tests

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpRemoteCallException.cs

@@ -29,7 +29,7 @@ namespace Volo.Abp.Http.Client
         {
             Error = error;
 
-            if (error?.Data != null)
+            if (error.Data != null)
             {
                 foreach (var dataKey in error.Data.Keys)
                 {

framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.csproj

@@ -14,4 +14,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="Volo\Abp\Http\Localization\en.json" />
+  </ItemGroup>
+
 </Project>

framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/AbpHttpClientTestModule.cs

@@ -2,8 +2,12 @@
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.Http.Client;
 using Volo.Abp.Http.DynamicProxying;
+using Volo.Abp.Http.Localization;
+using Volo.Abp.Localization;
+using Volo.Abp.Localization.ExceptionHandling;
 using Volo.Abp.Modularity;
 using Volo.Abp.TestApp;
+using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.Http
 {
@@ -22,6 +26,24 @@ namespace Volo.Abp.Http
             {
                 options.RemoteServices.Default = new RemoteServiceConfiguration("/");
             });
+
+
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<AbpHttpClientTestModule>();
+            });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Add<HttpClientTestResource>("en")
+                    .AddVirtualJson("/Volo/Abp/Http/Localization");
+            });
+
+            Configure<AbpExceptionLocalizationOptions>(options =>
+            {
+                options.MapCodeNamespace("Volo.Abp.Http.DynamicProxying", typeof(HttpClientTestResource));
+            });
         }
     }
 }

framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/IRegularTestController.cs

@@ -9,6 +9,8 @@ namespace Volo.Abp.Http.DynamicProxying
 
         Task GetException1Async();
 
+        Task GetException2Async();
+
         Task<DateTime> GetWithDateTimeParameterAsync(DateTime dateTime1);
 
         Task<string> PostValueWithHeaderAndQueryStringAsync(string headerValue, string qsValue);

framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestController.cs

@@ -27,6 +27,14 @@ namespace Volo.Abp.Http.DynamicProxying
             throw new UserFriendlyException("This is an error message!");
         }
 
+        [HttpGet]
+        [Route("get-exception2")]
+        public Task GetException2Async()
+        {
+            throw new BusinessException("Volo.Abp.Http.DynamicProxying:10001")
+                .WithData("0","TEST");
+        }
+
         [HttpGet]
         [Route("get-with-datetime-parameter")]
         public Task<DateTime> GetWithDateTimeParameterAsync(DateTime dateTime1)
@@ -133,4 +141,4 @@ namespace Volo.Abp.Http.DynamicProxying
         [FromQuery]
         public DateTime FirstReleaseDate { get; set; }
     }
-}
+}

framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestControllerClientProxy_Tests.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
 using Shouldly;
 using Volo.Abp.Http.Client;
+using Volo.Abp.Http.Localization;
 using Volo.Abp.Localization;
 using Xunit;
 
@@ -32,6 +34,13 @@ namespace Volo.Abp.Http.DynamicProxying
             exception.Error.Message.ShouldBe("This is an error message!");
         }
 
+        [Fact]
+        public async Task GetException2Async()
+        {
+            var exception = await Assert.ThrowsAsync<AbpRemoteCallException>(async () => await _controller.GetException2Async());
+            exception.Error.Message.ShouldBe("Business exception with data: TEST");
+        }
+
         [Fact]
         public async Task GetWithDateTimeParameterAsync()
         {
@@ -151,4 +160,4 @@ namespace Volo.Abp.Http.DynamicProxying
         }
 
     }
-}
+}

framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Localization/HttpClientTestResource.cs

@@ -0,0 +1,10 @@
+using Volo.Abp.Localization;
+
+namespace Volo.Abp.Http.Localization
+{
+    [LocalizationResourceName("HttpClientTest")]
+    public class HttpClientTestResource
+    {
+
+    }
+}

framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Localization/en.json

@@ -0,0 +1,6 @@
+{
+  "culture": "en",
+  "texts": {
+    "Volo.Abp.Http.DynamicProxying:10001": "Business exception with data: {0}"
+  }
+}

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityResultException.cs

@@ -32,14 +32,21 @@ namespace Volo.Abp.Identity
 
         public virtual string LocalizeMessage(LocalizationContext context)
         {
-            var values = IdentityResult.GetValuesFromErrorMessage(context.LocalizerFactory.Create<IdentityResource>());
+            var localizer = context.LocalizerFactory.Create<IdentityResource>();
+
+            SetData(localizer);
+
+            return IdentityResult.LocalizeErrors(localizer);
+        }
+
+        protected virtual void SetData(IStringLocalizer localizer)
+        {
+            var values = IdentityResult.GetValuesFromErrorMessage(localizer);
 
             for (var index = 0; index < values.Length; index++)
             {
                 Data[index.ToString()] = values[index];
             }
-
-            return IdentityResult.LocalizeErrors(context.LocalizerFactory.Create<IdentityResource>());
         }
     }
 }