Respond to feedback

nunit · Oct 31, 2023 · ec1f4d4 · ec1f4d4
1 parent 5f9f316
commit ec1f4d4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/NUnitFramework/tests/Attributes/LifeCycleAttributeTests.cs b/src/NUnitFramework/tests/Attributes/LifeCycleAttributeTests.cs
@@ -209,7 +209,7 @@ public void InstancePerTestCaseWithDispose()
             var fixture = TestBuilder.MakeFixture(typeof(InstancePerTestCaseWithDisposeTestCase));
 
             ITestResult result = TestBuilder.RunTest(fixture);
-            Assert.That(InstancePerTestCaseWithDisposeTestCase.DisposeCount, Is.EqualTo(2));
+            Assert.That(InstancePerTestCaseWithDisposeTestCase.DisposeCount, Is.EqualTo(fixture.TestCaseCount));
             Assert.That(result.ResultState.Status, Is.EqualTo(TestStatus.Passed));
         }
 
@@ -219,7 +219,7 @@ public void InstancePerTestCaseWithAsyncDispose()
             var fixture = TestBuilder.MakeFixture(typeof(InstancePerTestCaseWithAsyncDisposeTestCase));
 
             ITestResult result = TestBuilder.RunTest(fixture);
-            Assert.That(InstancePerTestCaseWithAsyncDisposeTestCase.DisposeCount, Is.EqualTo(2));
+            Assert.That(InstancePerTestCaseWithAsyncDisposeTestCase.DisposeCount, Is.EqualTo(fixture.TestCaseCount));
             Assert.That(result.ResultState.Status, Is.EqualTo(TestStatus.Passed));
         }
 

diff --git a/src/NUnitFramework/tests/Attributes/OneTimeSetUpTearDownTests.cs b/src/NUnitFramework/tests/Attributes/OneTimeSetUpTearDownTests.cs
@@ -378,17 +378,23 @@ public void AsyncDisposeCalledOnceWhenFixtureImplementsIAsyncDisposable()
         {
             var fixture = new AsyncDisposableFixture();
             TestBuilder.RunTestFixture(fixture);
+
+            var expected = new[] { nameof(AsyncDisposableFixture.OneTimeSetUp), nameof(AsyncDisposableFixture.OneTimeTearDown), nameof(AsyncDisposableFixture.DisposeAsync) };
+
             Assert.That(fixture.DisposeCalled, Is.EqualTo(1));
-            Assert.That(fixture.Actions, Is.EqualTo(new object[] { "OneTimeSetUp", "OneTimeTearDown", "DisposeAsync" }));
+            Assert.That(fixture.Actions, Is.EqualTo(expected));
         }
 
         [Test]
         public void AsyncDisposeCalledOnceWhenFixtureImplementsIAsyncDisposableThroughInheritance()
         {
             var fixture = new InheritedAsyncDisposableFixture();
             TestBuilder.RunTestFixture(fixture);
+
+            var expected = new[] { nameof(AsyncDisposableFixture.OneTimeSetUp), nameof(AsyncDisposableFixture.OneTimeTearDown), nameof(AsyncDisposableFixture.DisposeAsync) };
+
             Assert.That(fixture.DisposeCalled, Is.EqualTo(1));
-            Assert.That(fixture.Actions, Is.EqualTo(new object[] { "OneTimeSetUp", "OneTimeTearDown", "DisposeAsync" }));
+            Assert.That(fixture.Actions, Is.EqualTo(expected));
         }
 
         [Test]
@@ -397,8 +403,8 @@ public void AsyncDisposePrioritizedWhenSyncAndAsyncDispose()
             var fixture = new AsyncAndSyncDisposableFixture();
             TestBuilder.RunTestFixture(fixture);
             Assert.That(fixture.DisposeCalled, Is.EqualTo(1));
-            Assert.That(fixture.Actions, Does.Contain("DisposeAsync"));
-            Assert.That(fixture.Actions, Does.Not.Contain("Dispose"));
+            Assert.That(fixture.Actions, Does.Contain(nameof(IAsyncDisposable.DisposeAsync)));
+            Assert.That(fixture.Actions, Does.Not.Contain(nameof(IDisposable.Dispose)));
         }
     }