Use StripeClient instance in tests (#1634)

src/StripeTests/BaseStripeTest.cs

@@ -59,7 +59,7 @@ public BaseStripeTest(
                 // Set up StripeClient to use stripe-mock with the mock HTTP client
                 var httpClient = new SystemNetHttpClient(
                     new HttpClient(this.MockHttpClientFixture.MockHandler.Object));
-                StripeConfiguration.StripeClient = this.StripeMockFixture.BuildStripeClient(
+                this.StripeClient = this.StripeMockFixture.BuildStripeClient(
                     httpClient: httpClient);
 
                 // Reset the mock before each test
@@ -68,14 +68,14 @@ public BaseStripeTest(
             else if (this.StripeMockFixture != null)
             {
                 // Set up StripeClient to use stripe-mock
-                StripeConfiguration.StripeClient = this.StripeMockFixture.BuildStripeClient();
+                this.StripeClient = this.StripeMockFixture.BuildStripeClient();
             }
             else if (this.MockHttpClientFixture != null)
             {
                 // Set up StripeClient with the mock HTTP client
                 var httpClient = new SystemNetHttpClient(
                     new HttpClient(this.MockHttpClientFixture.MockHandler.Object));
-                StripeConfiguration.StripeClient = new StripeClient(
+                this.StripeClient = new StripeClient(
                     "sk_test_123",
                     httpClient: httpClient);
 
@@ -85,10 +85,12 @@ public BaseStripeTest(
             else
             {
                 // Use the default StripeClient
-                StripeConfiguration.StripeClient = null;
+                this.StripeClient = new StripeClient("sk_test_123");
             }
         }
 
+        protected IStripeClient StripeClient { get; }
+
         protected MockHttpClientFixture MockHttpClientFixture { get; }
 
         protected StripeMockFixture StripeMockFixture { get; }

src/StripeTests/Functional/NetworkRetriesTest.cs

@@ -17,12 +17,14 @@ public NetworkRetriesTest(MockHttpClientFixture mockHttpClientFixture)
         {
             StripeConfiguration.MaxNetworkRetries = 2;
             StripeConfiguration.NetworkRetriesSleep = false;
+            StripeConfiguration.StripeClient = this.StripeClient;
         }
 
         public void Dispose()
         {
             StripeConfiguration.MaxNetworkRetries = 0;
             StripeConfiguration.NetworkRetriesSleep = true;
+            StripeConfiguration.StripeClient = null;
             this.MockHttpClientFixture.Reset();
         }
 

src/StripeTests/Infrastructure/Public/StripeResponseTest.cs

@@ -22,7 +22,7 @@ public StripeResponseTest(StripeMockFixture stripeMockFixture)
         [Fact]
         public void Date()
         {
-            var response = new AccountService().GetSelf().StripeResponse;
+            var response = new AccountService { Client = this.StripeClient }.GetSelf().StripeResponse;
 
             Assert.NotNull(response.Date);
         }
@@ -31,23 +31,23 @@ public void Date()
         public void IdempotencyKey_Present()
         {
             var requestOptions = new RequestOptions { IdempotencyKey = "idempotency_key" };
-            var response = new AccountService().GetSelf(requestOptions).StripeResponse;
+            var response = new AccountService { Client = this.StripeClient }.GetSelf(requestOptions).StripeResponse;
 
             Assert.Equal("idempotency_key", response.IdempotencyKey);
         }
 
         [Fact]
         public void IdempotencyKey_Absent()
         {
-            var response = new AccountService().GetSelf().StripeResponse;
+            var response = new AccountService { Client = this.StripeClient }.GetSelf().StripeResponse;
 
             Assert.Null(response.IdempotencyKey);
         }
 
         [Fact]
         public void RequestId()
         {
-            var response = new AccountService().GetSelf().StripeResponse;
+            var response = new AccountService { Client = this.StripeClient }.GetSelf().StripeResponse;
 
             Assert.NotNull(response.RequestId);
         }

src/StripeTests/Infrastructure/Public/SystemNetHttpClientTest.cs

@@ -1,5 +1,6 @@
 namespace StripeTests
 {
+    using System;
     using System.Linq;
     using System.Net;
     using System.Net.Http;
@@ -12,11 +13,18 @@ namespace StripeTests
     using Stripe;
     using Xunit;
 
-    public class SystemNetHttpClientTest : BaseStripeTest
+    public class SystemNetHttpClientTest : BaseStripeTest, IDisposable
     {
         public SystemNetHttpClientTest(MockHttpClientFixture mockHttpClientFixture)
             : base(mockHttpClientFixture)
         {
+            // TODO: don't use StripeConfiguration
+            StripeConfiguration.StripeClient = this.StripeClient;
+        }
+
+        public void Dispose()
+        {
+            StripeConfiguration.StripeClient = null;
         }
 
         [Fact]

src/StripeTests/Infrastructure/StripeExceptionTest.cs

@@ -15,7 +15,10 @@ public StripeExceptionTest(StripeMockFixture stripeMockFixture)
         public async Task SetsStripeResponse()
         {
             var exception = await Assert.ThrowsAsync<StripeException>(async () =>
-                await new CouponService().CreateAsync(new CouponCreateOptions()));
+            {
+                await new CouponService { Client = this.StripeClient }
+                    .CreateAsync(new CouponCreateOptions());
+            });
 
             Assert.NotNull(exception);
             Assert.NotNull(exception.StripeError);

src/StripeTests/Services/AccountLinks/AccountLinkServiceTest.cs

@@ -17,7 +17,7 @@ public AccountLinkServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new AccountLinkService();
+            this.service = new AccountLinkService { Client = this.StripeClient };
 
             this.createOptions = new AccountLinkCreateOptions
             {

src/StripeTests/Services/Accounts/AccountServiceTest.cs

@@ -24,7 +24,7 @@ public AccountServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new AccountService();
+            this.service = new AccountService { Client = this.StripeClient };
 
             this.createOptions = new AccountCreateOptions
             {

src/StripeTests/Services/ApplePayDomains/ApplePayDomainServiceTest.cs

@@ -20,7 +20,7 @@ public ApplePayDomainServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new ApplePayDomainService();
+            this.service = new ApplePayDomainService { Client = this.StripeClient };
 
             this.createOptions = new ApplePayDomainCreateOptions
             {

src/StripeTests/Services/ApplicationFeeRefunds/ApplicationFeeRefundServiceTest.cs

@@ -23,7 +23,7 @@ public ApplicationFeeRefundServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new ApplicationFeeRefundService();
+            this.service = new ApplicationFeeRefundService { Client = this.StripeClient };
 
             this.createOptions = new ApplicationFeeRefundCreateOptions
             {

src/StripeTests/Services/ApplicationFees/ApplicationFeeServiceTest.cs

@@ -19,7 +19,7 @@ public ApplicationFeeServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new ApplicationFeeService();
+            this.service = new ApplicationFeeService { Client = this.StripeClient };
 
             this.listOptions = new ApplicationFeeListOptions
             {

src/StripeTests/Services/AutoPagingTest.cs

@@ -43,7 +43,7 @@ public void ListAutoPaging()
                 .Throws(new StripeTestException("Unexpected invocation!"));
 
             // Call auto-paging method
-            var service = new PageableService();
+            var service = new PageableService { Client = this.StripeClient };
             var options = new ListOptions
             {
                 Limit = 2,

src/StripeTests/Services/Balance/BalanceServiceTest.cs

@@ -16,7 +16,7 @@ public BalanceServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new BalanceService();
+            this.service = new BalanceService { Client = this.StripeClient };
         }
 
         [Fact]

src/StripeTests/Services/BalanceTransactions/BalanceTransactionServiceTest.cs

@@ -19,7 +19,7 @@ public BalanceTransactionServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new BalanceTransactionService();
+            this.service = new BalanceTransactionService { Client = this.StripeClient };
 
             this.listOptions = new BalanceTransactionListOptions
             {

src/StripeTests/Services/BankAccounts/BankAccountServiceTest.cs

@@ -24,7 +24,7 @@ public BankAccountServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new BankAccountService();
+            this.service = new BankAccountService { Client = this.StripeClient };
 
             this.createOptions = new BankAccountCreateOptions
             {

src/StripeTests/Services/Capabilities/CapabilityServiceTest.cs

@@ -21,7 +21,7 @@ public CapabilityServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new CapabilityService();
+            this.service = new CapabilityService { Client = this.StripeClient };
 
             this.updateOptions = new CapabilityUpdateOptions
             {

src/StripeTests/Services/Cards/CardServiceTest.cs

@@ -27,7 +27,7 @@ public CardServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new CardService();
+            this.service = new CardService { Client = this.StripeClient };
 
             this.createOptions = new CardCreateOptions
             {

src/StripeTests/Services/Charges/ChargeServiceTest.cs

@@ -23,7 +23,7 @@ public ChargeServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new ChargeService();
+            this.service = new ChargeService { Client = this.StripeClient };
 
             this.captureOptions = new ChargeCaptureOptions
             {

src/StripeTests/Services/Checkout/SessionServiceTest.cs

@@ -19,7 +19,7 @@ public SessionServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new SessionService();
+            this.service = new SessionService { Client = this.StripeClient };
 
             this.createOptions = new SessionCreateOptions
             {

src/StripeTests/Services/CountrySpecs/CountrySpecServiceTest.cs

@@ -19,7 +19,7 @@ public CountrySpecServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new CountrySpecService();
+            this.service = new CountrySpecService { Client = this.StripeClient };
 
             this.listOptions = new CountrySpecListOptions
             {

src/StripeTests/Services/Coupons/CouponServiceTest.cs

@@ -22,7 +22,7 @@ public CouponServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new CouponService();
+            this.service = new CouponService { Client = this.StripeClient };
 
             this.createOptions = new CouponCreateOptions
             {

src/StripeTests/Services/CreditNotes/CreditNoteServiceTest.cs

@@ -23,7 +23,7 @@ public CreditNoteServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new CreditNoteService();
+            this.service = new CreditNoteService { Client = this.StripeClient };
 
             this.createOptions = new CreditNoteCreateOptions
             {

src/StripeTests/Services/Customers/CustomerServiceTest.cs

@@ -22,7 +22,7 @@ public CustomerServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new CustomerService();
+            this.service = new CustomerService { Client = this.StripeClient };
 
             this.createOptions = new CustomerCreateOptions
             {

src/StripeTests/Services/Discounts/DiscountServiceTest.cs

@@ -16,7 +16,7 @@ public DiscountServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new DiscountService();
+            this.service = new DiscountService { Client = this.StripeClient };
         }
 
         [Fact]

src/StripeTests/Services/Disputes/DisputeServiceTest.cs

@@ -21,7 +21,7 @@ public DisputeServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new DisputeService();
+            this.service = new DisputeService { Client = this.StripeClient };
 
             this.updateOptions = new DisputeUpdateOptions
             {

src/StripeTests/Services/EphemeralKeys/EphemeralKeyServiceTest.cs

@@ -19,7 +19,7 @@ public EphemeralKeyServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new EphemeralKeyService();
+            this.service = new EphemeralKeyService { Client = this.StripeClient };
 
             this.createOptions = new EphemeralKeyCreateOptions
             {

src/StripeTests/Services/Events/EventServiceTest.cs

@@ -19,7 +19,7 @@ public EventServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new EventService();
+            this.service = new EventService { Client = this.StripeClient };
 
             this.listOptions = new EventListOptions
             {

src/StripeTests/Services/ExchangeRates/ExchangeRateServiceTest.cs

@@ -17,7 +17,7 @@ public ExchangeRateServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new ExchangeRateService();
+            this.service = new ExchangeRateService { Client = this.StripeClient };
 
             this.listOptions = new ExchangeRateListOptions
             {

src/StripeTests/Services/ExternalAccounts/ExternalAccountServiceTest.cs

@@ -23,7 +23,7 @@ public ExternalAccountServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new ExternalAccountService();
+            this.service = new ExternalAccountService { Client = this.StripeClient };
 
             this.createOptions = new ExternalAccountCreateOptions
             {

src/StripeTests/Services/FileLinks/FileLinkServiceTest.cs

@@ -22,7 +22,7 @@ public FileLinkServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new FileLinkService();
+            this.service = new FileLinkService { Client = this.StripeClient };
 
             this.createOptions = new FileLinkCreateOptions
             {

src/StripeTests/Services/Files/FileServiceTest.cs

@@ -23,7 +23,7 @@ public FileServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new FileService();
+            this.service = new FileService { Client = this.StripeClient };
 
             this.createOptions = new FileCreateOptions
             {

src/StripeTests/Services/InvoiceItems/InvoiceItemServiceTest.cs

@@ -22,7 +22,7 @@ public InvoiceItemServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new InvoiceItemService();
+            this.service = new InvoiceItemService { Client = this.StripeClient };
 
             this.createOptions = new InvoiceItemCreateOptions
             {

src/StripeTests/Services/Invoices/InvoiceServiceTest.cs

@@ -30,7 +30,7 @@ public InvoiceServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new InvoiceService();
+            this.service = new InvoiceService { Client = this.StripeClient };
 
             this.createOptions = new InvoiceCreateOptions
             {

src/StripeTests/Services/Issuing/Authorizations/AuthorizationServiceTest.cs

@@ -21,7 +21,7 @@ public AuthorizationServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new AuthorizationService();
+            this.service = new AuthorizationService { Client = this.StripeClient };
 
             this.updateOptions = new AuthorizationUpdateOptions
             {

src/StripeTests/Services/Issuing/Cardholders/CardholderServiceTest.cs

@@ -23,7 +23,7 @@ public CardholderServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new CardholderService();
+            this.service = new CardholderService { Client = this.StripeClient };
 
             this.createOptions = new CardholderCreateOptions
             {

src/StripeTests/Services/Issuing/Cards/IssuingCardServiceTest.cs

@@ -22,7 +22,7 @@ public IssuingCardServiceTest(
             MockHttpClientFixture mockHttpClientFixture)
             : base(stripeMockFixture, mockHttpClientFixture)
         {
-            this.service = new CardService();
+            this.service = new CardService { Client = this.StripeClient };
 
             this.createOptions = new CardCreateOptions
             {