#529 removed cache manager specific code (#535)

test/Ocelot.AcceptanceTests/Steps.cs

@@ -1,40 +1,35 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
-using CacheManager.Core;
-using IdentityServer4.AccessTokenValidation;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Ocelot.Configuration.File;
-using Ocelot.DependencyInjection;
-using Ocelot.Middleware;
-using Shouldly;
-using ConfigurationBuilder = Microsoft.Extensions.Configuration.ConfigurationBuilder;
-using Ocelot.AcceptanceTests.Caching;
-using System.IO.Compression;
-using System.Text;
-using static Ocelot.AcceptanceTests.HttpDelegatingHandlersTests;
-using Ocelot.Requester;
-using Ocelot.Middleware.Multiplexer;
-using static Ocelot.Infrastructure.Wait;
-
-namespace Ocelot.AcceptanceTests
+namespace Ocelot.AcceptanceTests
 {
-    using Butterfly;
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Net;
+    using System.Net.Http;
+    using System.Net.Http.Headers;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using IdentityServer4.AccessTokenValidation;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Hosting;
+    using Microsoft.AspNetCore.TestHost;
+    using Microsoft.Extensions.Configuration;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.Logging;
+    using Newtonsoft.Json;
+    using Ocelot.Configuration.File;
+    using Ocelot.DependencyInjection;
+    using Ocelot.Middleware;
+    using Shouldly;
+    using ConfigurationBuilder = Microsoft.Extensions.Configuration.ConfigurationBuilder;
+    using System.IO.Compression;
+    using System.Text;
+    using static Ocelot.AcceptanceTests.HttpDelegatingHandlersTests;
+    using Ocelot.Middleware.Multiplexer;
+    using static Ocelot.Infrastructure.Wait;
     using Configuration.Repository;
-    using Microsoft.Net.Http.Headers;
     using Ocelot.Configuration.Creator;
+    using CookieHeaderValue = System.Net.Http.Headers.CookieHeaderValue;
     using MediaTypeHeaderValue = System.Net.Http.Headers.MediaTypeHeaderValue;
 
     public class Steps : IDisposable
@@ -44,7 +39,6 @@ namespace Ocelot.AcceptanceTests
         private HttpResponseMessage _response;
         private HttpContent _postContent;
         private BearerToken _token;
-        public HttpClient OcelotClient => _ocelotClient;
         public string RequestIdKey = "OcRequestId";
         private readonly Random _random;
         private IWebHostBuilder _webHostBuilder;
@@ -428,55 +422,6 @@ namespace Ocelot.AcceptanceTests
             header.First().ShouldBe(value);
         }
 
-        public void ThenTheResponseBodyHeaderIs(string key, string value)
-        {
-            var header = _response.Content.Headers.GetValues(key);
-            header.First().ShouldBe(value);
-        }
-
-        public void ThenTheTraceHeaderIsSet(string key)
-        {
-            var header = _response.Headers.GetValues(key);
-            header.First().ShouldNotBeNullOrEmpty();
-        }
-
-        public void GivenOcelotIsRunningUsingJsonSerializedCache()
-        {
-            _webHostBuilder = new WebHostBuilder();
-
-            _webHostBuilder
-                .ConfigureAppConfiguration((hostingContext, config) =>
-                {
-                    config.SetBasePath(hostingContext.HostingEnvironment.ContentRootPath);
-                    var env = hostingContext.HostingEnvironment;
-                    config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: false)
-                        .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: false);
-                    config.AddJsonFile("ocelot.json", false, false);
-                    config.AddEnvironmentVariables();
-                })
-                .ConfigureServices(s =>
-                {
-                    s.AddOcelot()
-                        .AddCacheManager((x) =>
-                        {
-                            x.WithMicrosoftLogging(log =>
-                                {
-                                    log.AddConsole(LogLevel.Debug);
-                                })
-                                .WithJsonSerializer()
-                                .WithHandle(typeof(InMemoryJsonHandle<>));
-                        });
-                })
-                .Configure(app =>
-                {
-                    app.UseOcelot().Wait();
-                }); 
-
-            _ocelotServer = new TestServer(_webHostBuilder);
-
-            _ocelotClient = _ocelotServer.CreateClient();
-        }
-
         public void GivenOcelotIsRunningUsingConsulToStoreConfig()
         {
             _webHostBuilder = new WebHostBuilder();
@@ -505,69 +450,6 @@ namespace Ocelot.AcceptanceTests
             _ocelotClient = _ocelotServer.CreateClient();
         }
 
