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

Merge branch 'merge/release/2.2-to-master'

This commit is contained in:
James Newton-King 2018-07-26 10:30:01 +12:00
parent f06810f744 f31ab716ee
commit 1e0d1d7eb2
No known key found for this signature in database
GPG Key ID: 0A66B2F456BF5526
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcEndpointDataSource.cs
View File

@ -396,7 +396,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
return new CompositeChangeToken(changeTokens); return new CompositeChangeToken(changeTokens);
} }
public override IChangeToken ChangeToken => GetCompositeChangeToken(); public override IChangeToken GetChangeToken() => GetCompositeChangeToken();
public override IReadOnlyList<Endpoint> Endpoints public override IReadOnlyList<Endpoint> Endpoints
{ {

4
test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MvcEndpointDataSourceTests.cs
View File

@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
[Fact] [Fact]
public void ChangeToken_MultipleChangeTokenProviders_ComposedResult() public void GetChangeToken_MultipleChangeTokenProviders_ComposedResult()
{ {
// Arrange // Arrange
var featureCollection = new FeatureCollection(); var featureCollection = new FeatureCollection();
@ -163,7 +163,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
new[] { changeProvider1Mock.Object, changeProvider2Mock.Object }); new[] { changeProvider1Mock.Object, changeProvider2Mock.Object });
// Act // Act
var changeToken = dataSource.ChangeToken; var changeToken = dataSource.GetChangeToken();
// Assert // Assert
var compositeChangeToken = Assert.IsType<CompositeChangeToken>(changeToken); var compositeChangeToken = Assert.IsType<CompositeChangeToken>(changeToken);