Tests | Clean up test resources (dotnet#244)

* Fix leaking for CspProviderExt * Clean stored procedures for APIShould
yukiwongky · Oct 4, 2019 · 807babc · 807babc
1 parent 58f2e3e
commit 807babc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
@@ -1882,7 +1882,9 @@ private void DropHelperProcedures(string[] procNames)
                 sqlConnection.Open();
                 foreach (string name in procNames)
                 {
-                    using (SqlCommand cmd = new SqlCommand(string.Format("IF EXISTS (SELECT * FROM sys.procedures WHERE name = '{0}') \n DROP PROCEDURE {0}", name), sqlConnection))
+                    string procedureName = name.Trim( new Char[] { '[', ']'});
+
+                    using (SqlCommand cmd = new SqlCommand(string.Format("IF EXISTS (SELECT * FROM sys.procedures WHERE name = '{0}') \n DROP PROCEDURE {0}", procedureName), sqlConnection))
                     {
                         cmd.ExecuteNonQuery();
                     }

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
@@ -16,8 +16,6 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
     [PlatformSpecific(TestPlatforms.Windows)]
     public class CspProviderExt
     {
-        private string GenerateUniqueName(string baseName) => string.Concat("AE-", baseName, "-", Guid.NewGuid().ToString());
-
         // [Fact(Skip="Run this in non-parallel mode")] or [ConditionalFact()]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         public void TestKeysFromCertificatesCreatedWithMultipleCryptoProviders()
@@ -102,7 +100,8 @@ public void TestKeysFromCertificatesCreatedWithMultipleCryptoProviders()
                 finally
                 {
                     CertificateUtilityWin.RemoveCertificate(certificateName, StoreLocation.CurrentUser);
-                    sqlSetupStrategyCsp?.DropTable();
+                    // clean up database resources
+                    sqlSetupStrategyCsp?.Dispose();
                 }
 
             }
@@ -187,7 +186,8 @@ public void TestEncryptDecryptWithCSP()
                 }
                 finally
                 {
-                    sqlSetupStrategyCsp.DropTable();
+                    // clean up database resources
+                    sqlSetupStrategyCsp.Dispose();
                 }
             }
             finally

diff --git a/...t.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategyCspExt.cs b/...t.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategyCspExt.cs
@@ -9,7 +9,6 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
     public class SQLSetupStrategyCspExt : SQLSetupStrategy
     {
-        //public string keyPath {get; private set;}
         public Table CspProviderTable { get; private set; }
         public SqlColumnEncryptionCspProvider keyStoreProvider { get; }
 
@@ -21,7 +20,7 @@ public SQLSetupStrategyCspExt(string cspKeyPath) : base(cspKeyPath)
 
         internal override void SetupDatabase()
         {
-            ColumnMasterKey columnMasterKey = new CspColumnMasterKey(GenerateUniqueName("CMK"), SqlColumnEncryptionCspProvider.ProviderName, keyPath);
+            ColumnMasterKey columnMasterKey = new CspColumnMasterKey(GenerateUniqueName("CspExt"), SqlColumnEncryptionCspProvider.ProviderName, keyPath);
             databaseObjects.Add(columnMasterKey);
 
             List<ColumnEncryptionKey> columnEncryptionKeys = CreateColumnEncryptionKeys(columnMasterKey, 2, keyStoreProvider);
@@ -43,14 +42,5 @@ private Table CreateTable(IList<ColumnEncryptionKey> columnEncryptionKeys)
 
             return CspProviderTable;
         }
-
-        public void DropTable()
-        {
-            using (SqlConnection sqlConnection = new SqlConnection(DataTestUtility.TcpConnStr))
-            {
-                sqlConnection.Open();
-                CspProviderTable.Drop(sqlConnection);
-            }
-        }
     }
 }