From c19802eb55a52bb3dc42cf56836c764e75bb4391 Mon Sep 17 00:00:00 2001 From: yubaolee Date: Thu, 31 Mar 2022 23:50:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81Autofac?= =?UTF-8?q?=E7=9A=84http=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=20fix=20issue?= =?UTF-8?q?=20#I50DRR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/SSO/PassportLoginRequest.cs | 2 + OpenAuth.App/Test/TestBase.cs | 8 +- OpenAuth.WebApi/OpenAuth.WebApi.csproj | 1 + .../Test/AutofacWebApplicationFactory.cs | 18 +++++ .../Test/CustomServiceProviderFactory.cs | 46 +++++++++++ OpenAuth.WebApi/Test/TestHttpRequest.cs | 80 +++++++++++++++++++ 6 files changed, 153 insertions(+), 2 deletions(-) create mode 100644 OpenAuth.WebApi/Test/AutofacWebApplicationFactory.cs create mode 100644 OpenAuth.WebApi/Test/CustomServiceProviderFactory.cs create mode 100644 OpenAuth.WebApi/Test/TestHttpRequest.cs diff --git a/OpenAuth.App/SSO/PassportLoginRequest.cs b/OpenAuth.App/SSO/PassportLoginRequest.cs index 3e779070..b982fe47 100644 --- a/OpenAuth.App/SSO/PassportLoginRequest.cs +++ b/OpenAuth.App/SSO/PassportLoginRequest.cs @@ -5,8 +5,10 @@ namespace OpenAuth.App.SSO public class PassportLoginRequest { + /// System public string Account { get; set; } + /// 123456 public string Password { get; set; } /// diff --git a/OpenAuth.App/Test/TestBase.cs b/OpenAuth.App/Test/TestBase.cs index c03c3080..13c9f81e 100644 --- a/OpenAuth.App/Test/TestBase.cs +++ b/OpenAuth.App/Test/TestBase.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Linq; using Autofac.Extensions.DependencyInjection; @@ -27,7 +27,11 @@ namespace OpenAuth.App.Test serviceCollection.AddOptions(); //读取OpenAuth.WebApi的配置文件用于单元测试 var path = AppContext.BaseDirectory; - int pos = path.LastIndexOf("OpenAuth."); + int pos = path.IndexOf("OpenAuth.App"); + if (pos == -1) //如果测试入口是OpenAuth.WebApi + { + pos = path.IndexOf("OpenAuth.WebApi"); + } var basepath = Path.Combine(path.Substring(0,pos) ,"OpenAuth.WebApi"); IConfiguration config = new ConfigurationBuilder() .SetBasePath(basepath) diff --git a/OpenAuth.WebApi/OpenAuth.WebApi.csproj b/OpenAuth.WebApi/OpenAuth.WebApi.csproj index 321fc268..e26a98f5 100644 --- a/OpenAuth.WebApi/OpenAuth.WebApi.csproj +++ b/OpenAuth.WebApi/OpenAuth.WebApi.csproj @@ -29,6 +29,7 @@ + diff --git a/OpenAuth.WebApi/Test/AutofacWebApplicationFactory.cs b/OpenAuth.WebApi/Test/AutofacWebApplicationFactory.cs new file mode 100644 index 00000000..00671cf0 --- /dev/null +++ b/OpenAuth.WebApi/Test/AutofacWebApplicationFactory.cs @@ -0,0 +1,18 @@ +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Extensions.Hosting; + +namespace OpenAuth.WebApi.Test +{ + /// + /// Based upon https://github.com/dotnet/AspNetCore.Docs/tree/master/aspnetcore/test/integration-tests/samples/3.x/IntegrationTestsSample + /// + /// + public class AutofacWebApplicationFactory : WebApplicationFactory where TStartup : class + { + protected override IHost CreateHost(IHostBuilder builder) + { + builder.UseServiceProviderFactory(new CustomServiceProviderFactory()); + return base.CreateHost(builder); + } + } +} \ No newline at end of file diff --git a/OpenAuth.WebApi/Test/CustomServiceProviderFactory.cs b/OpenAuth.WebApi/Test/CustomServiceProviderFactory.cs new file mode 100644 index 00000000..e472f531 --- /dev/null +++ b/OpenAuth.WebApi/Test/CustomServiceProviderFactory.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using Autofac; +using Autofac.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; + +namespace OpenAuth.WebApi.Test +{ + /// + /// Based upon https://github.com/dotnet/aspnetcore/issues/14907#issuecomment-620750841 - only necessary because of an issue in ASP.NET Core + /// + public class CustomServiceProviderFactory : IServiceProviderFactory + { + private AutofacServiceProviderFactory _wrapped; + private IServiceCollection _services; + + public CustomServiceProviderFactory() + { + _wrapped = new AutofacServiceProviderFactory(); + } + + public ContainerBuilder CreateBuilder(IServiceCollection services) + { + // Store the services for later. + _services = services; + + return _wrapped.CreateBuilder(services); + } + + public IServiceProvider CreateServiceProvider(ContainerBuilder containerBuilder) + { + var sp = _services.BuildServiceProvider(); +#pragma warning disable CS0612 // Type or member is obsolete + var filters = sp.GetRequiredService>>(); +#pragma warning restore CS0612 // Type or member is obsolete + + foreach (var filter in filters) + { + filter.ConfigureContainer(b => { })(containerBuilder); + } + + return _wrapped.CreateServiceProvider(containerBuilder); + } + } +} \ No newline at end of file diff --git a/OpenAuth.WebApi/Test/TestHttpRequest.cs b/OpenAuth.WebApi/Test/TestHttpRequest.cs new file mode 100644 index 00000000..d307048a --- /dev/null +++ b/OpenAuth.WebApi/Test/TestHttpRequest.cs @@ -0,0 +1,80 @@ +using System; +using System.Net.Http; +using System.Net.Http.Headers; +using Autofac; +using Infrastructure; +using Microsoft.AspNetCore.TestHost; +using Microsoft.Extensions.DependencyInjection; +using NUnit.Framework; +using OpenAuth.App; +using OpenAuth.App.SSO; + +namespace OpenAuth.WebApi.Test +{ + /// + /// 模拟HTTP请求测试 + /// 用于测试模型绑定，看看一次客户端的请求是否能被正确解析，亦或者测试WebAPI入口的一些Filter AOP等是否被正确触发。 + /// 详情参考：https://www.cnblogs.com/yubaolee/p/DotNetCoreUnitTest.html + /// + public class TestHttpRequest + { + private HttpClient _client; + + void ConfigureTestServices(IServiceCollection services) + { + } + + void ConfigureTestContainer(ContainerBuilder builder) + { + AutofacExt.InitAutofac(builder); + } + + [SetUp] + public void Init() + { + var factory = new AutofacWebApplicationFactory(); + + _client = factory + .WithWebHostBuilder(builder => { + builder.ConfigureTestServices(ConfigureTestServices); + builder.ConfigureTestContainer(ConfigureTestContainer); + }) + .CreateClient(); + } + /// + /// 模拟一次登录 + /// + [Test] + public LoginResult TestLogin() + { + var loginreq = new PassportLoginRequest + { + Account = "System", + Password = "123456", + AppKey = "openauth" + }; + + var request = new StringContent(JsonHelper.Instance.Serialize(loginreq)); + request.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json"); + var response = _client.PostAsync("http://localhost:52789/api/Check/Login", request); + + string result = response.Result.Content.ReadAsStringAsync().Result; + var loginresult = JsonHelper.Instance.Deserialize(result); + + Console.WriteLine($"登录结果:{result}"); + return loginresult; + } + /// + /// 模拟加载字典列表 + /// + [Test] + public void TestLoad() + { + _client.DefaultRequestHeaders.Add("X-Token", TestLogin().Token); + var response = _client.GetAsync("http://localhost:52789/api/categorys/load?page=1&limit=20"); + + string result = response.Result.Content.ReadAsStringAsync().Result; + Console.WriteLine($"获取分类列表:{result}"); + } + } +} \ No newline at end of file