diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs index eba589903f..19d56fb5af 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs @@ -21,6 +21,7 @@ using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Options; using Microsoft.Extensions.WebEncoders.Testing; using Moq; using Xunit; @@ -355,7 +356,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers var clock = new Mock(); clock.SetupGet(p => p.UtcNow) .Returns(() => currentTime); - var storage = GetStorage(new MemoryCacheOptions { Clock = clock.Object }); + var storage = GetStorage(Options.Create(new MemoryDistributedCacheOptions { Clock = clock.Object })); var service = new DistributedCacheTagHelperService( storage, Mock.Of(), @@ -417,7 +418,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers var clock = new Mock(); clock.SetupGet(p => p.UtcNow) .Returns(() => currentTime); - var storage = GetStorage(new MemoryCacheOptions { Clock = clock.Object }); + var storage = GetStorage(Options.Create(new MemoryDistributedCacheOptions { Clock = clock.Object })); var service = new DistributedCacheTagHelperService( storage, Mock.Of(), @@ -479,7 +480,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers var clock = new Mock(); clock.SetupGet(p => p.UtcNow) .Returns(() => currentTime); - var storage = GetStorage(new MemoryCacheOptions { Clock = clock.Object }); + var storage = GetStorage(Options.Create(new MemoryDistributedCacheOptions { Clock = clock.Object })); var service = new DistributedCacheTagHelperService( storage, Mock.Of(), @@ -775,9 +776,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers }); } - private static IDistributedCacheTagHelperStorage GetStorage(MemoryCacheOptions options = null) + private static IDistributedCacheTagHelperStorage GetStorage(IOptions options = null) { - return new DistributedCacheTagHelperStorage(new MemoryDistributedCache(new MemoryCache(options ?? new MemoryCacheOptions()))); + return new DistributedCacheTagHelperStorage(new MemoryDistributedCache(options ?? Options.Create(new MemoryDistributedCacheOptions()))); } private static IDistributedCacheTagHelperFormatter GetFormatter()