Fix the unhandled exception and test validation in manual tests (#27781)

* Fix the unhandled exception and test validation in manual tests

* Use Task to run the command cancellation test

* Fix Timeout

* Use Tasks.WaitAll

* Remove the faulted check as the WaitAll will throw before getting to the check

Author: saurabh500

src/System.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs

@@ -151,7 +151,7 @@ public static TException AssertThrowsWrapper<TException, TInnerException, TInner
             return ex;
         }
 
-        public static TException ExpectFailure<TException>(Action actionThatFails, string exceptionMessage = null, bool innerExceptionMustBeNull = false, Func<TException, bool> customExceptionVerifier = null) where TException : Exception
+        public static TException ExpectFailure<TException>(Action actionThatFails, string[] exceptionMessages, bool innerExceptionMustBeNull = false, Func<TException, bool> customExceptionVerifier = null) where TException : Exception
         {
             try
             {
@@ -161,14 +161,14 @@ public static TException ExpectFailure<TException>(Action actionThatFails, strin
             }
             catch (Exception ex)
             {
-                if ((CheckException<TException>(ex, exceptionMessage, innerExceptionMustBeNull)) && ((customExceptionVerifier == null) || (customExceptionVerifier(ex as TException))))
+                foreach (string exceptionMessage in exceptionMessages)
                 {
-                    return (ex as TException);
-                }
-                else
-                {
-                    throw;
+                    if ((CheckException<TException>(ex, exceptionMessage, innerExceptionMustBeNull)) && ((customExceptionVerifier == null) || (customExceptionVerifier(ex as TException))))
+                    {
+                        return (ex as TException);
+                    }
                 }
+                throw;
             }
         }
 

src/System.Data.SqlClient/tests/ManualTests/SQL/CommandCancelTest/CommandCancelTest.cs

@@ -125,16 +125,17 @@ private static void MultiThreadedCancel(string constr, bool async)
                 var command = con.CreateCommand();
                 command.CommandText = "select * from orders; waitfor delay '00:00:08'; select * from customers";
 
-                Thread rThread1 = new Thread(ExecuteCommandCancelExpected);
-                Thread rThread2 = new Thread(CancelSharedCommand);
                 Barrier threadsReady = new Barrier(2);
                 object state = new Tuple<bool, SqlCommand, Barrier>(async, command, threadsReady);
 
-                rThread1.Start(state);
-                rThread2.Start(state);
-                rThread1.Join();
-                rThread2.Join();
+                Task[] tasks = new Task[2];
+                tasks[0] = new Task(ExecuteCommandCancelExpected, state);
+                tasks[1] = new Task(CancelSharedCommand, state);
+                tasks[0].Start();
+                tasks[1].Start();
 
+                Task.WaitAll(tasks, 15 * 1000);
+                
                 CommandCancelTest.VerifyConnection(command);
             }
         }
@@ -149,7 +150,7 @@ private static void TimeoutCancel(string constr)
                 cmd.CommandText = "WAITFOR DELAY '00:00:30';select * from Customers";
 
                 string errorMessage = SystemDataResourceManager.Instance.SQL_Timeout;
-                DataTestUtility.ExpectFailure<SqlException>(() => cmd.ExecuteReader(), errorMessage);
+                DataTestUtility.ExpectFailure<SqlException>(() => cmd.ExecuteReader(), new string[] { errorMessage });
 
                 VerifyConnection(cmd);
             }
@@ -208,6 +209,8 @@ private static void ExecuteCommandCancelExpected(object state)
             Barrier threadsReady = stateTuple.Item3;
 
             string errorMessage = SystemDataResourceManager.Instance.SQL_OperationCancelled;
+            string errorMessageSevereFailure = SystemDataResourceManager.Instance.SQL_SevereError;
+
             DataTestUtility.ExpectFailure<SqlException>(() =>
             {
                 threadsReady.SignalAndWait();
@@ -220,7 +223,8 @@ private static void ExecuteCommandCancelExpected(object state)
                         }
                     } while (r.NextResult());
                 }
-            }, errorMessage);
+            }, new string[] { errorMessage, errorMessageSevereFailure });
+            
         }
 
         private static void CancelSharedCommand(object state)