diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.AppSettings.Tests/Microsoft.Azure.WebJobs.Extensions.OpenApi.AppSettings.Tests.csproj b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.AppSettings.Tests/Microsoft.Azure.WebJobs.Extensions.OpenApi.AppSettings.Tests.csproj index 0ae39fd1..f81503f6 100644 --- a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.AppSettings.Tests/Microsoft.Azure.WebJobs.Extensions.OpenApi.AppSettings.Tests.csproj +++ b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.AppSettings.Tests/Microsoft.Azure.WebJobs.Extensions.OpenApi.AppSettings.Tests.csproj @@ -21,7 +21,6 @@ - diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Configurations/DefaultOpenApiHttpTriggerAuthorizationTests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Configurations/DefaultOpenApiHttpTriggerAuthorizationTests.cs index aa6b3f19..20c369a4 100644 --- a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Configurations/DefaultOpenApiHttpTriggerAuthorizationTests.cs +++ b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Configurations/DefaultOpenApiHttpTriggerAuthorizationTests.cs @@ -6,7 +6,7 @@ using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Configurations; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; +using NSubstitute; namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Configurations { @@ -16,10 +16,10 @@ public class DefaultOpenApiHttpTriggerAuthorizationTests [TestMethod] public async Task Given_Type_When_Instantiated_Then_Properties_Should_Return_Null() { - var req = new Mock(); + var req = Substitute.For(); var auth = new DefaultOpenApiHttpTriggerAuthorization(); - var result = await auth.AuthorizeAsync(req.Object).ConfigureAwait(false); + var result = await auth.AuthorizeAsync(req).ConfigureAwait(false); result.Should().BeNull(); } diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Configurations/OpenApiHttpTriggerAuthorizationTests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Configurations/OpenApiHttpTriggerAuthorizationTests.cs index 190d51dc..044dc8ee 100644 --- a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Configurations/OpenApiHttpTriggerAuthorizationTests.cs +++ b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Configurations/OpenApiHttpTriggerAuthorizationTests.cs @@ -7,7 +7,7 @@ using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Configurations; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; +using NSubstitute; namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Configurations { @@ -17,10 +17,10 @@ public class OpenApiHttpTriggerAuthorizationTests [TestMethod] public async Task Given_NoDeligate_When_AuthorizeAsync_Invoked_Then_It_Should_Return_Null() { - var req = new Mock(); + var req = Substitute.For(); var auth = new OpenApiHttpTriggerAuthorization(); - var result = await auth.AuthorizeAsync(req.Object).ConfigureAwait(false); + var result = await auth.AuthorizeAsync(req).ConfigureAwait(false); result.Should().BeNull(); } @@ -29,7 +29,7 @@ public async Task Given_NoDeligate_When_AuthorizeAsync_Invoked_Then_It_Should_Re [DataRow(HttpStatusCode.Unauthorized, "text/plain", "Unauthorized")] public async Task Given_Deligate_Through_Constructor_When_AuthorizeAsync_Invoked_Then_It_Should_Return_Result(HttpStatusCode statusCode, string contentType, string payload) { - var req = new Mock(); + var req = Substitute.For(); var auth = new OpenApiHttpTriggerAuthorization(req => { var result = new OpenApiAuthorizationResult() @@ -42,7 +42,7 @@ public async Task Given_Deligate_Through_Constructor_When_AuthorizeAsync_Invoked return Task.FromResult(result); }); - var result = await auth.AuthorizeAsync(req.Object).ConfigureAwait(false); + var result = await auth.AuthorizeAsync(req).ConfigureAwait(false); result.Should().NotBeNull(); result.StatusCode.Should().Be(statusCode); @@ -54,7 +54,7 @@ public async Task Given_Deligate_Through_Constructor_When_AuthorizeAsync_Invoked [DataRow(HttpStatusCode.Unauthorized, "text/plain", "Unauthorized")] public async Task Given_Deligate_Through_Property_When_AuthorizeAsync_Invoked_Then_It_Should_Return_Result(HttpStatusCode statusCode, string contentType, string payload) { - var req = new Mock(); + var req = Substitute.For(); var auth = new OpenApiHttpTriggerAuthorization { Authorization = req => @@ -70,7 +70,7 @@ public async Task Given_Deligate_Through_Property_When_AuthorizeAsync_Invoked_Th } }; - var result = await auth.AuthorizeAsync(req.Object).ConfigureAwait(false); + var result = await auth.AuthorizeAsync(req).ConfigureAwait(false); result.Should().NotBeNull(); result.StatusCode.Should().Be(statusCode); diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/HttpRequestDataObjectExtensionsTests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/HttpRequestDataObjectExtensionsTests.cs index f5b11d3b..b7bed7d5 100644 --- a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/HttpRequestDataObjectExtensionsTests.cs +++ b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/HttpRequestDataObjectExtensionsTests.cs @@ -6,7 +6,7 @@ using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; +using NSubstitute; namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Extensions { @@ -26,10 +26,10 @@ public void Given_Null_When_GetScheme_Invoked_Then_It_Should_Throw_Exception() [DataRow("https", "https")] public void Given_NullOptions_When_GetScheme_Invoked_Then_It_Should_Return_Result(string scheme, string expected) { - var req = new Mock(); - req.SetupGet(p => p.Scheme).Returns(scheme); + var req = Substitute.For(); + req.Scheme.Returns(scheme); - var result = HttpRequestDataObjectExtensions.GetScheme(req.Object, null); + var result = HttpRequestDataObjectExtensions.GetScheme(req, null); result.Should().Be(expected); } @@ -45,14 +45,14 @@ public void Given_NullOptions_When_GetScheme_Invoked_Then_It_Should_Return_Resul [DataRow("https", false, false, "https")] public void Given_Options_When_GetScheme_Invoked_Then_It_Should_Return_Result(string scheme, bool forceHttps, bool forceHttp, string expected) { - var req = new Mock(); - req.SetupGet(p => p.Scheme).Returns(scheme); + var req = Substitute.For(); + req.Scheme.Returns(scheme); - var options = new Mock(); - options.SetupGet(p => p.ForceHttps).Returns(forceHttps); - options.SetupGet(p => p.ForceHttp).Returns(forceHttp); + var options = Substitute.For(); + options.ForceHttps.Returns(forceHttps); + options.ForceHttp.Returns(forceHttp); - var result = HttpRequestDataObjectExtensions.GetScheme(req.Object, options.Object); + var result = HttpRequestDataObjectExtensions.GetScheme(req, options); result.Should().Be(expected); } diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/OpenApiHttpTriggerContextExtensionsTests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/OpenApiHttpTriggerContextExtensionsTests.cs index 82699c17..e3ec9ee0 100644 --- a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/OpenApiHttpTriggerContextExtensionsTests.cs +++ b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/OpenApiHttpTriggerContextExtensionsTests.cs @@ -8,7 +8,7 @@ using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; +using NSubstitute; namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Extensions { @@ -18,24 +18,24 @@ public class OpenApiHttpTriggerContextExtensionsTests [TestMethod] public void Given_Null_Parameter_When_AuthorizeAsync_Invoked_Then_It_Should_Throw_Exception() { - var context = new Mock(); + var context = Substitute.For(); Func func = async () => await OpenApiHttpTriggerContextExtensions.AuthorizeAsync(null, null).ConfigureAwait(false); func.Should().ThrowAsync(); - func = async () => await OpenApiHttpTriggerContextExtensions.AuthorizeAsync(Task.FromResult(context.Object), null).ConfigureAwait(false); + func = async () => await OpenApiHttpTriggerContextExtensions.AuthorizeAsync(Task.FromResult(context), null).ConfigureAwait(false); func.Should().ThrowAsync(); } [TestMethod] public async Task Given_Parameter_When_AuthorizeAsync_Invoked_Then_It_Should_Return_Result() { - var context = new Mock(); - context.Setup(p => p.AuthorizeAsync(It.IsAny())).ReturnsAsync(default(OpenApiAuthorizationResult)); + var context = Substitute.For(); + context.AuthorizeAsync(Arg.Any()).Returns(Task.FromResult(default(OpenApiAuthorizationResult))); - var req = new Mock(); + var req = Substitute.For(); - var result = await OpenApiHttpTriggerContextExtensions.AuthorizeAsync(Task.FromResult(context.Object), req.Object).ConfigureAwait(false); + var result = await OpenApiHttpTriggerContextExtensions.AuthorizeAsync(Task.FromResult(context), req).ConfigureAwait(false); result.Should().BeNull(); } diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/SwaggerUIExtensionsTests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/SwaggerUIExtensionsTests.cs index 1ca7e39d..59752aed 100644 --- a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/SwaggerUIExtensionsTests.cs +++ b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/SwaggerUIExtensionsTests.cs @@ -8,7 +8,7 @@ using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; +using NSubstitute; namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests { @@ -21,8 +21,8 @@ public void Given_Null_When_RenderAsync_Invoked_Then_It_Should_Throw_Exception() Func func = async () => await SwaggerUIExtensions.RenderAsync(null, null).ConfigureAwait(false); func.Should().ThrowAsync(); - var ui = new Mock(); - var task = Task.FromResult(ui.Object); + var ui = Substitute.For(); + var task = Task.FromResult(ui); func = async () => await SwaggerUIExtensions.RenderAsync(task, null).ConfigureAwait(false); func.Should().ThrowAsync(); @@ -34,10 +34,10 @@ public async Task Given_Value_When_RenderAsync_Invoked_Then_It_Should_Return_Val var endpoint = "swagger/ui"; var rendered = "hello world"; - var ui = new Mock(); - ui.Setup(p => p.RenderAsync(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(rendered); + var ui = Substitute.For(); + ui.RenderAsync(Arg.Any(), Arg.Any(), Arg.Any()).Returns(Task.FromResult(rendered)); - var task = Task.FromResult(ui.Object); + var task = Task.FromResult(ui); var result = await SwaggerUIExtensions.RenderAsync(task, endpoint).ConfigureAwait(false); @@ -50,8 +50,8 @@ public void Given_Null_When_RenderOAuth2RedirectAsync_Invoked_Then_It_Should_Thr Func func = async () => await SwaggerUIExtensions.RenderOAuth2RedirectAsync(null, null).ConfigureAwait(false); func.Should().ThrowAsync(); - var ui = new Mock(); - var task = Task.FromResult(ui.Object); + var ui = Substitute.For(); + var task = Task.FromResult(ui); func = async () => await SwaggerUIExtensions.RenderOAuth2RedirectAsync(task, null).ConfigureAwait(false); func.Should().ThrowAsync(); @@ -63,10 +63,10 @@ public async Task Given_Value_When_RenderOAuth2RedirectAsync_Invoked_Then_It_Sho var endpoint = "oauth2-redirect.html"; var rendered = "hello world"; - var ui = new Mock(); - ui.Setup(p => p.RenderOAuth2RedirectAsync(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(rendered); + var ui = Substitute.For(); + ui.RenderOAuth2RedirectAsync(Arg.Any(), Arg.Any(), Arg.Any()).Returns(Task.FromResult(rendered)); - var task = Task.FromResult(ui.Object); + var task = Task.FromResult(ui); var result = await SwaggerUIExtensions.RenderOAuth2RedirectAsync(task, endpoint).ConfigureAwait(false); diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Filters/DocumentFilterCollectionTests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Filters/DocumentFilterCollectionTests.cs index d3baf360..3c2a7ad2 100644 --- a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Filters/DocumentFilterCollectionTests.cs +++ b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Filters/DocumentFilterCollectionTests.cs @@ -6,7 +6,7 @@ using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Filters; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; +using NSubstitute; namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Filters { @@ -27,7 +27,7 @@ public void Given_Null_When_Instantated_Then_It_Should_Return_Result() [DataRow(2)] public void Given_Filters_When_Instantated_Then_It_Should_Return_Result(int count) { - var filters = Enumerable.Range(0, count).Select(i => new Mock().Object).ToList(); + var filters = Enumerable.Range(0, count).Select(i => Substitute.For()).ToList(); var collection = new DocumentFilterCollection(filters); collection.DocumentFilters.Should().NotBeNull(); diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.csproj b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.csproj index 82fe2f3c..410c9ad8 100644 --- a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.csproj +++ b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.csproj @@ -21,9 +21,9 @@ - + diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Resolvers/HostJsonResolverTests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Resolvers/HostJsonResolverTests.cs deleted file mode 100644 index 1fa94543..00000000 --- a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Resolvers/HostJsonResolverTests.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Resolvers -{ - [TestClass] - public class HostJsonResolverTests - { - //[TestMethod] - //public void Given_Parameters_When_Resolve_Invoked_Then_It_Should_Return_Result() - //{ - // var section = new Mock(); - // section.SetupGet(p => p.Value).Returns(string.Empty); - - // var env = new Mock(); - // env.Setup(p => p.GetSection(It.IsAny())).Returns(section.Object); - - // var result = HostJsonResolver.Resolve(env.Object); - - // result.Should().NotBeNull() - // .And.BeAssignableTo(); - //} - - //[TestMethod] - //public void Given_HostJson_When_GetHttpSettings_Invoked_Then_It_Should_Return_Result() - //{ - // var host = HostJsonResolver.Resolve(); - - // var result = host.GetHttpSettings(); - - // result.RoutePrefix.Should().BeEquivalentTo("api"); - //} - } -} diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/SwaggerUITests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/SwaggerUITests.cs index 2ff1817b..6485a7dc 100644 --- a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/SwaggerUITests.cs +++ b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/SwaggerUITests.cs @@ -13,7 +13,7 @@ using Microsoft.OpenApi.Models; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; +using NSubstitute; namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests { @@ -35,15 +35,13 @@ public class SwaggerUITests [DataRow("https", "localhost:47071", null, "https://localhost:47071")] public void Given_NullOptions_When_AddServer_Invoked_Then_It_Should_Return_BaseUrl(string scheme, string host, string routePrefix, string expected) { - var req = new Mock(); - req.SetupGet(p => p.Scheme).Returns(scheme); - - var hostString = new HostString(host); - req.SetupGet(p => p.Host).Returns(hostString); + var req = Substitute.For(); + req.Scheme.Returns(scheme); + req.Host.Returns(new HostString(host)); var ui = new SwaggerUI(); - ui.AddServer(req.Object, routePrefix, null); + ui.AddServer(req, routePrefix, null); var fi = ui.GetType().GetField("_baseUrl", BindingFlags.Instance | BindingFlags.NonPublic); @@ -101,20 +99,18 @@ public void Given_NullOptions_When_AddServer_Invoked_Then_It_Should_Return_BaseU [DataRow("https", "localhost:47071", null, false, false, "https://localhost:47071")] public void Given_Options_When_AddServer_Invoked_Then_It_Should_Return_BaseUrl(string scheme, string host, string routePrefix, bool forceHttps, bool forceHttp, string expected) { - var req = new Mock(); - req.SetupGet(p => p.Scheme).Returns(scheme); - - var hostString = new HostString(host); - req.SetupGet(p => p.Host).Returns(hostString); + var req = Substitute.For(); + req.Scheme.Returns(scheme); + req.Host.Returns(new HostString(host)); - var options = new Mock(); - options.SetupGet(p => p.ForceHttps).Returns(forceHttps); - options.SetupGet(p => p.ForceHttp).Returns(forceHttp); - options.SetupGet(p => p.Servers).Returns(new List()); + var options = Substitute.For(); + options.ForceHttps.Returns(forceHttps); + options.ForceHttp.Returns(forceHttp); + options.Servers.Returns(new List()); var ui = new SwaggerUI(); - ui.AddServer(req.Object, routePrefix, options.Object); + ui.AddServer(req, routePrefix, options); var fi = ui.GetType().GetField("_baseUrl", BindingFlags.Instance | BindingFlags.NonPublic); @@ -136,16 +132,15 @@ public void Given_Options_When_AddServer_Invoked_Then_It_Should_Return_BaseUrl(s [DataRow("https", "localhost", null, true, "")] public void Given_NullOptions_When_AddServer_Invoked_Then_It_Should_Return_SwaggerUIApiPrefix(string scheme, string host, string routePrefix, bool optionsSet, string expected) { - var req = new Mock(); - req.SetupGet(p => p.Scheme).Returns(scheme); - - var hostString = new HostString(host); - req.SetupGet(p => p.Host).Returns(hostString); + var req = Substitute.For(); + req.Scheme.Returns(scheme); + req.Host.Returns(new HostString(host)); var ui = new SwaggerUI(); - var options = new Mock(); - options.SetupGet(p => p.Servers).Returns(new List()); - ui.AddServer(req.Object, routePrefix, optionsSet ? options.Object: null); + var options = Substitute.For(); + options.Servers.Returns(new List()); + + ui.AddServer(req, routePrefix, optionsSet ? options : null); var fi = ui.GetType().GetField("_swaggerUiApiPrefix", BindingFlags.Instance | BindingFlags.NonPublic); @@ -207,8 +202,8 @@ public void Given_Options_When_IsAuthKeyRequired_Invoked_Then_It_Should_Return_R [DataRow("queryKey", OpenApiAuthLevelType.User, null, "queryKey")] [DataRow("queryKey", OpenApiAuthLevelType.User, "", "queryKey")] [DataRow("", OpenApiAuthLevelType.User, "configKey", "configKey")] - [DataRow("", OpenApiAuthLevelType.User, null, "",true)] - [DataRow("", OpenApiAuthLevelType.User, "", "",true)] + [DataRow("", OpenApiAuthLevelType.User, null, "", true)] + [DataRow("", OpenApiAuthLevelType.User, "", "", true)] [DataRow(null, OpenApiAuthLevelType.Function, null, null, true)] [DataRow(null, OpenApiAuthLevelType.Function, null, "", true)] [DataRow(null, OpenApiAuthLevelType.Function, "configKey", "configKey")] @@ -216,8 +211,8 @@ public void Given_Options_When_IsAuthKeyRequired_Invoked_Then_It_Should_Return_R [DataRow("queryKey", OpenApiAuthLevelType.Function, null, "queryKey")] [DataRow("queryKey", OpenApiAuthLevelType.Function, "", "queryKey")] [DataRow("", OpenApiAuthLevelType.Function, "configKey", "configKey")] - [DataRow("", OpenApiAuthLevelType.Function, null, "",true)] - [DataRow("", OpenApiAuthLevelType.Function, "", "",true)] + [DataRow("", OpenApiAuthLevelType.Function, null, "", true)] + [DataRow("", OpenApiAuthLevelType.Function, "", "", true)] [DataRow(null, OpenApiAuthLevelType.System, null, null, true)] [DataRow(null, OpenApiAuthLevelType.System, null, "", true)] [DataRow(null, OpenApiAuthLevelType.System, "configKey", "configKey")] @@ -225,8 +220,8 @@ public void Given_Options_When_IsAuthKeyRequired_Invoked_Then_It_Should_Return_R [DataRow("queryKey", OpenApiAuthLevelType.System, null, "queryKey")] [DataRow("queryKey", OpenApiAuthLevelType.System, "", "queryKey")] [DataRow("", OpenApiAuthLevelType.System, "configKey", "configKey")] - [DataRow("", OpenApiAuthLevelType.System, null, "",true)] - [DataRow("", OpenApiAuthLevelType.System, "", "",true)] + [DataRow("", OpenApiAuthLevelType.System, null, "", true)] + [DataRow("", OpenApiAuthLevelType.System, "", "", true)] [DataRow(null, OpenApiAuthLevelType.Admin, null, null, true)] [DataRow(null, OpenApiAuthLevelType.Admin, null, "", true)] [DataRow(null, OpenApiAuthLevelType.Admin, "configKey", "configKey")] @@ -234,8 +229,8 @@ public void Given_Options_When_IsAuthKeyRequired_Invoked_Then_It_Should_Return_R [DataRow("queryKey", OpenApiAuthLevelType.Admin, null, "queryKey")] [DataRow("queryKey", OpenApiAuthLevelType.Admin, "", "queryKey")] [DataRow("", OpenApiAuthLevelType.Admin, "configKey", "configKey")] - [DataRow("", OpenApiAuthLevelType.Admin, null, "",true)] - [DataRow("", OpenApiAuthLevelType.Admin, "", "",true)] + [DataRow("", OpenApiAuthLevelType.Admin, null, "", true)] + [DataRow("", OpenApiAuthLevelType.Admin, "", "", true)] public async Task Given_AuthKey_Options_When_RenderAsync_Invoked_Then_It_Should_Be_Used_As_Request_Key( string queryKey, OpenApiAuthLevelType configuredAuthLevel, string configKey, string expectedRequestKey, bool throwsException = false) @@ -252,9 +247,9 @@ public async Task Given_AuthKey_Options_When_RenderAsync_Invoked_Then_It_Should_ { queryDict["code"] = queryKey; } - var req = new Mock(); - req.SetupGet(p => p.Query).Returns(new QueryCollection(queryDict)); - uiType.GetField("_req", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(ui, req.Object); + var req = Substitute.For(); + req.Query.Returns(new QueryCollection(queryDict)); + uiType.GetField("_req", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(ui, req); //Set BaseUrl uiType.GetField("_baseUrl", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(ui, baseUrl);