Skip to content

Tests | Clean up test resources #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 4, 2019
Merged

Tests | Clean up test resources #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
85ef645
Merge pull request #1 from dotnet/master
karinazhou Aug 28, 2019
3351abd
Merge branch 'master' of https://github.com/dotnet/SqlClient
karinazhou Aug 28, 2019
5b34d06
Merge pull request #2 from dotnet/master
karinazhou Sep 16, 2019
ca1c910
Merge pull request #3 from dotnet/master
karinazhou Sep 18, 2019
4a2e322
Merge pull request #4 from dotnet/master
karinazhou Sep 20, 2019
06f29a3
Merge pull request #5 from dotnet/master
karinazhou Oct 3, 2019
665d422
Fix leaking for CspProviderExt
karinazhou Oct 3, 2019
9838345
Clean stored procedures for APIShould
karinazhou Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -102,7 +100,8 @@ public void TestKeysFromCertificatesCreatedWithMultipleCryptoProviders()
finally
{
CertificateUtilityWin.RemoveCertificate(certificateName, StoreLocation.CurrentUser);
sqlSetupStrategyCsp?.DropTable();
// clean up database resources
sqlSetupStrategyCsp?.Dispose();
}

}
Expand Down Expand Up @@ -187,7 +186,8 @@ public void TestEncryptDecryptWithCSP()
}
finally
{
sqlSetupStrategyCsp.DropTable();
// clean up database resources
sqlSetupStrategyCsp.Dispose();
}
}
finally
Expand Down
12 changes: 1 addition & 11 deletions ...t.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategyCspExt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand All @@ -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);
Expand All @@ -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);
}
}
}
}