-        public void GivenOcelotIsRunningUsingConsulToStoreConfigAndJsonSerializedCache()
-        {
-            _webHostBuilder = new WebHostBuilder();
-
-            _webHostBuilder
-                .ConfigureAppConfiguration((hostingContext, config) =>
-                {
-                    config.SetBasePath(hostingContext.HostingEnvironment.ContentRootPath);
-                    var env = hostingContext.HostingEnvironment;
-                    config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: false)
-                        .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: false);
-                    config.AddJsonFile("ocelot.json", optional: true, reloadOnChange: false);
-                    config.AddEnvironmentVariables();
-                })
-                .ConfigureServices(s =>
-                {
-                    s.AddOcelot()
-                        .AddCacheManager((x) =>
-                        {
-                            x.WithMicrosoftLogging(log =>
-                                {
-                                    log.AddConsole(LogLevel.Debug);
-                                })
-                                .WithJsonSerializer()
-                                .WithHandle(typeof(InMemoryJsonHandle<>));
-                        })
-                        .AddStoreOcelotConfigurationInConsul();
-                })
-                .Configure(app =>
-                {
-                    app.UseOcelot().Wait();
-                }); 
-
-            _ocelotServer = new TestServer(_webHostBuilder);
-
-            _ocelotClient = _ocelotServer.CreateClient();
-        }
-
-        internal void ThenTheResponseShouldBe(FileConfiguration expecteds)
-        {
-            var response = JsonConvert.DeserializeObject<FileConfiguration>(_response.Content.ReadAsStringAsync().Result);
-
-            response.GlobalConfiguration.RequestIdKey.ShouldBe(expecteds.GlobalConfiguration.RequestIdKey);
-            response.GlobalConfiguration.ServiceDiscoveryProvider.Host.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Host);
-            response.GlobalConfiguration.ServiceDiscoveryProvider.Port.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Port);
-
-            for (var i = 0; i < response.ReRoutes.Count; i++)
-            {
-                for (var j = 0; j < response.ReRoutes[i].DownstreamHostAndPorts.Count; j++)
-                {
-                    var result = response.ReRoutes[i].DownstreamHostAndPorts[j];
-                    var expected = expecteds.ReRoutes[i].DownstreamHostAndPorts[j];
-                    result.Host.ShouldBe(expected.Host);
-                    result.Port.ShouldBe(expected.Port);
-                }
-
-                response.ReRoutes[i].DownstreamPathTemplate.ShouldBe(expecteds.ReRoutes[i].DownstreamPathTemplate);
-                response.ReRoutes[i].DownstreamScheme.ShouldBe(expecteds.ReRoutes[i].DownstreamScheme);
-                response.ReRoutes[i].UpstreamPathTemplate.ShouldBe(expecteds.ReRoutes[i].UpstreamPathTemplate);
-                response.ReRoutes[i].UpstreamHttpMethod.ShouldBe(expecteds.ReRoutes[i].UpstreamHttpMethod);
-            }
-        }
-
         /// <summary>
         /// This is annoying cos it should be in the constructor but we need to set up the file before calling startup so its a step.
         /// </summary>
@@ -590,15 +472,6 @@ namespace Ocelot.AcceptanceTests
                 .UseConfiguration(configuration)
                 .ConfigureServices(s =>
                 {
-                    Action<ConfigurationBuilderCachePart> settings = (x) =>
-                    {
-                        x.WithMicrosoftLogging(log =>
-                        {
-                            log.AddConsole(LogLevel.Debug);
-                        })
-                        .WithDictionaryHandle();
-                    };
-
                     s.AddOcelot(configuration);
                 })
                 .ConfigureLogging(l =>
@@ -688,26 +561,6 @@ namespace Ocelot.AcceptanceTests
             }
         }
 
-        public void GivenIHaveAnOcelotToken(string adminPath)
-        {
-            var tokenUrl = $"{adminPath}/connect/token";
-            var formData = new List<KeyValuePair<string, string>>
-            {
-                new KeyValuePair<string, string>("client_id", "admin"),
-                new KeyValuePair<string, string>("client_secret", "secret"),
-                new KeyValuePair<string, string>("scope", "admin"),
-                new KeyValuePair<string, string>("username", "admin"),
-                new KeyValuePair<string, string>("password", "admin"),
-                new KeyValuePair<string, string>("grant_type", "password")
-            };
-            var content = new FormUrlEncodedContent(formData);
-
-            var response = _ocelotClient.PostAsync(tokenUrl, content).Result;
-            var responseContent = response.Content.ReadAsStringAsync().Result;
-            response.EnsureSuccessStatusCode();
-            _token = JsonConvert.DeserializeObject<BearerToken>(responseContent);
-        }
-
         public void VerifyIdentiryServerStarted(string url)
         {
             using (var httpClient = new HttpClient())
@@ -883,11 +736,6 @@ namespace Ocelot.AcceptanceTests
             _response.Headers.GetValues(RequestIdKey).First().ShouldBe(expected);
         }
 
-        public void ThenTheContentLengthIs(int expected)
-        {
-            _response.Content.Headers.ContentLength.ShouldBe(expected);
-        }
-
         public void WhenIMakeLotsOfDifferentRequestsToTheApiGateway()
         {
             int numberOfRequests = 100;