wip tests failing

src/Ocelot.Provider.Eureka/Eureka.cs

@@ -1,11 +1,11 @@
 namespace Ocelot.Provider.Eureka
 {
-    using ServiceDiscovery.Providers;
+    using Ocelot.ServiceDiscovery.Providers;
-    using Steeltoe.Common.Discovery;
+    using Steeltoe.Discovery;
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using Values;
+    using Ocelot.Values;
 
     public class Eureka : IServiceDiscoveryProvider
     {

src/Ocelot.Provider.Eureka/EurekaProviderFactory.cs

@@ -1,8 +1,8 @@
 namespace Ocelot.Provider.Eureka
 {
     using Microsoft.Extensions.DependencyInjection;
-    using ServiceDiscovery;
+    using Ocelot.ServiceDiscovery;
-    using Steeltoe.Common.Discovery;
+    using Steeltoe.Discovery;
 
     public static class EurekaProviderFactory
     {

src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj

@@ -27,7 +27,7 @@
     <ProjectReference Include="..\Ocelot\Ocelot.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Steeltoe.Discovery.ClientCore" Version="2.4.2" />
+    <PackageReference Include="Steeltoe.Discovery.ClientCore" Version="3.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

test/Ocelot.AcceptanceTests/ClaimsToDownstreamPathTests.cs

@@ -96,10 +96,15 @@ namespace Ocelot.AcceptanceTests
                 .When(x => _steps.WhenIGetUrlOnTheApiGateway("/users"))
                 .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
                 .And(x => _steps.ThenTheResponseBodyShouldBe("UserId: 1231231"))
-                .And(x => _downstreamFinalPath.ShouldBe("/users/1231231"))
+                .And(x => ThenTheDownstreamPathIs("/users/1231231"))
                 .BDDfy();
         }
 
+        private void ThenTheDownstreamPathIs(string path)
+        {
+            _downstreamFinalPath.ShouldBe(path);
+        }
+
         private void GivenThereIsAServiceRunningOn(string url, int statusCode)
         {
             _servicebuilder = new WebHostBuilder()

test/Ocelot.AcceptanceTests/ClaimsToQueryStringForwardingTests.cs

@@ -172,10 +172,15 @@ namespace Ocelot.AcceptanceTests
                 .When(x => _steps.WhenIGetUrlOnTheApiGateway("/?test=1&test=2"))
                 .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
                 .And(x => _steps.ThenTheResponseBodyShouldBe("CustomerId: 123 LocationId: 1 UserType: registered UserId: 1231231"))
-                .And(_ => _downstreamQueryString.ShouldBe("?test=1&test=2&CustomerId=123&LocationId=1&UserId=1231231&UserType=registered"))
+                .And(_ => ThenTheQueryStringIs("?test=1&test=2&CustomerId=123&LocationId=1&UserId=1231231&UserType=registered"))
                 .BDDfy();
         }
 
+        private void ThenTheQueryStringIs(string queryString)
+        {
+            _downstreamQueryString.ShouldBe(queryString);
+        }
+
         private void GivenThereIsAServiceRunningOn(string url, int statusCode)
         {
             _servicebuilder = new WebHostBuilder()

test/Ocelot.AcceptanceTests/HttpClientCachingTests.cs

@@ -62,7 +62,7 @@ namespace Ocelot.AcceptanceTests
                 .When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
                 .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
                 .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
-                .And(x => cache.Count.ShouldBe(1))
+                .And(x => ThenTheCountShouldBe(cache, 1))
                 .BDDfy();
         }
 
@@ -122,10 +122,15 @@ namespace Ocelot.AcceptanceTests
                 .When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
                 .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
                 .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
-                .And(x => cache.Count.ShouldBe(2))
+                .And(x => ThenTheCountShouldBe(cache, 2))
                 .BDDfy();
         }
 
+        private void ThenTheCountShouldBe(FakeHttpClientCache cache, int count)
+        {
+            cache.Count.ShouldBe(count);
+        }
+
         private void GivenThereIsAServiceRunningOn(string baseUrl, int statusCode, string responseBody)
         {
             _serviceHandler.GivenThereIsAServiceRunningOn(baseUrl, async context =>

test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj

@@ -46,7 +46,7 @@
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -59,7 +59,7 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
-    <PackageReference Include="Shouldly" Version="4.0.0-beta0002" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
     <PackageReference Include="TestStack.BDDfy" Version="4.3.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="Butterfly.Client.AspNetCore" Version="0.0.8" />
@@ -68,7 +68,7 @@
     <PackageReference Include="Consul" Version="1.6.1.1" />
     <PackageReference Include="CacheManager.Microsoft.Extensions.Logging" Version="2.0.0-beta-1629" />
     <PackageReference Include="CacheManager.Serialization.Json" Version="2.0.0-beta-1629" />
-    <PackageReference Include="Steeltoe.Discovery.ClientCore" Version="2.4.2" />
+    <PackageReference Include="Steeltoe.Discovery.ClientCore" Version="3.0.1" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />

test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs

@@ -322,7 +322,7 @@
                 .When(_ => _steps.WhenIGetUrlOnTheApiGateway("/home"))
                 .Then(_ => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
                 .And(_ => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
-                .And(_ => _receivedToken.ShouldBe(token))
+                .And(_ => ThenTheTokenIs(token))
                 .BDDfy();
         }
 
@@ -464,6 +464,11 @@
             .BDDfy();
         }
 
+        private void ThenTheTokenIs(string token)
+        {
+            _receivedToken.ShouldBe(token);
+        }
+
         private void WhenIAddAServiceBackIn(ServiceEntry serviceEntryTwo)
         {
             _consulServices.Add(serviceEntryTwo);

test/Ocelot.AcceptanceTests/WebSocketTests.cs

@@ -57,7 +57,7 @@ namespace Ocelot.AcceptanceTests
                 .And(_ => _steps.StartFakeOcelotWithWebSockets())
                 .And(_ => StartFakeDownstreamService($"http://{downstreamHost}:{downstreamPort}", "/ws"))
                 .When(_ => StartClient("ws://localhost:5000/"))
-                .Then(_ => _firstRecieved.Count.ShouldBe(10))
+                .Then(_ => ThenTheReceivedCountIs(10))
                 .BDDfy();
         }
 
@@ -325,6 +325,10 @@ namespace Ocelot.AcceptanceTests
             }
         }
 
+        private void ThenTheReceivedCountIs(int count)
+        {
+            _firstRecieved.Count.ShouldBe(count);
+        }
         public void Dispose()
         {
             _serviceHandler?.Dispose();

test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj

@@ -35,7 +35,7 @@
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -48,7 +48,7 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="Shouldly" Version="4.0.0-beta0002" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
     <PackageReference Include="TestStack.BDDfy" Version="4.3.2" />
     <PackageReference Include="Microsoft.Data.SQLite" Version="5.0.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />

test/Ocelot.UnitTests/Consul/ConsulServiceDiscoveryProviderTests.cs

@@ -87,7 +87,7 @@
                     Address = "localhost",
                     Port = 50881,
                     ID = Guid.NewGuid().ToString(),
-                    Tags = new string[0]
+                    Tags = new string[0],
                 },
             };
 
@@ -95,7 +95,7 @@
                 .And(_ => GivenTheServicesAreRegisteredWithConsul(serviceEntryOne))
                 .When(_ => WhenIGetTheServices())
                 .Then(_ => ThenTheCountIs(1))
-                .And(_ => _receivedToken.ShouldBe(token))
+                .And(_ => ThenTheTokenIs(token))
                 .BDDfy();
         }
 
