Align per-test and per-class disposal

hardkoded · Jul 19, 2024 · 484ae4e · 484ae4e
1 parent 9e18877
commit 484ae4e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 29 deletions.
diff --git a/lib/PuppeteerSharp.Tests/PuppeteerBrowserBaseTest.cs b/lib/PuppeteerSharp.Tests/PuppeteerBrowserBaseTest.cs
@@ -1,42 +1,27 @@
-using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
 namespace PuppeteerSharp.Tests
 {
-    public class PuppeteerBrowserBaseTest : PuppeteerBaseTest, IDisposable, IAsyncDisposable
+    public class PuppeteerBrowserBaseTest : PuppeteerBaseTest
     {
         protected IBrowser Browser { get; set; }
 
         protected LaunchOptions DefaultOptions { get; set; }
 
         [SetUp]
-        public virtual async Task InitializeAsync()
+        public async Task InitializeAsync()
             => Browser = await Puppeteer.LaunchAsync(
                 DefaultOptions ?? TestConstants.DefaultBrowserOptions(),
                 TestConstants.LoggerFactory);
 
         [TearDown]
-        public virtual async Task DisposeAsync()
+        public async Task TearDownAsync()
         {
             if (Browser is not null)
             {
-                await Browser.CloseAsync();
+                await Browser.DisposeAsync();
             }
         }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing) => _ = DisposeAsync();
-
-        ValueTask IAsyncDisposable.DisposeAsync()
-        {
-            GC.SuppressFinalize(this);
-            return Browser.DisposeAsync();
-        }
     }
 }
diff --git a/lib/PuppeteerSharp.Tests/TracingTests/TracingTests.cs b/lib/PuppeteerSharp.Tests/TracingTests/TracingTests.cs
@@ -9,7 +9,7 @@
 
 namespace PuppeteerSharp.Tests.TracingTests
 {
-    public class TracingTests : PuppeteerPageBaseTest
+    public sealed class TracingTests : PuppeteerPageBaseTest, IAsyncDisposable
     {
         private readonly string _file;
 
@@ -18,10 +18,8 @@ public TracingTests() : base()
             _file = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
         }
 
-        public override async Task DisposeAsync()
+        public async ValueTask DisposeAsync()
         {
-            await base.DisposeAsync();
-
             var attempts = 0;
             const int maxAttempts = 5;
 

diff --git a/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForFunctionTests.cs b/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForFunctionTests.cs
@@ -6,7 +6,7 @@
 
 namespace PuppeteerSharp.Tests.WaitTaskTests
 {
-    public sealed class FrameWaitForFunctionTests : PuppeteerPageBaseTest
+    public sealed class FrameWaitForFunctionTests : PuppeteerPageBaseTest, IDisposable
     {
         private PollerInterceptor _pollerInterceptor;
 
@@ -27,9 +27,8 @@ public FrameWaitForFunctionTests() : base()
             };
         }
 
-        protected override void Dispose(bool disposing)
+        public void Dispose()
         {
-            base.Dispose(disposing);
             _pollerInterceptor.Dispose();
         }
 

diff --git a/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForSelectorTests.cs b/lib/PuppeteerSharp.Tests/WaitTaskTests/FrameWaitForSelectorTests.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -7,7 +8,7 @@
 
 namespace PuppeteerSharp.Tests.WaitTaskTests
 {
-    public class FrameWaitForSelectorTests : PuppeteerPageBaseTest
+    public sealed class FrameWaitForSelectorTests : PuppeteerPageBaseTest, IDisposable
     {
         private const string AddElement = "tag => document.body.appendChild(document.createElement(tag))";
         private PollerInterceptor _pollerInterceptor;
@@ -29,9 +30,8 @@ public FrameWaitForSelectorTests()
             };
         }
 
-        protected override void Dispose(bool disposing)
+        public void Dispose()
         {
-            base.Dispose(disposing);
             _pollerInterceptor.Dispose();
         }