Fix more tests

Author: MichelZ

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

@@ -232,6 +232,16 @@ static DataTestUtility()
             }
         }
 
+        public static IEnumerable<object[]> GetConnectionStringsWithEnclaveMemberData()
+        {
+            return GetConnectionStrings(true).Select(x => new object[] { x });
+        }
+
+        public static IEnumerable<object[]> GetConnectionStringsWithoutEnclaveMemberData()
+        {
+            return GetConnectionStrings(false).Select(x => new object[] { x });
+        }
+
         public static IEnumerable<string> ConnectionStrings => GetConnectionStrings(withEnclave: true);
 
         public static IEnumerable<string> GetConnectionStrings(bool withEnclave)

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs

@@ -24,19 +24,18 @@ public static void RunAllTestsForSingleServer_NP()
         {
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                DataTestUtility.AssertThrowsWrapper<PlatformNotSupportedException>(() => RunAllTestsForSingleServer(DataTestUtility.NPConnectionString, true));
+                DataTestUtility.AssertThrowsWrapper<PlatformNotSupportedException>(() => RunAllTestsForSingleServer(DataTestUtility.NPConnectionString));
             }
             else
             {
-                RunAllTestsForSingleServer(DataTestUtility.NPConnectionString, true);
+                RunAllTestsForSingleServer(DataTestUtility.NPConnectionString);
             }
         }
 
-        //[ActiveIssue("5540")]
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotNamedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         public static void RunAllTestsForSingleServer_TCP()
         {
-            RunAllTestsForSingleServer(DataTestUtility.TCPConnectionString, false);
+            RunAllTestsForSingleServer(DataTestUtility.TCPConnectionString);
         }
 
         // Synapse: The statement failed. Column 'foo' has a data type that cannot participate in a columnstore index.
@@ -120,7 +119,35 @@ static async Task LocalCopyTo(Stream source, Stream destination, int bufferSize,
                     Assert.Fail($"input and output differ at index {index}, input={inputData[index]}, output={outputData[index]}");
                 }
             }
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        [MemberData(nameof(DataTestUtility.GetConnectionStringsWithEnclaveMemberData), MemberType = typeof(DataTestUtility))]
+        public static void XEventsStreamingTest(string connectionString)
+        {
+            TestXEventsStreaming(connectionString);
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsUsingNativeSNI), nameof(DataTestUtility.IsNotNamedInstance), nameof(DataTestUtility.IsNotAzureServer))]
+        [MemberData(nameof(DataTestUtility.GetConnectionStringsWithEnclaveMemberData), MemberType = typeof(DataTestUtility))]
+        public static void TestTimeoutDuringReadAsyncWithClosedReaderTest(string connectionString)
+        {
+            TimeoutDuringReadAsyncWithClosedReaderTest(connectionString);
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotNamedInstance), nameof(DataTestUtility.IsNotAzureServer))]
+        [MemberData(nameof(DataTestUtility.GetConnectionStringsWithEnclaveMemberData), MemberType = typeof(DataTestUtility))]
+        public static void NonFatalTimeoutDuringReadTest(string connectionString)
+        {
+            NonFatalTimeoutDuringRead(connectionString);
+        }
 
+        [ActiveIssue("https://github.com/dotnet/SqlClient/issues/3035", typeof(DataStreamTest), nameof(IsArm))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [MemberData(nameof(DataTestUtility.GetConnectionStringsWithEnclaveMemberData), MemberType = typeof(DataTestUtility))]
+        public static void XmlReaderTest(string connectionString)
+        {
+            ExecuteXmlReaderTest(connectionString);
         }
 
         private static byte[] CreateBinaryTable(SqlConnection connection, string tableName, int packetSize)
@@ -166,7 +193,6 @@ private static void RunAllTestsForSingleServer(string connectionString, bool usi
             TimestampRead(connectionString);
             OrphanReader(connectionString);
             BufferSize(connectionString);
-            ExecuteXmlReaderTest(connectionString);
             SequentialAccess(connectionString);
             HasRowsTest(connectionString);
             CloseConnection(connectionString);
@@ -179,29 +205,13 @@ private static void RunAllTestsForSingleServer(string connectionString, bool usi
             ReadTextReader(connectionString);
             StreamingBlobDataTypes(connectionString);
             OutOfOrderGetChars(connectionString);
+        }
 
-            // Azure Database does not support Server scoped XEvents
-            if (!IsAzureSqlServer(connectionString))
-            {
-                TestXEventsStreaming(connectionString);
-            }
-
-            // These tests fail with named pipes, since they try to do DNS lookups on named pipe paths.
-            if (!usingNamePipes)
-            {
-                if (!IsAzureSqlServer(connectionString) && DataTestUtility.IsUsingNativeSNI())
-                {
-                    TimeoutDuringReadAsyncWithClosedReaderTest(connectionString);
-                }
+        private static bool IsAzureSqlServer(string connectionString) => Utils.IsAzureSqlServer(new SqlConnectionStringBuilder(connectionString).DataSource);
 
-                NonFatalTimeoutDuringRead(connectionString);
-            }
-        }
+        private static bool IsNamedInstance(string connectionString) => new SqlConnectionStringBuilder(connectionString).DataSource.Contains(@"\");
 
-        private static bool IsAzureSqlServer(string connectionString)
-        {
-            return Utils.IsAzureSqlServer(new SqlConnectionStringBuilder(connectionString).DataSource);
-        }
+        private static bool IsArm => RuntimeInformation.ProcessArchitecture == Architecture.Arm || RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
 
         private static void MultipleResults(string connectionString)
         {