Merge pull request #633 from EasyPost/client_cleanup

chore: remove unecessary dispose logic, instantiate services inline

Author: Justintime50

CHANGELOG.md

@@ -5,7 +5,6 @@
 - Adds support for `UspsShipAccount`
 - Adds `Tracker.RetrieveBatch` function
 - Adds `VerifyCarrier` address param
-- Disposes of Luma service after use
 
 ## v7.2.0 (2025-06-18)
 

EasyPost.Tests/ClientTest.cs

@@ -70,13 +70,6 @@ public void TestThreadSafety()
 
         private const string FakeApikey = "fake_api_key";
 
-        [Fact]
-        public void TestClientDisposal()
-        {
-            Client client = new(new ClientConfiguration(FakeApikey));
-            CustomAssertions.DoesNotThrow(() => client.Dispose());
-        }
-
         [Fact]
         public void TestBaseUrlOverride()
         {

EasyPost.Tests/Fixture.cs

@@ -801,6 +801,22 @@ internal static ParameterSets.Tracker.All All(Dictionary<string, object>? fixtur
                         Carrier = fixture.GetOrNull<string>("carrier"),
                     };
                 }
+
+                internal static ParameterSets.Tracker.Batch Batch(Dictionary<string, object>? fixture)
+                {
+                    fixture ??= new Dictionary<string, object>();
+
+                    return new ParameterSets.Tracker.Batch
+                    {
+                        PageSize = fixture.GetOrNullInt("page_size"),
+                        BeforeId = fixture.GetOrNull<string>("before_id"),
+                        AfterId = fixture.GetOrNull<string>("after_id"),
+                        StartDatetime = fixture.GetOrNull<string>("start_datetime"),
+                        EndDatetime = fixture.GetOrNull<string>("end_datetime"),
+                        TrackingCodes = fixture.GetOrNull<List<string>>("tracking_codes"),
+                        Carrier = fixture.GetOrNull<string>("carrier"),
+                    };
+                }
             }
 
             internal static class Users

EasyPost.Tests/HttpTests/ClientConfigurationTest.cs

@@ -13,7 +13,6 @@ public class ClientConfigurationTest
         public void TestClientConfigurationDisposal()
         {
             ClientConfiguration configuration = new("not_a_real_api_key");
-            CustomAssertions.DoesNotThrow(() => configuration.Dispose());
         }
 
         [Fact]

EasyPost.Tests/HttpTests/RequestTest.cs

@@ -15,7 +15,6 @@ public class RequestTest
     public void TestRequestDisposal()
     {
         Request request = new("https://example.com", "not_a_real_endpoint", Method.Get, ApiVersion.V2, new Dictionary<string, object> { { "key", "value" } }, new Dictionary<string, string> { { "header_key", "header_value" } });
-        CustomAssertions.DoesNotThrow(() => request.Dispose());
     }
 
     [Fact]

EasyPost.Tests/ServicesTests/ServiceTest.cs

@@ -29,7 +29,6 @@ public void TestServiceDisposal()
             Client client = new(new ClientConfiguration("not_a_real_api_key"));
 
             AddressService addressService = client.Address;
-            CustomAssertions.DoesNotThrow(() => addressService.Dispose());
         }
 
         /// <summary>

EasyPost.Tests/ServicesTests/TrackerServiceTest.cs

@@ -147,26 +147,6 @@ public async Task TestRetrieve()
             Assert.Equal(tracker.Id, retrievedTracker.Id);
         }
 
-        [Fact]
-        [CrudOperations.Read]
-        [Testing.Function]
-        public async Task TestRetrieveBatch()
-        {
-            UseVCR("retrieve_batch");
-
-            Tracker tracker = await Client.Tracker.Create(Fixtures.Usps, "EZ1000000001");
-
-            List<string> trackingCodes = new() { tracker.TrackingCode };
-            TrackerCollection trackerCollection = await Client.Tracker.RetrieveBatch(new Dictionary<string, object> { { "tracking_codes", trackingCodes } });
-
-            List<Tracker> trackers = trackerCollection.Trackers;
-
-            foreach (Tracker singleTracker in trackers)
-            {
-                Assert.IsType<Tracker>(singleTracker);
-            }
-        }
-
         #endregion
 
         #endregion

EasyPost.Tests/ServicesTests/WithParameters/TrackerServiceTest.cs

@@ -92,6 +92,28 @@ public async Task TestAllParameterHandOff()
             Assert.Equal(filters.Carrier, ((Parameters.Tracker.All)trackerCollection.Filters!).Carrier);
         }
 
+        [Fact]
+        [CrudOperations.Read]
+        [Testing.Function]
+        public async Task TestRetrieveBatch()
+        {
+            UseVCR("retrieve_batch");
+
+            Tracker tracker = await Client.Tracker.Create(Fixtures.Usps, "EZ1000000001");
+
+            Dictionary<string, object> data = new Dictionary<string, object>() { { "tracking_codes", new List<string> { tracker.TrackingCode } } };
+            Parameters.Tracker.Batch parameters = Fixtures.Parameters.Trackers.Batch(data);
+
+            TrackerCollection trackerCollection = await Client.Tracker.RetrieveBatch(parameters);
+
+            List<Tracker> trackers = trackerCollection.Trackers;
+
+            foreach (Tracker singleTracker in trackers)
+            {
+                Assert.IsType<Tracker>(singleTracker);
+            }
+        }
+
         #endregion
 
         #endregion

EasyPost.Tests/_Utilities/UnitTest.cs

@@ -9,7 +9,7 @@ namespace EasyPost.Tests._Utilities
     ///     Base class for all unit tests.
     ///     Sets up all available client versions for VCR and non-VCR requests.
     /// </summary>
-    public class UnitTest : IDisposable
+    public class UnitTest
     {
         private readonly TestUtils.VCR? _vcr;
 
@@ -32,38 +32,6 @@ public class UnitTest : IDisposable
         protected UnitTest(string groupName, TestUtils.ApiKey apiKey = TestUtils.ApiKey.Test) => _vcr = new TestUtils.VCR(groupName, apiKey);
 #pragma warning restore CS8618
 
-        /// <summary>
-        ///     Called automatically by xUnit after each unit test is run.
-        ///     Executes the CleanupFunction (passes in the _cleanupId) if set.
-        /// </summary>
-        /// <exception cref="Exception">Could not execute the declared clean-up function.</exception>
-        public void Dispose()
-        {
-            if (CleanupFunction == null)
-            {
-                return;
-            }
-
-            if (_cleanupId == null)
-            {
-                return;
-            }
-
-            try
-            {
-                CleanupFunction.Invoke(_cleanupId).GetAwaiter().GetResult();
-                _cleanupId = null;
-            }
-            catch
-            {
-#pragma warning disable CA2201
-                throw new Exception("Could not execute clean-up function.");
-#pragma warning restore CA2201
-            }
-
-            GC.SuppressFinalize(this);
-        }
-
         /// <summary>
         ///     Set the ID that will be passed into the CleanupFunction after each unit test
         /// </summary>