Skip to content

Commit e05ffa5

Browse files
dotarjdotarj
committed
unit tests fixed
1 parent b4c85d1 commit e05ffa5

3 files changed

Lines changed: 34 additions & 23 deletions

File tree

‎test/PartialResponse.AspNetCore.Mvc.Formatters.Json.Tests/PartialJsonOutputFormatterTests.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
using System.Text;
77
using System.Threading.Tasks;
88
using Microsoft.AspNetCore.Http;
9+
using Microsoft.AspNetCore.Mvc;
910
using Microsoft.AspNetCore.Mvc.Formatters;
10-
using Microsoft.Extensions.Options;
1111
using Moq;
1212
using Newtonsoft.Json;
1313
using PartialResponse.Core;
@@ -19,8 +19,8 @@ public class PartialJsonOutputFormatterTests
1919
{
2020
private readonly PartialJsonOutputFormatter formatter;
2121
private readonly IFieldsParser fieldsParser = Mock.Of<IFieldsParser>();
22-
private readonly IOptions<MvcPartialJsonOptions> options = Mock.Of<IOptions<MvcPartialJsonOptions>>();
23-
private readonly MvcPartialJsonOptions partialJsonOptions = new MvcPartialJsonOptions();
22+
private readonly MvcPartialJsonOptions mvcPartialJsonOptions = new MvcPartialJsonOptions();
23+
private readonly MvcOptions mvcOptions = new MvcOptions();
2424
private readonly HttpContext httpContext = Mock.Of<HttpContext>();
2525
private readonly Dictionary<object, object> httpContextItems = new Dictionary<object, object>();
2626
private readonly HttpRequest httpRequest = Mock.Of<HttpRequest>();
@@ -45,11 +45,11 @@ public PartialJsonOutputFormatterTests()
4545
.SetupGet(httpRequest => httpRequest.HttpContext)
4646
.Returns(this.httpContext);
4747

48-
Mock.Get(this.options)
49-
.SetupGet(options => options.Value)
50-
.Returns(this.partialJsonOptions);
51-
52-
this.formatter = new PartialJsonOutputFormatter(new JsonSerializerSettings(), this.fieldsParser, Mock.Of<ArrayPool<char>>(), this.partialJsonOptions);
48+
#if ASPNETCORE2
49+
this.formatter = new PartialJsonOutputFormatter(new JsonSerializerSettings(), this.fieldsParser, Mock.Of<ArrayPool<char>>(), this.mvcPartialJsonOptions);
50+
#else
51+
this.formatter = new PartialJsonOutputFormatter(new JsonSerializerSettings(), this.fieldsParser, Mock.Of<ArrayPool<char>>(), this.mvcPartialJsonOptions, this.mvcOptions);
52+
#endif
5353
}
5454

5555
[Fact]
@@ -64,8 +64,8 @@ public async Task TheWriteResponseBodyAsyncMethodShouldReturnStatusCode400IfFiel
6464
.Setup(fieldsParser => fieldsParser.Parse(this.httpRequest))
6565
.Returns(FieldsParserResult.Failed());
6666

67-
this.partialJsonOptions.IgnoreParseErrors = false;
68-
this.partialJsonOptions.IgnoreCase = false;
67+
this.mvcPartialJsonOptions.IgnoreParseErrors = false;
68+
this.mvcPartialJsonOptions.IgnoreCase = false;
6969

7070
var writeContext = this.CreateWriteContext(new { });
7171

@@ -91,8 +91,8 @@ public async Task TheWriteResponseBodyAsyncMethodShouldNotReturnStatusCode400IfF
9191
.Setup(fieldsParser => fieldsParser.Parse(this.httpRequest))
9292
.Returns(FieldsParserResult.Failed());
9393

94-
this.partialJsonOptions.IgnoreParseErrors = true;
95-
this.partialJsonOptions.IgnoreCase = false;
94+
this.mvcPartialJsonOptions.IgnoreParseErrors = true;
95+
this.mvcPartialJsonOptions.IgnoreCase = false;
9696

9797
var writeContext = this.CreateWriteContext(new { foo = "bar" });
9898

@@ -164,7 +164,7 @@ public async Task TheWriteResponseBodyAsyncMethodShouldIgnoreCase()
164164
.Setup(fieldsParser => fieldsParser.Parse(this.httpRequest))
165165
.Returns(FieldsParserResult.Success(fields));
166166

167-
this.partialJsonOptions.IgnoreCase = true;
167+
this.mvcPartialJsonOptions.IgnoreCase = true;
168168

169169
var writeContext = this.CreateWriteContext(new { foo = "bar" });
170170

@@ -189,7 +189,7 @@ public async Task TheWriteResponseBodyAsyncMethodShouldNotIgnoreCase()
189189
.Setup(fieldsParser => fieldsParser.Parse(this.httpRequest))
190190
.Returns(FieldsParserResult.Success(fields));
191191

192-
this.partialJsonOptions.IgnoreCase = false;
192+
this.mvcPartialJsonOptions.IgnoreCase = false;
193193

194194
var writeContext = this.CreateWriteContext(new { foo = "bar" });
195195

