Rename all ReRoute to Route to move closer to YARP +semver: breaking

test/Ocelot.UnitTests/DownstreamPathManipulation/ClaimsToDownstreamPathMiddlewareTests.cs

@@ -1,104 +1,104 @@
-using Microsoft.AspNetCore.Http;
-namespace Ocelot.UnitTests.DownstreamPathManipulation
-{
-    using Ocelot.DownstreamPathManipulation.Middleware;
-    using Ocelot.Infrastructure.RequestData;
-    using Moq;
-    using Ocelot.Configuration;
-    using Ocelot.Configuration.Builder;
-    using Ocelot.DownstreamRouteFinder;
-    using Ocelot.DownstreamRouteFinder.UrlMatcher;
-    using Ocelot.Logging;
-    using Ocelot.Middleware;
-    using Ocelot.PathManipulation;
-    using Ocelot.Request.Middleware;
-    using Ocelot.Responses;
-    using Ocelot.Values;
-    using System.Collections.Generic;
-    using System.Net.Http;
-    using System.Security.Claims;
-    using System.Threading.Tasks;
-    using TestStack.BDDfy;
+using Microsoft.AspNetCore.Http;
+namespace Ocelot.UnitTests.DownstreamPathManipulation
+{
+    using Ocelot.DownstreamPathManipulation.Middleware;
+    using Ocelot.Infrastructure.RequestData;
+    using Moq;
+    using Ocelot.Configuration;
+    using Ocelot.Configuration.Builder;
+    using Ocelot.DownstreamRouteFinder;
+    using Ocelot.DownstreamRouteFinder.UrlMatcher;
+    using Ocelot.Logging;
+    using Ocelot.Middleware;
+    using Ocelot.PathManipulation;
+    using Ocelot.Request.Middleware;
+    using Ocelot.Responses;
+    using Ocelot.Values;
+    using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Security.Claims;
+    using System.Threading.Tasks;
+    using TestStack.BDDfy;
     using Xunit;
     using Ocelot.DownstreamRouteFinder.Middleware;
 
-    public class ClaimsToDownstreamPathMiddlewareTests
-    {
-        private readonly Mock<IChangeDownstreamPathTemplate> _changePath;
-        private Mock<IOcelotLoggerFactory> _loggerFactory;
-        private Mock<IOcelotLogger> _logger;
-        private ClaimsToDownstreamPathMiddleware _middleware;
-        private RequestDelegate _next;
-        private HttpContext _httpContext;
-
-        public ClaimsToDownstreamPathMiddlewareTests()
-        {
-            _httpContext = new DefaultHttpContext();
-            _loggerFactory = new Mock<IOcelotLoggerFactory>();
-            _logger = new Mock<IOcelotLogger>();
-            _loggerFactory.Setup(x => x.CreateLogger<ClaimsToDownstreamPathMiddleware>()).Returns(_logger.Object);
-            _next = context => Task.CompletedTask;
+    public class ClaimsToDownstreamPathMiddlewareTests
+    {
+        private readonly Mock<IChangeDownstreamPathTemplate> _changePath;
+        private Mock<IOcelotLoggerFactory> _loggerFactory;
+        private Mock<IOcelotLogger> _logger;
+        private ClaimsToDownstreamPathMiddleware _middleware;
+        private RequestDelegate _next;
+        private HttpContext _httpContext;
+
+        public ClaimsToDownstreamPathMiddlewareTests()
+        {
+            _httpContext = new DefaultHttpContext();
+            _loggerFactory = new Mock<IOcelotLoggerFactory>();
+            _logger = new Mock<IOcelotLogger>();
+            _loggerFactory.Setup(x => x.CreateLogger<ClaimsToDownstreamPathMiddleware>()).Returns(_logger.Object);
+            _next = context => Task.CompletedTask;
             _changePath = new Mock<IChangeDownstreamPathTemplate>();
-            _httpContext.Items.UpsertDownstreamRequest(new DownstreamRequest(new HttpRequestMessage(HttpMethod.Get, "http://test.com")));
-            _middleware = new ClaimsToDownstreamPathMiddleware(_next, _loggerFactory.Object, _changePath.Object);
-        }
-
-        [Fact]
-        public void should_call_add_queries_correctly()
-        {
-            var downstreamRoute = new DownstreamRoute(new List<PlaceholderNameAndValue>(),
-                new ReRouteBuilder()
-                    .WithDownstreamReRoute(new DownstreamReRouteBuilder()
-                        .WithDownstreamPathTemplate("any old string")
-                        .WithClaimsToDownstreamPath(new List<ClaimToThing>
-                        {
-                            new ClaimToThing("UserId", "Subject", "", 0),
-                        })
-                        .WithUpstreamHttpMethod(new List<string> { "Get" })
-                        .Build())
-                    .WithUpstreamHttpMethod(new List<string> { "Get" })
-                    .Build());
-
-            this.Given(x => x.GivenTheDownStreamRouteIs(downstreamRoute))
-               .And(x => x.GivenTheChangeDownstreamPathReturnsOk())
-               .When(x => x.WhenICallTheMiddleware())
-               .Then(x => x.ThenChangeDownstreamPathIsCalledCorrectly())
-               .BDDfy();
-
-        }
-
-        private void WhenICallTheMiddleware()
-        {
-            _middleware.Invoke(_httpContext).GetAwaiter().GetResult();
-        }
-
-        private void GivenTheChangeDownstreamPathReturnsOk()
-        {
-            _changePath
-                .Setup(x => x.ChangeDownstreamPath(
-                    It.IsAny<List<ClaimToThing>>(),
-                    It.IsAny<IEnumerable<Claim>>(),
-                    It.IsAny<DownstreamPathTemplate>(),
-                    It.IsAny<List<PlaceholderNameAndValue>>()))
-                .Returns(new OkResponse());
-        }
-
-        private void ThenChangeDownstreamPathIsCalledCorrectly()
-        {
-            _changePath
-                .Verify(x => x.ChangeDownstreamPath(
-                    It.IsAny<List<ClaimToThing>>(),
-                    It.IsAny<IEnumerable<Claim>>(),
-                    _httpContext.Items.DownstreamReRoute().DownstreamPathTemplate,
-                    _httpContext.Items.TemplatePlaceholderNameAndValues()), Times.Once);
-        }
-
-        private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute)
-        {
+            _httpContext.Items.UpsertDownstreamRequest(new DownstreamRequest(new HttpRequestMessage(HttpMethod.Get, "http://test.com")));
+            _middleware = new ClaimsToDownstreamPathMiddleware(_next, _loggerFactory.Object, _changePath.Object);
+        }
+
+        [Fact]
+        public void should_call_add_queries_correctly()
+        {
+            var downstreamRoute = new Ocelot.DownstreamRouteFinder.DownstreamRouteHolder(new List<PlaceholderNameAndValue>(),
+                new RouteBuilder()
+                    .WithDownstreamRoute(new DownstreamRouteBuilder()
+                        .WithDownstreamPathTemplate("any old string")
+                        .WithClaimsToDownstreamPath(new List<ClaimToThing>
+                        {
+                            new ClaimToThing("UserId", "Subject", "", 0),
+                        })
+                        .WithUpstreamHttpMethod(new List<string> { "Get" })
+                        .Build())
+                    .WithUpstreamHttpMethod(new List<string> { "Get" })
+                    .Build());
+
+            this.Given(x => x.GivenTheDownStreamRouteIs(downstreamRoute))
+               .And(x => x.GivenTheChangeDownstreamPathReturnsOk())
+               .When(x => x.WhenICallTheMiddleware())
+               .Then(x => x.ThenChangeDownstreamPathIsCalledCorrectly())
+               .BDDfy();
+
+        }
+
+        private void WhenICallTheMiddleware()
+        {
+            _middleware.Invoke(_httpContext).GetAwaiter().GetResult();
+        }
+
+        private void GivenTheChangeDownstreamPathReturnsOk()
+        {
+            _changePath
+                .Setup(x => x.ChangeDownstreamPath(
+                    It.IsAny<List<ClaimToThing>>(),
+                    It.IsAny<IEnumerable<Claim>>(),
+                    It.IsAny<DownstreamPathTemplate>(),
+                    It.IsAny<List<PlaceholderNameAndValue>>()))
+                .Returns(new OkResponse());
+        }
+
+        private void ThenChangeDownstreamPathIsCalledCorrectly()
+        {
+            _changePath
+                .Verify(x => x.ChangeDownstreamPath(
+                    It.IsAny<List<ClaimToThing>>(),
+                    It.IsAny<IEnumerable<Claim>>(),
+                    _httpContext.Items.DownstreamRoute().DownstreamPathTemplate,
+                    _httpContext.Items.TemplatePlaceholderNameAndValues()), Times.Once);
+        }
+
+        private void GivenTheDownStreamRouteIs(Ocelot.DownstreamRouteFinder.DownstreamRouteHolder downstreamRoute)
+        {
             _httpContext.Items.UpsertTemplatePlaceholderNameAndValues(downstreamRoute.TemplatePlaceholderNameAndValues);
 
-            _httpContext.Items.UpsertDownstreamReRoute(downstreamRoute.ReRoute.DownstreamReRoute[0]);
-        }
-
-    }
-}
+            _httpContext.Items.UpsertDownstreamRoute(downstreamRoute.Route.DownstreamRoute[0]);
+        }
+
+    }
+}