From 6e18fc2f74fa3270800b09bdd41aa485a338d3b6 Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Sat, 4 Apr 2015 01:24:42 -0700 Subject: [PATCH] Reacting to ILogger api changes --- .../RouteCollectionTest.cs | 12 ++++++------ .../RouterMiddlewareTest.cs | 12 ++++++------ .../Template/TemplateRouteTest.cs | 18 +++++++++--------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs b/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs index 4d813c6208..e723f4677c 100644 --- a/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs +++ b/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs @@ -125,13 +125,13 @@ namespace Microsoft.AspNet.Routing Assert.Single(sink.Scopes); var scope = sink.Scopes[0]; Assert.Equal(typeof(RouteCollection).FullName, scope.LoggerName); - Assert.Equal("RouteCollection.RouteAsync", scope.Scope); + Assert.Equal("RouteCollection.RouteAsync", scope.Scope.ToString()); Assert.Single(sink.Writes); var write = sink.Writes[0]; Assert.Equal(typeof(RouteCollection).FullName, write.LoggerName); - Assert.Equal("RouteCollection.RouteAsync", write.Scope); + Assert.Equal("RouteCollection.RouteAsync", write.Scope.ToString()); var values = Assert.IsType(write.State); Assert.Equal("RouteCollection.RouteAsync", values.Name); Assert.NotNull(values.Routes); @@ -148,7 +148,7 @@ namespace Microsoft.AspNet.Routing Assert.Single(sink.Scopes); var scope = sink.Scopes[0]; Assert.Equal(typeof(RouteCollection).FullName, scope.LoggerName); - Assert.Equal("RouteCollection.RouteAsync", scope.Scope); + Assert.Equal("RouteCollection.RouteAsync", scope.Scope.ToString()); Assert.Empty(sink.Writes); } @@ -163,14 +163,14 @@ namespace Microsoft.AspNet.Routing Assert.Single(sink.Scopes); var scope = sink.Scopes[0]; Assert.Equal(typeof(RouteCollection).FullName, scope.LoggerName); - Assert.Equal("RouteCollection.RouteAsync", scope.Scope); + Assert.Equal("RouteCollection.RouteAsync", scope.Scope.ToString()); // There is a record for IsEnabled and one for WriteCore. Assert.Single(sink.Writes); var write = sink.Writes[0]; Assert.Equal(typeof(RouteCollection).FullName, write.LoggerName); - Assert.Equal("RouteCollection.RouteAsync", write.Scope); + Assert.Equal("RouteCollection.RouteAsync", write.Scope.ToString()); var values = Assert.IsType(write.State); Assert.Equal("RouteCollection.RouteAsync", values.Name); Assert.NotNull(values.Routes); @@ -187,7 +187,7 @@ namespace Microsoft.AspNet.Routing Assert.Single(sink.Scopes); var scope = sink.Scopes[0]; Assert.Equal(typeof(RouteCollection).FullName, scope.LoggerName); - Assert.Equal("RouteCollection.RouteAsync", scope.Scope); + Assert.Equal("RouteCollection.RouteAsync", scope.Scope.ToString()); Assert.Empty(sink.Writes); } diff --git a/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs b/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs index 75bc99f374..21d13e8b6b 100644 --- a/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs +++ b/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs @@ -43,13 +43,13 @@ namespace Microsoft.AspNet.Routing Assert.Single(sink.Scopes); var scope = sink.Scopes[0]; Assert.Equal(typeof(RouterMiddleware).FullName, scope.LoggerName); - Assert.Equal("RouterMiddleware.Invoke", scope.Scope); + Assert.Equal("RouterMiddleware.Invoke", scope.Scope.ToString()); Assert.Single(sink.Writes); var write = sink.Writes[0]; Assert.Equal(typeof(RouterMiddleware).FullName, write.LoggerName); - Assert.Equal("RouterMiddleware.Invoke", write.Scope); + Assert.Equal("RouterMiddleware.Invoke", write.Scope.ToString()); var values = Assert.IsType(write.State); Assert.Equal("RouterMiddleware.Invoke", values.Name); Assert.Equal(false, values.Handled); @@ -85,7 +85,7 @@ namespace Microsoft.AspNet.Routing Assert.Single(sink.Scopes); var scope = sink.Scopes[0]; Assert.Equal(typeof(RouterMiddleware).FullName, scope.LoggerName); - Assert.Equal("RouterMiddleware.Invoke", scope.Scope); + Assert.Equal("RouterMiddleware.Invoke", scope.Scope.ToString()); Assert.Empty(sink.Writes); } @@ -122,13 +122,13 @@ namespace Microsoft.AspNet.Routing Assert.Single(sink.Scopes); var scope = sink.Scopes[0]; Assert.Equal(typeof(RouterMiddleware).FullName, scope.LoggerName); - Assert.Equal("RouterMiddleware.Invoke", scope.Scope); + Assert.Equal("RouterMiddleware.Invoke", scope.Scope.ToString()); Assert.Single(sink.Writes); var write = sink.Writes[0]; Assert.Equal(typeof(RouterMiddleware).FullName, write.LoggerName); - Assert.Equal("RouterMiddleware.Invoke", write.Scope); + Assert.Equal("RouterMiddleware.Invoke", write.Scope.ToString()); Assert.Equal(typeof(RouterMiddlewareInvokeValues), write.State.GetType()); var values = (RouterMiddlewareInvokeValues)write.State; Assert.Equal("RouterMiddleware.Invoke", values.Name); @@ -166,7 +166,7 @@ namespace Microsoft.AspNet.Routing Assert.Single(sink.Scopes); var scope = sink.Scopes[0]; Assert.Equal(typeof(RouterMiddleware).FullName, scope.LoggerName); - Assert.Equal("RouterMiddleware.Invoke", scope.Scope); + Assert.Equal("RouterMiddleware.Invoke", scope.Scope.ToString()); Assert.Empty(sink.Writes); } diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs index 9cd30732f1..0c4c1ee8e8 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs +++ b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs @@ -74,13 +74,13 @@ namespace Microsoft.AspNet.Routing.Template Assert.Equal(1, sink.Scopes.Count); var scope = sink.Scopes[0]; Assert.Equal(typeof(TemplateRoute).FullName, scope.LoggerName); - Assert.Equal("TemplateRoute.RouteAsync", scope.Scope); + Assert.Equal("TemplateRoute.RouteAsync", scope.Scope.ToString()); Assert.Equal(1, sink.Writes.Count); var write = sink.Writes[0]; Assert.Equal(typeof(TemplateRoute).FullName, write.LoggerName); - Assert.Equal("TemplateRoute.RouteAsync", write.Scope); + Assert.Equal("TemplateRoute.RouteAsync", write.Scope.ToString()); // verify WriteCore state contents var values = Assert.IsType(write.State); @@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Routing.Template Assert.Equal(1, sink.Scopes.Count); var scope = sink.Scopes[0]; Assert.Equal(typeof(TemplateRoute).FullName, scope.LoggerName); - Assert.Equal("TemplateRoute.RouteAsync", scope.Scope); + Assert.Equal("TemplateRoute.RouteAsync", scope.Scope.ToString()); Assert.Equal(0, sink.Writes.Count); } @@ -125,13 +125,13 @@ namespace Microsoft.AspNet.Routing.Template Assert.Equal(1, sink.Scopes.Count); var scope = sink.Scopes[0]; Assert.Equal(typeof(TemplateRoute).FullName, scope.LoggerName); - Assert.Equal("TemplateRoute.RouteAsync", scope.Scope); + Assert.Equal("TemplateRoute.RouteAsync", scope.Scope.ToString()); Assert.Equal(1, sink.Writes.Count); var write = sink.Writes[0]; Assert.Equal(typeof(TemplateRoute).FullName, write.LoggerName); - Assert.Equal("TemplateRoute.RouteAsync", write.Scope); + Assert.Equal("TemplateRoute.RouteAsync", write.Scope.ToString()); var values = Assert.IsType(write.State); Assert.Equal("TemplateRoute.RouteAsync", values.Name); Assert.Equal("Home/Index/Failure", values.RequestPath); @@ -156,7 +156,7 @@ namespace Microsoft.AspNet.Routing.Template Assert.Equal(1, sink.Scopes.Count); var scope = sink.Scopes[0]; Assert.Equal(typeof(TemplateRoute).FullName, scope.LoggerName); - Assert.Equal("TemplateRoute.RouteAsync", scope.Scope); + Assert.Equal("TemplateRoute.RouteAsync", scope.Scope.ToString()); Assert.Equal(0, sink.Writes.Count); } @@ -174,13 +174,13 @@ namespace Microsoft.AspNet.Routing.Template Assert.Equal(1, sink.Scopes.Count); var scope = sink.Scopes[0]; Assert.Equal(typeof(TemplateRoute).FullName, scope.LoggerName); - Assert.Equal("TemplateRoute.RouteAsync", scope.Scope); + Assert.Equal("TemplateRoute.RouteAsync", scope.Scope.ToString()); Assert.Equal(1, sink.Writes.Count); var write = sink.Writes[0]; Assert.Equal(typeof(TemplateRoute).FullName, write.LoggerName); - Assert.Equal("TemplateRoute.RouteAsync", write.Scope); + Assert.Equal("TemplateRoute.RouteAsync", write.Scope.ToString()); var values = Assert.IsType(write.State); Assert.Equal("TemplateRoute.RouteAsync", values.Name); Assert.Equal("Home/Index/Failure", values.RequestPath); @@ -483,7 +483,7 @@ namespace Microsoft.AspNet.Routing.Template Assert.Equal(1, sink.Scopes.Count); var scope = sink.Scopes[0]; Assert.Equal(typeof(TemplateRoute).FullName, scope.LoggerName); - Assert.Equal("TemplateRoute.RouteAsync", scope.Scope); + Assert.Equal("TemplateRoute.RouteAsync", scope.Scope.ToString()); Assert.Equal(0, sink.Writes.Count); }