@@ -253,6 +253,11 @@
             _services = _provider.Get().GetAwaiter().GetResult();
         }
 
+        private void ThenTheTokenIs(string token)
+        {
+            _receivedToken.ShouldBe(token);
+        }
+
         private void GivenTheServicesAreRegisteredWithConsul(params ServiceEntry[] serviceEntries)
         {
             foreach (var serviceEntry in serviceEntries)

test/Ocelot.UnitTests/Eureka/EurekaMiddlewareConfigurationProviderTests.cs

@@ -6,10 +6,10 @@
     using Ocelot.Configuration;
     using Ocelot.Configuration.Builder;
     using Ocelot.Configuration.Repository;
-    using Provider.Eureka;
+    using Ocelot.Provider.Eureka;
-    using Responses;
+    using Ocelot.Responses;
     using Shouldly;
-    using Steeltoe.Common.Discovery;
+    using Steeltoe.Discovery;
     using System.Threading.Tasks;
     using Xunit;
 

test/Ocelot.UnitTests/Eureka/EurekaProviderFactoryTests.cs

@@ -5,7 +5,7 @@
     using Ocelot.Configuration.Builder;
     using Provider.Eureka;
     using Shouldly;
-    using Steeltoe.Common.Discovery;
+    using Steeltoe.Discovery;
     using Xunit;
 
     public class EurekaProviderFactoryTests

test/Ocelot.UnitTests/Eureka/EurekaServiceDiscoveryProviderTests.cs

@@ -1,14 +1,15 @@
 namespace Ocelot.UnitTests.Eureka
 {
     using Moq;
-    using Provider.Eureka;
+    using Ocelot.Provider.Eureka;
     using Shouldly;
     using Steeltoe.Common.Discovery;
+    using Steeltoe.Discovery;
     using System;
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using TestStack.BDDfy;
-    using Values;
+    using Ocelot.Values;
     using Xunit;
 
     public class EurekaServiceDiscoveryProviderTests

test/Ocelot.UnitTests/Headers/AddHeadersToRequestPlainTests.cs

@@ -1,6 +1,7 @@
 namespace Ocelot.UnitTests.Headers
 {
     using Microsoft.AspNetCore.Http;
+    using Microsoft.Extensions.Primitives;
     using Moq;
     using Ocelot.Configuration.Creator;
     using Ocelot.Headers;
@@ -114,7 +115,7 @@
             var requestHeaders = _context.Request.Headers;
             requestHeaders.ContainsKey(_addedHeader.Key).ShouldBeTrue($"Header {_addedHeader.Key} was expected but not there.");
             var value = requestHeaders[_addedHeader.Key];
-            value.ShouldNotBeNull($"Value of header {_addedHeader.Key} was expected to not be null.");
+            value.ShouldNotBe(default(StringValues), $"Value of header {_addedHeader.Key} was expected to not be null.");
             value.ToString().ShouldBe(_addedHeader.Value);
         }
 

test/Ocelot.UnitTests/Infrastructure/HttpDataRepositoryTests.cs

@@ -72,7 +72,7 @@ namespace Ocelot.UnitTests.Infrastructure
         private void ThenTheResultIsAnErrorReposnse<T>(object resultValue)
         {
             _result.ShouldBeOfType<ErrorResponse<T>>();
-            ((ErrorResponse<T>)_result).Data.ShouldBeNull();
+            ((ErrorResponse<T>)_result).Data.ShouldBe(default(T));
             ((ErrorResponse<T>)_result).IsError.ShouldBe(true);
             ((ErrorResponse<T>)_result).Errors.ShouldHaveSingleItem()
                 .ShouldBeOfType<CannotFindDataError>()

test/Ocelot.UnitTests/Kubernetes/KubeServiceDiscoveryProviderTests.cs

@@ -92,10 +92,15 @@ namespace Ocelot.UnitTests.Kubernetes
                 .And(x => GivenTheServicesAreRegisteredWithKube(endPointEntryOne))
                 .When(x => WhenIGetTheServices())
                 .Then(x => ThenTheCountIs(1))
-                .And(_ => _receivedToken.ShouldBe(token))
+                .And(_ => ThenTheTokenIs(token))
                 .BDDfy();
         }
 
+        private void ThenTheTokenIs(string token)
+        {
+            _receivedToken.ShouldBe(token);
+        }
+
         private void ThenTheCountIs(int count)
         {
             _services.Count.ShouldBe(count);

test/Ocelot.UnitTests/Ocelot.UnitTests.csproj

@@ -54,7 +54,7 @@
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -67,13 +67,13 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
     <PackageReference Include="Moq" Version="4.15.2" />
-    <PackageReference Include="Shouldly" Version="4.0.0-beta0002" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
     <PackageReference Include="TestStack.BDDfy" Version="4.3.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="Butterfly.Client.AspNetCore" Version="0.0.8" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
     <PackageReference Include="IdentityServer4" Version="3.1.1" />
-    <PackageReference Include="Steeltoe.Discovery.ClientCore" Version="2.4.2" />
+    <PackageReference Include="Steeltoe.Discovery.ClientCore" Version="3.0.1" />
     <PackageReference Include="Consul" Version="1.6.1.1" />
     <PackageReference Include="CacheManager.Core" Version="2.0.0-beta-1629" />
     <PackageReference Include="CacheManager.Microsoft.Extensions.Configuration" Version="2.0.0-beta-1629" />

test/Ocelot.UnitTests/Request/Mapper/RequestMapperTests.cs

@@ -452,7 +452,7 @@
             foreach (var header in _mappedRequest.Data.Headers)
             {
                 var inputHeader = _inputHeaders.First(h => h.Key == header.Key);
-                inputHeader.ShouldNotBeNull();
+                inputHeader.ShouldNotBe(default(KeyValuePair<string, StringValues>));
                 inputHeader.Value.Count().ShouldBe(header.Value.Count());
                 foreach (var inputHeaderValue in inputHeader.Value)
                 {