From 75e47dd4a524e63828a7cc789e44a4855c2a8872 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 26 Jan 2021 16:22:14 +0800 Subject: [PATCH] Update unit test. --- .../RemoteStreamContentInputFormatter.cs | 5 ++++- .../RemoteStreamContentTestController.cs | 7 ++++--- .../RemoteStreamContentTestController_Tests.cs | 11 +++++------ .../PersonAppServiceClientProxy_Tests.cs | 8 ++++---- .../Volo/Abp/TestApp/Application/PeopleAppService.cs | 4 ++-- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentInputFormatter.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentInputFormatter.cs index 27116d3da6..ba07e28f77 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentInputFormatter.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentInputFormatter.cs @@ -20,7 +20,10 @@ namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters public override Task ReadRequestBodyAsync(InputFormatterContext context) { - return InputFormatterResult.SuccessAsync(new RemoteStreamContent(context.HttpContext.Request.Body)); + return InputFormatterResult.SuccessAsync(new RemoteStreamContent(context.HttpContext.Request.Body) + { + ContentType = context.HttpContext.Request.ContentType + }); } } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController.cs index 8e49b77604..15491f9b21 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController.cs @@ -2,6 +2,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Shouldly; using Volo.Abp.Content; namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters @@ -14,11 +15,11 @@ namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters public async Task DownloadAsync() { var memoryStream = new MemoryStream(); - await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("stream")); + await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("DownloadAsync")); return new RemoteStreamContent(memoryStream) { - ContentType = "audio/mpeg" + ContentType = "application/rtf" }; } @@ -28,7 +29,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters { using (var reader = new StreamReader(streamContent.GetStream())) { - return await reader.ReadToEndAsync(); + return await reader.ReadToEndAsync() + ":" + streamContent.ContentType; } } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController_Tests.cs index 898423ab58..3d49a5b3ff 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ContentFormatters/RemoteStreamContentTestController_Tests.cs @@ -13,8 +13,8 @@ namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters public async Task DownloadAsync() { var result = await GetResponseAsync("/api/remote-stream-content-test/download"); - result.Content.Headers.ContentType?.ToString().ShouldBe("audio/mpeg"); - (await result.Content.ReadAsStringAsync()).ShouldBe("stream"); + result.Content.Headers.ContentType?.ToString().ShouldBe("application/rtf"); + (await result.Content.ReadAsStringAsync()).ShouldBe("DownloadAsync"); } [Fact] @@ -23,15 +23,14 @@ namespace Volo.Abp.AspNetCore.Mvc.ContentFormatters using (var requestMessage = new HttpRequestMessage(HttpMethod.Post, "/api/remote-stream-content-test/upload")) { var memoryStream = new MemoryStream(); - await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("upload")); - + await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("UploadAsync")); memoryStream.Position = 0; requestMessage.Content = new StreamContent(memoryStream); - requestMessage.Content.Headers.Add("Content-Type", "*/*"); + requestMessage.Content.Headers.Add("Content-Type", "application/rtf"); var response = await Client.SendAsync(requestMessage); - (await response.Content.ReadAsStringAsync()).ShouldBe("upload"); + (await response.Content.ReadAsStringAsync()).ShouldBe("UploadAsync:application/rtf"); } } } diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs index 93299b944c..77e838493e 100644 --- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs @@ -177,11 +177,11 @@ namespace Volo.Abp.Http.DynamicProxying { var result = await _peopleAppService.DownloadAsync(); - result.ContentType.ShouldBe("audio/mpeg"); + result.ContentType.ShouldBe("application/rtf"); using (var reader = new StreamReader(result.GetStream())) { var str = await reader.ReadToEndAsync(); - str.ShouldBe("stream"); + str.ShouldBe("DownloadAsync"); } } @@ -189,12 +189,12 @@ namespace Volo.Abp.Http.DynamicProxying public async Task UploadAsync() { var memoryStream = new MemoryStream(); - await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("upload")); + await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("UploadAsync")); var result = await _peopleAppService.UploadAsync(new RemoteStreamContent(memoryStream) { ContentType = "application/rtf" }); - result.ShouldBe("upload"); + result.ShouldBe("UploadAsync"); } } } diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs index ec9332d44e..ee191960b6 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs @@ -71,11 +71,11 @@ namespace Volo.Abp.TestApp.Application public async Task DownloadAsync() { var memoryStream = new MemoryStream(); - await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("stream")); + await memoryStream.WriteAsync(Encoding.UTF8.GetBytes("DownloadAsync")); return new RemoteStreamContent(memoryStream) { - ContentType = "audio/mpeg" + ContentType = "application/rtf" }; }