huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to IFeatureCollection changes, test cleanup.

This commit is contained in:
Chris R 2015-08-04 09:09:53 -07:00
parent 4a9029fc9c
commit 0e05c64855
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs
View File

@ -250,20 +250,15 @@ namespace Microsoft.AspNet.Diagnostics.Tests
[Fact] [Fact]
public async Task UsesIdentifierFeature_IfAlreadyPresentOnContext() public async Task UsesIdentifierFeature_IfAlreadyPresentOnContext()
{ {
// Arrange var context = new DefaultHttpContext();
var requestIdentifierFeature = new HttpRequestIdentifierFeature() var requestIdentifierFeature = new HttpRequestIdentifierFeature()
{ {
TraceIdentifier = Guid.NewGuid().ToString() TraceIdentifier = Guid.NewGuid().ToString()
}; };
var features = new FeatureCollection(); context.SetFeature<IHttpRequestIdentifierFeature>(requestIdentifierFeature);
features.Add(typeof(IHttpRequestFeature), new HttpRequestFeature());
features.Add(typeof(IHttpRequestIdentifierFeature), requestIdentifierFeature);
features.Add(typeof(IHttpResponseFeature), new HttpResponseFeature());
var context = new DefaultHttpContext(features);
var loggerFactory = new LoggerFactory(); var loggerFactory = new LoggerFactory();
loggerFactory.AddProvider(new ElmLoggerProvider(new ElmStore(), new ElmOptions())); loggerFactory.AddProvider(new ElmLoggerProvider(new ElmStore(), new ElmOptions()));
// Act & Assert
var errorPageMiddleware = new ElmCaptureMiddleware((innerContext) => var errorPageMiddleware = new ElmCaptureMiddleware((innerContext) =>
{ {
Assert.Same(requestIdentifierFeature, innerContext.GetFeature<IHttpRequestIdentifierFeature>()); Assert.Same(requestIdentifierFeature, innerContext.GetFeature<IHttpRequestIdentifierFeature>());
@ -280,17 +275,12 @@ namespace Microsoft.AspNet.Diagnostics.Tests
[InlineData("")] [InlineData("")]
public async Task UpdatesTraceIdentifier_IfNullOrEmpty(string requestId) public async Task UpdatesTraceIdentifier_IfNullOrEmpty(string requestId)
{ {
// Arrange var context = new DefaultHttpContext();
var requestIdentifierFeature = new HttpRequestIdentifierFeature() { TraceIdentifier = requestId }; var requestIdentifierFeature = new HttpRequestIdentifierFeature() { TraceIdentifier = requestId };
var features = new FeatureCollection(); context.SetFeature<IHttpRequestIdentifierFeature>(requestIdentifierFeature);
features.Add(typeof(IHttpRequestIdentifierFeature), requestIdentifierFeature);
features.Add(typeof(IHttpRequestFeature), new HttpRequestFeature());
features.Add(typeof(IHttpResponseFeature), new HttpResponseFeature());
var context = new DefaultHttpContext(features);
var loggerFactory = new LoggerFactory(); var loggerFactory = new LoggerFactory();
loggerFactory.AddProvider(new ElmLoggerProvider(new ElmStore(), new ElmOptions())); loggerFactory.AddProvider(new ElmLoggerProvider(new ElmStore(), new ElmOptions()));
// Act & Assert
var errorPageMiddleware = new ElmCaptureMiddleware((innerContext) => var errorPageMiddleware = new ElmCaptureMiddleware((innerContext) =>
{ {
var feature = innerContext.GetFeature<IHttpRequestIdentifierFeature>(); var feature = innerContext.GetFeature<IHttpRequestIdentifierFeature>();