‎test/PartialResponse.AspNetCore.Mvc.Formatters.Json.Tests/PartialJsonResultExecutorTests.cs‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ public class PartialJsonResultExecutorTests
2424
private readonly IFieldsParser fieldsParser = Mock.Of<IFieldsParser>();
2525
private readonly IHttpResponseStreamWriterFactory writerFactory = Mock.Of<IHttpResponseStreamWriterFactory>();
2626
private readonly ILogger<PartialJsonResultExecutor> logger = Mock.Of<ILogger<PartialJsonResultExecutor>>();
27-
private readonly IOptions<MvcPartialJsonOptions> options = Mock.Of<IOptions<MvcPartialJsonOptions>>();
28-
private readonly MvcPartialJsonOptions partialJsonOptions = new MvcPartialJsonOptions();
27+
private readonly IOptions<MvcPartialJsonOptions> optionsMvcPartialJsonOptions = Mock.Of<IOptions<MvcPartialJsonOptions>>();
28+
private readonly MvcPartialJsonOptions mvcPartialJsonOptions = new MvcPartialJsonOptions();
29+
private readonly IOptions<MvcOptions> optionsMvcOptions = Mock.Of<IOptions<MvcOptions>>();
30+
private readonly MvcOptions mvcOptions = new MvcOptions();
2931
private readonly HttpContext httpContext = Mock.Of<HttpContext>();
3032
private readonly HttpRequest httpRequest = Mock.Of<HttpRequest>();
3133
private readonly HttpResponse httpResponse = Mock.Of<HttpResponse>();
@@ -45,11 +47,19 @@ public PartialJsonResultExecutorTests()
4547
.Setup(writerFactory => writerFactory.CreateWriter(It.IsAny<Stream>(), It.IsAny<Encoding>()))
4648
.Returns(new StringWriter(this.body));
4749

48-
Mock.Get(this.options)
50+
Mock.Get(this.optionsMvcPartialJsonOptions)
4951
.SetupGet(options => options.Value)
50-
.Returns(this.partialJsonOptions);
52+
.Returns(this.mvcPartialJsonOptions);
5153

52-
this.executor = new PartialJsonResultExecutor(this.writerFactory, this.logger, this.options, this.fieldsParser, Mock.Of<ArrayPool<char>>());
54+
Mock.Get(this.optionsMvcOptions)
55+
.SetupGet(optionsMvcOptions => optionsMvcOptions.Value)
56+
.Returns(this.mvcOptions);
57+
58+
#if ASPNETCORE2
59+
this.executor = new PartialJsonResultExecutor(this.writerFactory, this.logger, this.optionsMvcPartialJsonOptions, this.fieldsParser, Mock.Of<ArrayPool<char>>());
60+
#else
61+
this.executor = new PartialJsonResultExecutor(this.writerFactory, this.logger, this.optionsMvcOptions, this.optionsMvcPartialJsonOptions, this.fieldsParser, Mock.Of<ArrayPool<char>>());
62+
#endif
5363
this.actionContext = new ActionContext() { HttpContext = this.httpContext };
5464
}
5565

@@ -83,7 +93,7 @@ public async Task TheExecuteAsyncMethodShouldNotReturnStatusCode400IfFieldsMalfo
8393

8494
var partialJsonResult = new PartialJsonResult(new { foo = "bar" });
8595

86-
this.partialJsonOptions.IgnoreParseErrors = true;
96+
this.mvcPartialJsonOptions.IgnoreParseErrors = true;
8797

8898
// Act
8999
await this.executor.ExecuteAsync(this.actionContext, partialJsonResult);
@@ -141,7 +151,7 @@ public async Task TheExecuteAsyncMethodShouldIgnoreCase()
141151
.Setup(fieldsParser => fieldsParser.Parse(this.httpRequest))
142152
.Returns(FieldsParserResult.Success(fields));
143153

144-
this.partialJsonOptions.IgnoreCase = true;
154+
this.mvcPartialJsonOptions.IgnoreCase = true;
145155

146156
var partialJsonResult = new PartialJsonResult(new { foo = "bar", baz = "qux" }, new JsonSerializerSettings());
147157

@@ -162,7 +172,7 @@ public async Task TheExecuteAsyncMethodShouldNotIgnoreCase()
162172
.Setup(fieldsParser => fieldsParser.Parse(this.httpRequest))
163173
.Returns(FieldsParserResult.Success(fields));
164174

165-
this.partialJsonOptions.IgnoreCase = false;
175+
this.mvcPartialJsonOptions.IgnoreCase = false;
166176

167177
var partialJsonResult = new PartialJsonResult(new { foo = "bar", baz = "qux" }, new JsonSerializerSettings());
168178

‎test/PartialResponse.AspNetCore.Mvc.Formatters.Json.Tests/PartialResponse.AspNetCore.Mvc.Formatters.Json.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
<DebugType Condition="$(codecov) == 'true'">full</DebugType>
55
<IsPackable>false</IsPackable>
66
<LangVersion>latest</LangVersion>
7-
<TargetFramework>net471</TargetFramework>
7+
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<DefineConstants Condition=" '$(TargetFramework)' == 'net471' ">ASPNETCORE2</DefineConstants>
910
</PropertyGroup>
1011

1112
<ItemGroup>

0 commit comments

Comments
 (0)