Fix tests that don't correspond to their method name

Fix event source listener test so it is ok with the trace from the unobserved exception

Author: benrr101

src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventSourceTest.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
@@ -12,22 +13,28 @@ public class EventSourceTest
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         public void EventSourceTestAll()
         {
-            using DataTestUtility.MDSEventListener TraceListener = new();
-            using (SqlConnection connection = new(DataTestUtility.TCPConnectionString))
+            using DataTestUtility.MDSEventListener traceListener = new();
+
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
+
+            using SqlCommand command = new("SELECT @@VERSION", connection);
+            using SqlDataReader reader = command.ExecuteReader();
+            while (reader.Read())
             {
-                connection.Open();
-                using SqlCommand command = new("SELECT @@VERSION", connection);
-                using SqlDataReader reader = command.ExecuteReader();
-                while (reader.Read())
-                {
-                    // Flush data
-                }
+                // Flush data
             }
 
-            // Need to investigate better way of validating traces in sequential runs, 
-            // For now we're collecting all traces to improve code coverage.
+            // TODO: Need to investigate better way of validating traces in sequential runs, for now we're collecting all traces to improve code coverage.
 
-            Assert.All(TraceListener.IDs, item => { Assert.Contains(item, Enumerable.Range(1, 21)); });
+            // Assert
+            // - Collected trace event IDs are in the range of official trace event IDs
+            // @TODO: This is brittle, refactor the SqlClientEventSource code so the event IDs it can throw are accessible here
+            HashSet<int> acceptableEventIds = new HashSet<int>(Enumerable.Range(0, 21));
+            foreach (int id in traceListener.IDs)
+            {
+                Assert.Contains(id, acceptableEventIds);
+            }
         }
     }
 }

src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/Utilities/AsyncHelperTest.cs

@@ -477,19 +477,21 @@ public async Task ContinueTaskWithState_2Generics_TaskCompletesHandlerThrows()
             Task taskToContinue = Task.CompletedTask;
             TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
             const int state1 = 123;
+            const int state2 = 234
 
             // - mockOnSuccess handler throws
-            Mock<Action<int>> mockOnSuccess = new();
-            mockOnSuccess.Setup(o => o(It.IsAny<int>())).Throws<Exception>();
+            Mock<Action<int, int>> mockOnSuccess = new();
+            mockOnSuccess.Setup(o => o(It.IsAny<int>(), It.IsAny<int>())).Throws<Exception>();
 
-            Mock<Action<int, Exception>> mockOnFailure = new();
-            Mock<Action<int>> mockOnCancellation = new();
+            Mock<Action<int, int, Exception>> mockOnFailure = new();
+            Mock<Action<int, int>> mockOnCancellation = new();
 
             // Act
             AsyncHelper.ContinueTaskWithState(
                 taskToContinue,
                 taskCompletionSource,
                 state1,
+                state2,
                 mockOnSuccess.Object,
                 mockOnFailure.Object,
                 mockOnCancellation.Object);
@@ -500,7 +502,7 @@ public async Task ContinueTaskWithState_2Generics_TaskCompletesHandlerThrows()
             Assert.Equal(TaskStatus.Faulted, taskCompletionSource.Task.Status);
 
             // - mockOnSuccess was called with state obj
-            mockOnSuccess.Verify(action => action(state1), Times.Once);
+            mockOnSuccess.Verify(action => action(state1, state2), Times.Once);
             mockOnFailure.VerifyNeverCalled();
             mockOnCancellation.VerifyNeverCalled();
         }