Fix ConnectionTimeoutTestWithThread test (#28618)

Author: Gene Lee

src/System.Data.SqlClient/tests/FunctionalTests/SqlConnectionBasicTests.cs

@@ -2,12 +2,9 @@
 // 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.Data.Common;
-using System.Diagnostics;
 using System.Reflection;
 using System.Security;
-using System.Threading;
 using Xunit;
 
 namespace System.Data.SqlClient.Tests
@@ -107,35 +104,6 @@ public void RetrieveWorkstationId(string workstation, bool withDispose, bool sho
             Assert.Equal(expected, conn.WorkstationId);
         }
 
-        [Fact]
-        public void ConnectionTimeoutTestWithThread()
-        {
-            int timeoutSec = 5;
-            string connStrNotAvailable = $"Server=tcp:fakeServer,1433;uid=fakeuser;pwd=fakepwd;Connection Timeout={timeoutSec}";
-
-            List<ConnectionWorker> list = new List<ConnectionWorker>();
-            for (int i = 0; i < 10; ++i)
-            {
-                list.Add(new ConnectionWorker(connStrNotAvailable));
-            }
-
-            ConnectionWorker.Start();
-            ConnectionWorker.Stop();
-
-            double theMax = 0;
-            foreach (ConnectionWorker w in list)
-            {
-                if (theMax < w.MaxTimeElapsed)
-                {
-                    theMax = w.MaxTimeElapsed;
-                }
-            }
-
-            int threshold = (timeoutSec + 1) * 1000;
-
-            Console.WriteLine($"ConnectionTimeoutTestWithThread: Elapsed Time {theMax} and threshold {threshold}");
-        }
-
         [OuterLoop("Can take up to 4 seconds")]
         [Fact]
         public void ExceptionsWithMinPoolSizeCanBeHandled()
@@ -195,69 +163,5 @@ public void ConnectionTestValidCredentialCombination()
 
             Assert.Equal(sqlCredential, conn.Credential);
         }
-
-        public class ConnectionWorker
-        {
-            private static ManualResetEventSlim startEvent = new ManualResetEventSlim(false);
-            private static List<ConnectionWorker> workerList = new List<ConnectionWorker>();
-            private ManualResetEventSlim doneEvent = new ManualResetEventSlim(false);
-            private double maxTimeElapsed;
-            private Thread thread;
-            private string connectionString;
-
-            public ConnectionWorker(string connectionString)
-            {
-                workerList.Add(this);
-                this.connectionString = connectionString;
-                thread = new Thread(new ThreadStart(SqlConnectionOpen));
-                thread.Start();
-            }
-
-            public double MaxTimeElapsed
-            {
-                get
-                {
-                    return maxTimeElapsed;
-                }
-            }
-
-            public static void Start()
-            {
-                startEvent.Set();
-            }
-
-            public static void Stop()
-            {
-                foreach (ConnectionWorker w in workerList)
-                {
-                    w.doneEvent.Wait();
-                }
-            }
-
-            public void SqlConnectionOpen()
-            {
-                startEvent.Wait();
-
-                Stopwatch sw = new Stopwatch();
-                using (SqlConnection con = new SqlConnection(connectionString))
-                {
-                    sw.Start();
-                    try
-                    {
-                        con.Open();
-                    }
-                    catch { }
-                    sw.Stop();
-                }
-
-                double elapsed = sw.Elapsed.TotalMilliseconds;
-                if (maxTimeElapsed < elapsed)
-                {
-                    maxTimeElapsed = elapsed;
-                }
-
-                doneEvent.Set();
-            }
-        }
     }
 }

src/System.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs

@@ -2,6 +2,9 @@
 // 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.Diagnostics;
+using System.Threading;
 using Xunit;
 
 namespace System.Data.SqlClient.ManualTesting.Tests
@@ -45,5 +48,102 @@ public static void EnvironmentHostNameTest()
             }
             Assert.True(false, "No non-empty hostname found for the application");
         }
+
+        [CheckConnStrSetupFact]
+        public static void ConnectionTimeoutTestWithThread()
+        {
+            const int timeoutSec = 5;
+            const int numOfTry = 2;
+            const int numOfThreads = 5;
+
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr);
+            builder.DataSource = "invalidhost";
+            builder.ConnectTimeout = timeoutSec;
+            string connStrNotAvailable = builder.ConnectionString;
+
+            for (int i = 0; i < numOfThreads; ++i)
+            {
+                new ConnectionWorker(connStrNotAvailable, numOfTry);
+            }
+
+            ConnectionWorker.Start();
+            ConnectionWorker.Stop();
+
+            double timeTotal = 0;
+            double timeElapsed = 0;
+
+            foreach (ConnectionWorker w in ConnectionWorker.WorkerList)
+            {
+                timeTotal += w.TimeElapsed;
+            }
+            timeElapsed = timeTotal / Convert.ToDouble(ConnectionWorker.WorkerList.Count);
+
+            int threshold = timeoutSec * numOfTry * 2 * 1000;
+
+            Assert.True(timeElapsed < threshold);
+        }
+
+        public class ConnectionWorker
+        {
+            private static List<ConnectionWorker> workerList = new List<ConnectionWorker>();
+            private ManualResetEventSlim _doneEvent = new ManualResetEventSlim(false);
+            private double _timeElapsed;
+            private Thread _thread;
+            private string _connectionString;
+            private int _numOfTry;
+
+            public ConnectionWorker(string connectionString, int numOfTry)
+            {
+                workerList.Add(this);
+                _connectionString = connectionString;
+                _numOfTry = numOfTry;
+                _thread = new Thread(new ThreadStart(SqlConnectionOpen));
+            }
+
+            public static List<ConnectionWorker> WorkerList => workerList;
+
+            public double TimeElapsed => _timeElapsed;
+
+            public static void Start()
+            {
+                foreach (ConnectionWorker w in workerList)
+                {
+                    w._thread.Start();
+                }
+            }
+
+            public static void Stop()
+            {
+                foreach (ConnectionWorker w in workerList)
+                {
+                    w._doneEvent.Wait();
+                }
+            }
+
+            public void SqlConnectionOpen()
+            {
+                Stopwatch sw = new Stopwatch();
+                double totalTime = 0;
+                for (int i = 0; i < _numOfTry; ++i)
+                {
+                    using (SqlConnection con = new SqlConnection(_connectionString))
+                    {
+                        sw.Start();
+                        try
+                        {
+                            con.Open();
+                        }
+                        catch { }
+                        sw.Stop();
+                    }
+                    totalTime += sw.Elapsed.TotalMilliseconds;
+                    sw.Reset();
+                }
+
+                _timeElapsed = totalTime / Convert.ToDouble(_numOfTry);
+
+                _doneEvent.Set();
+            }
+        }
     }
 }