Use a service provider in test fixtures

sliekens · Jun 14, 2019 · 9d4bf3b · 9d4bf3b
1 parent b396dbe
commit 9d4bf3b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 31 deletions.
diff --git a/GW2SDK.Tests/Features/Accounts.Achievements/Fixtures/AccountAchievementFixture.cs b/GW2SDK.Tests/Features/Accounts.Achievements/Fixtures/AccountAchievementFixture.cs
@@ -18,7 +18,7 @@ public class AccountAchievementFixture : IAsyncLifetime
 
         public async Task InitializeAsync()
         {
-            var http = HttpClientFactory.CreateDefault();
+            var http = new Container().Resolve<IHttpClientFactory>().CreateClient("GW2SDK");
             http.UseAccessToken(ConfigurationManager.Instance.ApiKeyFull);
 
             // Seed InMemoryColorDb with API data for later use in integration tests

diff --git a/GW2SDK.Tests/Features/Accounts/Fixtures/AccountFixture.cs b/GW2SDK.Tests/Features/Accounts/Fixtures/AccountFixture.cs
@@ -16,7 +16,7 @@ public class AccountFixture : IAsyncLifetime
 
         public async Task InitializeAsync()
         {
-            var http = HttpClientFactory.CreateDefault();
+            var http = new Container().Resolve<IHttpClientFactory>().CreateClient("GW2SDK");
 
             http.UseAccessToken(ConfigurationManager.Instance.ApiKeyBasic);
             var basic = await GetAccountRaw(http);

diff --git a/GW2SDK.Tests/Features/Builds/Fixtures/BuildFixture.cs b/GW2SDK.Tests/Features/Builds/Fixtures/BuildFixture.cs
@@ -1,6 +1,6 @@
-using System.Threading.Tasks;
+using System.Net.Http;
+using System.Threading.Tasks;
 using GW2SDK.Infrastructure.Builds;
-using GW2SDK.Tests.Shared;
 using Xunit;
 
 namespace GW2SDK.Tests.Features.Builds.Fixtures
@@ -11,7 +11,7 @@ public class BuildFixture : IAsyncLifetime
 
         public async Task InitializeAsync()
         {
-            var http = HttpClientFactory.CreateDefault();
+            var http = new Container().Resolve<IHttpClientFactory>().CreateClient("GW2SDK");
 
             using (var request = new GetBuildRequest())
             using (var response = await http.SendAsync(request).ConfigureAwait(false))

diff --git a/GW2SDK.Tests/Features/Subtokens/Fixtures/SubtokenFixture.cs b/GW2SDK.Tests/Features/Subtokens/Fixtures/SubtokenFixture.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Net.Http;
+using System.Threading.Tasks;
 using GW2SDK.Infrastructure.Subtokens;
 using GW2SDK.Tests.Shared;
 using Xunit;
@@ -11,7 +12,7 @@ public class SubtokenFixture : IAsyncLifetime
 
         public async Task InitializeAsync()
         {
-            var http = HttpClientFactory.CreateDefault();
+            var http = new Container().Resolve<IHttpClientFactory>().CreateClient("GW2SDK");
 
             using (var request = new CreateSubtokenRequest.Builder(ConfigurationManager.Instance.ApiKeyFull).GetRequest())
             using (var response = await http.SendAsync(request).ConfigureAwait(false))

diff --git a/GW2SDK.Tests/Features/Tokens/Fixtures/ApiKeyInfoFixture.cs b/GW2SDK.Tests/Features/Tokens/Fixtures/ApiKeyInfoFixture.cs
@@ -12,7 +12,7 @@ public class ApiKeyInfoFixture : IAsyncLifetime
 
         public async Task InitializeAsync()
         {
-            var http = HttpClientFactory.CreateDefault();
+            var http = new Container().Resolve<IHttpClientFactory>().CreateClient("GW2SDK");
 
             ApiKeyInfoJson = await GetTokenInfoJson(http, ConfigurationManager.Instance.ApiKeyFull);
         }

diff --git a/GW2SDK.Tests/Features/Tokens/Fixtures/SubtokenInfoFixture.cs b/GW2SDK.Tests/Features/Tokens/Fixtures/SubtokenInfoFixture.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Threading.Tasks;
 using GW2SDK.Features.Common;
 using GW2SDK.Features.Subtokens;
@@ -24,7 +25,7 @@ public class SubtokenInfoFixture : IAsyncLifetime
 
         public async Task InitializeAsync()
         {
-            var http = HttpClientFactory.CreateDefault();
+            var http = new Container().Resolve<IHttpClientFactory>().CreateClient("GW2SDK");
 
             var subtokenService = new SubtokenService(http);
 

diff --git a/GW2SDK.Tests/Features/Tokens/Fixtures/TokenInfoServiceFixture.cs b/GW2SDK.Tests/Features/Tokens/Fixtures/TokenInfoServiceFixture.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Net.Http;
+using System.Threading.Tasks;
 using GW2SDK.Features.Subtokens;
 using GW2SDK.Tests.Shared;
 using Xunit;
@@ -11,7 +12,7 @@ public class TokenInfoServiceFixture : IAsyncLifetime
 
         public async Task InitializeAsync()
         {
-            var http = HttpClientFactory.CreateDefault();
+            var http = new Container().Resolve<IHttpClientFactory>().CreateClient("GW2SDK");
 
             var subtokenService = new SubtokenService(http);
 

diff --git a/GW2SDK.Tests/Shared/HttpClientFactory.cs b/GW2SDK.Tests/Shared/HttpClientFactory.cs