Update tests

Author: campersau

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs

@@ -49,12 +49,12 @@ public static void ConnectionCanCreateBatch()
         {
             using (var connection = new SqlConnection(DataTestUtility.TCPConnectionString))
             {
-                #if NET
+#if NET
                 Assert.True(connection.CanCreateBatch);
                 using (var batch = connection.CreateBatch())
-                #else
+#else
                 using (var batch = new SqlBatch(connection))
-                #endif
+#endif
                 {
                     Assert.NotNull(batch);
                     Assert.Equal(connection, batch.Connection);
@@ -159,11 +159,11 @@ public static void ProviderApi()
             int resultCount = 0;
             int rowCount = 0;
             var dbProviderFactory = SqlClientFactory.Instance;
-            #if NET
+#if NET
             DbBatch batch = dbProviderFactory.CreateBatch();
-            #else
+#else
             SqlBatch batch = new SqlBatch();
-            #endif
+#endif
             using (var connection = new SqlConnection(DataTestUtility.TCPConnectionString))
             {
                 connection.Open();
@@ -176,11 +176,11 @@ public static void ProviderApi()
                         p2.ParameterName = "@p2";
                         p1.Value = 50.0f;
                         p2.Value = 10248;
-                        #if NET
+#if NET
                         DbBatchCommand command = dbProviderFactory.CreateBatchCommand();
-                        #else
+#else
                         SqlBatchCommand command = new SqlBatchCommand();
-                        #endif
+#endif
                         command.CommandText = "UPDATE Orders SET Freight=@p1 WHERE OrderID=@p2";
                         command.Parameters.Add(p1);
                         command.Parameters.Add(p2);
@@ -191,11 +191,11 @@ public static void ProviderApi()
                         DbParameter parameter = dbProviderFactory.CreateParameter();
                         parameter.ParameterName = "@p4";
                         parameter.Value = 10248;
-                        #if NET
+#if NET
                         DbBatchCommand command = dbProviderFactory.CreateBatchCommand();
-                        #else
+#else
                         SqlBatchCommand command = new SqlBatchCommand();
-                        #endif
+#endif
                         command.CommandText = $"SELECT Freight FROM Orders WHERE OrderID={parameter.ParameterName}";
                         command.Parameters.Add(parameter);
                         batch.BatchCommands.Add(command);
@@ -673,6 +673,7 @@ public static void ExecuteReaderCommandCommandBehaviorSchemaOnlyKeyInfo()
             Assert.True(schema[0].IsKey);
         }
 
+#if NET
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         public static void ExecuteReaderCommandBehaviorCloseConnection()
         {
@@ -706,6 +707,40 @@ public static void ExecuteReaderCommandBehaviorCloseConnection()
             Assert.Equal(2, resultRowCount);
         }
 
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public static async Task ExecuteReaderAsyncCommandBehaviorCloseConnection()
+        {
+            int resultSetCount = 0;
+            int resultRowCount = 0;
+
+            await using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
+            await using (SqlBatch batch = new SqlBatch(conn))
+            {
+                await conn.OpenAsync();
+
+                batch.BatchCommands.Add(new SqlBatchCommand("SELECT 1"));
+                batch.BatchCommands.Add(new SqlBatchCommand("SELECT 2"));
+
+                using (var reader = await batch.ExecuteReaderAsync(CommandBehavior.CloseConnection))
+                {
+                    do
+                    {
+                        resultSetCount += 1;
+                        while (await reader.ReadAsync())
+                        {
+                            resultRowCount += 1;
+                        }
+                    } while (await reader.NextResultAsync());
+                }
+
+                Assert.Equal(ConnectionState.Closed, conn.State);
+            }
+
+            Assert.Equal(2, resultSetCount);
+            Assert.Equal(2, resultRowCount);
+        }
+#endif
+
         private static SqlParameter CreateParameter<T>(string name, SqlDbType type, T value, ParameterDirection direction = ParameterDirection.Input)
         {
             var parameter = new SqlParameter(name, type);

src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlBatchTest.cs

@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NET
-
 using System;
 using System.Data;
 using Xunit;
@@ -35,5 +33,3 @@ public void NotSupportedCommandBehaviorValidateCommandBehavior_Throws()
         Assert.Contains("not supported", ex.Message, StringComparison.OrdinalIgnoreCase);
     }
 }
-
-#endif