Addressed Saurabh's feedback, removed method GetDataSource

Commit migrated from https://github.com/dotnet/corefx/commit/6f76e0fafbe901db09a5388fd3cbed7d59d8348f

diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/libraries/System.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index 584ee04..07ed683 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/libraries/System.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -292,19 +292,5 @@ namespace System.Data.SqlClient.ManualTesting.Tests
             }
             return result;
         }
-
-        /// <summary>
-        /// This method creates a new SqlConnection object and uses the SqlConnection.DataSource 
-        /// property to return the SQL Server Instance name.
-        /// </summary>
-        /// <param name="connectionString"></param>
-        /// <returns> Returns SQL Server name </returns>
-        public static string GetDataSource(string connectionString)
-        {
-            using (SqlConnection connection = new SqlConnection(connectionString))
-            {
-                return connection.DataSource;
-            }
-        }
     }
 }

diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADAccessTokenTest.cs b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADAccessTokenTest.cs
index b0a8f0d..9564bf4 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADAccessTokenTest.cs
+++ b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADAccessTokenTest.cs
@@ -9,7 +9,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests
     public class AADAccessTokenTest
     {
         private static bool IsAccessTokenSetup() => DataTestUtility.IsAccessTokenSetup();
-        private static bool IsAzureServer() => DataTestUtility.IsAzureSqlServer(DataTestUtility.GetDataSource(DataTestUtility.TcpConnStr));
+        private static bool IsAzureServer() => DataTestUtility.IsAzureSqlServer(new SqlConnectionStringBuilder((DataTestUtility.TcpConnStr)).DataSource);
 
         [ConditionalFact(nameof(IsAccessTokenSetup), nameof(IsAzureServer))]
         public static void AccessTokenTest()

diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AzureDistributedTransaction.cs b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AzureDistributedTransaction.cs
index eb9abf9..025584b 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AzureDistributedTransaction.cs
+++ b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AzureDistributedTransaction.cs
@@ -22,7 +22,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests
                Console.WriteLine($"Creating Table {s_tableName}");
 #endif
                 // Setup Azure Table
-                Helpers.TryExecuteNonQueryAzure(s_connectionString, s_createTableCmd, s_commandTimeout);
+                Helpers.ExecuteNonQueryAzure(s_connectionString, s_createTableCmd, s_commandTimeout);
                 using (var txScope = new TransactionScope())
                 {
                     BulkCopy(s_connectionString);
@@ -40,7 +40,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests
                 Console.WriteLine($"Dropping Table {s_tableName}");
 #endif
                 // Drop Azure Table
-                Helpers.TryExecuteNonQueryAzure(s_connectionString, "DROP TABLE " + s_tableName, s_commandTimeout);
+                Helpers.ExecuteNonQueryAzure(s_connectionString, "DROP TABLE " + s_tableName, s_commandTimeout);
             }
         }
 

diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Helpers.cs b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Helpers.cs
index c54f7f9..659efc5 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Helpers.cs
+++ b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Helpers.cs
@@ -49,7 +49,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests
             return cmd.ExecuteNonQuery();
         }
 
-        public static int TryExecuteNonQueryAzure(string strConnectionString, string strCommand, int commandTimeout = 60)
+        public static int ExecuteNonQueryAzure(string strConnectionString, string strCommand, int commandTimeout = 60)
         {
             using (SqlConnection connection = new SqlConnection(strConnectionString))
             using (SqlCommand command = connection.CreateCommand())

diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs
index c1cc34c..b89012d 100644 (file)
--- a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs
+++ b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs
@@ -10,7 +10,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests
     {
         private string srcConstr = null;
         private string dstConstr = null;
-        private static bool IsAzureServer() => DataTestUtility.IsAzureSqlServer(DataTestUtility.GetDataSource(DataTestUtility.TcpConnStr));
+        private static bool IsAzureServer() => DataTestUtility.IsAzureSqlServer(new SqlConnectionStringBuilder((DataTestUtility.TcpConnStr)).DataSource);
         private static bool AreConnectionStringsSetup() => DataTestUtility.AreConnStringsSetup();
 
         public SqlBulkCopyTest()