Fix bug introduced by previous PR update, split test into smaller tests

Author: benrr101

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs

@@ -157,7 +157,8 @@ private bool IsDirty
 
         private bool IsStoredProcedure => CommandType is CommandType.StoredProcedure;
 
-        private bool IsSimpleTextQuery => CommandType is CommandType.Text && _parameters?.Count == 0;
+        private bool IsSimpleTextQuery => CommandType is CommandType.Text &&
+                                          (_parameters is null || _parameters.Count == 0);
 
         #endregion
 

src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlCommandTest.cs

@@ -411,6 +411,8 @@ public void ExecuteScalar_Connection_Null()
             Assert.StartsWith("ExecuteScalar:", ex.Message);
         }
 
+        #region Prepare()
+
         [Fact]
         public void Prepare_Connection_Null()
         {
@@ -427,51 +429,92 @@ public void Prepare_Connection_Null()
         }
 
         [Fact]
-        public void Prepare_Connection_Closed()
+        public void Prepare_ConnectionClosed_TextWithoutParams()
         {
-            string connectionString = "Initial Catalog=a;Server=b;User ID=c;"
-                + "Password=d";
-            SqlConnection cn = new SqlConnection(connectionString);
-
-            SqlCommand cmd;
-
-            // Text, without parameters
-            cmd = new SqlCommand("select count(*) from whatever", cn);
-            cmd.Prepare();
-
-            // Text, with parameters
-            cmd = new SqlCommand("select count(*) from whatever", cn);
-            cmd.Parameters.Add("@TestPar1", SqlDbType.Int);
-
-            InvalidOperationException ex = Assert.Throws<InvalidOperationException>(() => cmd.Prepare());
-            // Prepare requires an open and available
-            // Connection. The connection's current state
-            // is Closed
-            Assert.Null(ex.InnerException);
-            Assert.NotNull(ex.Message);
-            Assert.True(ex.Message.IndexOf("Prepare", StringComparison.Ordinal) != -1);
+            // Arrange
+            using SqlConnection connection = GetNonConnectingConnection();
+            using SqlCommand command = new SqlCommand();
+            command.Connection = connection;
+            command.CommandType = CommandType.Text;
+            command.CommandText = COMMAND_TEXT;
+
+            // Act / Assert
+            command.Prepare();
+            Assert.Equal(ConnectionState.Closed, connection.State);
+        }
 
-            // Text, parameters cleared
-            cmd = new SqlCommand("select count(*) from whatever", cn);
-            cmd.Parameters.Add("@TestPar1", SqlDbType.Int);
-            cmd.Parameters.Clear();
-            cmd.Prepare();
+        [Fact]
+        public void Prepare_ConnectionClosed_TextWithClearedParams()
+        {
+            // Arrange
+            using SqlConnection connection = GetNonConnectingConnection();
+            using SqlCommand command = new SqlCommand();
+            command.Connection = connection;
+            command.CommandType = CommandType.Text;
+            command.CommandText = COMMAND_TEXT;
+            command.Parameters.Add("@TestPar1", SqlDbType.Int);
+            command.Parameters.Clear();
+
+            // Act / Assert
+            command.Prepare();
+            Assert.Equal(ConnectionState.Closed, connection.State);
+        }
 
-            // StoredProcedure, without parameters
-            cmd = new SqlCommand("FindCustomer", cn);
-            cmd.CommandType = CommandType.StoredProcedure;
-            cmd.Prepare();
+        [Fact]
+        public void Prepare_ConnectionClosed_TextWithParams()
+        {
+            // Arrange
+            using SqlConnection connection = GetNonConnectingConnection();
+            using SqlCommand command = new SqlCommand();
+            command.Connection = connection;
+            command.CommandType = CommandType.Text;
+            command.CommandText = COMMAND_TEXT;
+            command.Parameters.Add("@TestPar1", SqlDbType.Int);
+
+            // Act
+            Action action = () => command.Prepare();
+
+            // Assert
+            var exception = Assert.Throws<InvalidOperationException>(action);
+            Assert.Null(exception.InnerException);
+            Assert.NotNull(exception.Message);
+            Assert.Contains("Prepare", exception.Message);
+
+            Assert.Equal(ConnectionState.Closed, connection.State);
+        }
 
-            // StoredProcedure, with parameters
-            cmd = new SqlCommand("FindCustomer", cn);
-            cmd.CommandType = CommandType.StoredProcedure;
-            cmd.Parameters.Add("@TestPar1", SqlDbType.Int);
-            cmd.Prepare();
+        [Fact]
+        public void Prepare_ConnectionClosed_SprocWithoutParams()
+        {
+            // Arrange
+            using SqlConnection connection = GetNonConnectingConnection();
+            using SqlCommand command = new SqlCommand();
+            command.Connection = connection;
+            command.CommandType = CommandType.StoredProcedure;
+            command.CommandText = "FindCustomer";
+
+            // Act / Assert
+            command.Prepare();
+            Assert.Equal(ConnectionState.Closed, connection.State);
+        }
 
-            // ensure connection was not implictly opened
-            Assert.Equal(ConnectionState.Closed, cn.State);
+        [Fact]
+        public void Prepare_ConnectionClosed_SprocWithParams()
+        {
+            // Arrange
+            using SqlConnection connection = GetNonConnectingConnection();
+            using SqlCommand command = new SqlCommand();
+            command.Connection = connection;
+            command.CommandType = CommandType.StoredProcedure;
+            command.CommandText = "FindCustomer";
+
+            // Act / Assert
+            command.Prepare();
+            Assert.Equal(ConnectionState.Closed, connection.State);
         }
 
+        #endregion
+
         [Fact]
         public void ResetCommandTimeout()
         {
@@ -518,5 +561,8 @@ public void ParameterCollectionTest()
                 cmd.Parameters.Remove(cmd.Parameters[0]);
             }
         }
+
+        private static SqlConnection GetNonConnectingConnection() =>
+            new SqlConnection("Initial Catalog=a;Server=b;User ID=c;Password=d");
     }
 }