diff --git a/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityTests.cs b/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityTests.cs index 3c0c4eef2d46..335bc9438b98 100644 --- a/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityTests.cs @@ -16,32 +16,20 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class AdvancedDataSecurityTests : SqlTestsBase + public class AdvancedDataSecurityTests : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var storageV2Client = GetStorageManagementClient(context); - var newResourcesClient = GetResourcesClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient); - } - public AdvancedDataSecurityTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void AdvancedDataSecurityPolicyTest() { - RunPowerShellTest("Test-AdvancedDataSecurityPolicyTest"); + TestRunner.RunTestScript("Test-AdvancedDataSecurityPolicyTest"); } } } \ No newline at end of file diff --git a/src/Sql/Sql.Test/ScenarioTests/AuditTests.cs b/src/Sql/Sql.Test/ScenarioTests/AuditTests.cs index dbe88aa1ddf4..3704c574a4e4 100644 --- a/src/Sql/Sql.Test/ScenarioTests/AuditTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/AuditTests.cs @@ -16,213 +16,195 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class AuditTests : SqlTestsBase + public class AuditTests : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var storageV2Client = GetStorageManagementClient(context); - var newResourcesClient = GetResourcesClient(context); - var monitorManagementClient = GetMonitorManagementClient(context); - var commonMonitorManagementClient = GetCommonMonitorManagementClient(context); - var eventHubManagementClient = GetEventHubManagementClient(context); - var operationalInsightsManagementClient = GetOperationalInsightsManagementClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, storageV2Client, - newResourcesClient, monitorManagementClient, commonMonitorManagementClient, - eventHubManagementClient, operationalInsightsManagementClient); - } - public AuditTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditDatabaseUpdatePolicyWithStorage() { - RunPowerShellTest("Test-BlobAuditDatabaseUpdatePolicyWithStorage"); + TestRunner.RunTestScript("Test-BlobAuditDatabaseUpdatePolicyWithStorage"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditServerUpdatePolicyWithStorage() { - RunPowerShellTest("Test-BlobAuditServerUpdatePolicyWithStorage"); + TestRunner.RunTestScript("Test-BlobAuditServerUpdatePolicyWithStorage"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMSSupportBlobAuditServerUpdatePolicyWithStorage() { - RunPowerShellTest("Test-MSSupportBlobAuditServerUpdatePolicyWithStorage"); + TestRunner.RunTestScript("Test-MSSupportBlobAuditServerUpdatePolicyWithStorage"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditDisableDatabaseAudit() { - RunPowerShellTest("Test-BlobAuditDisableDatabaseAudit"); + TestRunner.RunTestScript("Test-BlobAuditDisableDatabaseAudit"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditDisableServerAudit() { - RunPowerShellTest("Test-BlobAuditDisableServerAudit"); + TestRunner.RunTestScript("Test-BlobAuditDisableServerAudit"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMSSupportBlobAuditDisableServerAudit() { - RunPowerShellTest("Test-MSSupportBlobAuditDisableServerAudit"); + TestRunner.RunTestScript("Test-MSSupportBlobAuditDisableServerAudit"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditFailedDatabaseUpdatePolicyWithNoStorage() { - RunPowerShellTest("Test-BlobAuditFailedDatabaseUpdatePolicyWithNoStorage"); + TestRunner.RunTestScript("Test-BlobAuditFailedDatabaseUpdatePolicyWithNoStorage"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditFailedServerUpdatePolicyWithNoStorage() { - RunPowerShellTest("Test-BlobAuditFailedServerUpdatePolicyWithNoStorage"); + TestRunner.RunTestScript("Test-BlobAuditFailedServerUpdatePolicyWithNoStorage"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMSSupportBlobAuditFailedServerUpdatePolicyWithNoStorage() { - RunPowerShellTest("Test-MSSupportBlobAuditFailedServerUpdatePolicyWithNoStorage"); + TestRunner.RunTestScript("Test-MSSupportBlobAuditFailedServerUpdatePolicyWithNoStorage"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditDatabaseUpdatePolicyKeepPreviousStorage() { - RunPowerShellTest("Test-BlobAuditDatabaseUpdatePolicyKeepPreviousStorage"); + TestRunner.RunTestScript("Test-BlobAuditDatabaseUpdatePolicyKeepPreviousStorage"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditServerUpdatePolicyKeepPreviousStorage() { - RunPowerShellTest("Test-BlobAuditServerUpdatePolicyKeepPreviousStorage"); + TestRunner.RunTestScript("Test-BlobAuditServerUpdatePolicyKeepPreviousStorage"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMSSupportBlobAuditServerUpdatePolicyKeepPreviousStorage() { - RunPowerShellTest("Test-MSSupportBlobAuditServerUpdatePolicyKeepPreviousStorage"); + TestRunner.RunTestScript("Test-MSSupportBlobAuditServerUpdatePolicyKeepPreviousStorage"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditFailWithBadDatabaseIndentity() { - RunPowerShellTest("Test-BlobAuditFailWithBadDatabaseIndentity"); + TestRunner.RunTestScript("Test-BlobAuditFailWithBadDatabaseIndentity"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditFailWithBadServerIndentity() { - RunPowerShellTest("Test-BlobAuditFailWithBadServerIndentity"); + TestRunner.RunTestScript("Test-BlobAuditFailWithBadServerIndentity"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMSSupportBlobAuditFailWithBadServerIndentity() { - RunPowerShellTest("Test-MSSupportBlobAuditFailWithBadServerIndentity"); + TestRunner.RunTestScript("Test-MSSupportBlobAuditFailWithBadServerIndentity"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditDatabaseStorageKeyRotation() { - RunPowerShellTest("Test-BlobAuditDatabaseStorageKeyRotation"); + TestRunner.RunTestScript("Test-BlobAuditDatabaseStorageKeyRotation"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditServerStorageKeyRotation() { - RunPowerShellTest("Test-BlobAuditServerStorageKeyRotation"); + TestRunner.RunTestScript("Test-BlobAuditServerStorageKeyRotation"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditServerRetentionKeepProperties() { - RunPowerShellTest("Test-BlobAuditServerRetentionKeepProperties"); + TestRunner.RunTestScript("Test-BlobAuditServerRetentionKeepProperties"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditDatabaseRetentionKeepProperties() { - RunPowerShellTest("Test-BlobAuditDatabaseRetentionKeepProperties"); + TestRunner.RunTestScript("Test-BlobAuditDatabaseRetentionKeepProperties"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditOnDatabase() { - RunPowerShellTest("Test-BlobAuditOnDatabase"); + TestRunner.RunTestScript("Test-BlobAuditOnDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditOnServer() { - RunPowerShellTest("Test-BlobAuditOnServer"); + TestRunner.RunTestScript("Test-BlobAuditOnServer"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMSSupportBlobAuditOnServer() { - RunPowerShellTest("Test-MSSupportBlobAuditOnServer"); + TestRunner.RunTestScript("Test-MSSupportBlobAuditOnServer"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion() { - RunPowerShellTest("Test-BlobAuditDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion"); + TestRunner.RunTestScript("Test-BlobAuditDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBlobAuditWithAuditActionGroups() { - RunPowerShellTest("Test-BlobAuditWithAuditActionGroups"); + TestRunner.RunTestScript("Test-BlobAuditWithAuditActionGroups"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestExtendedAuditOnDatabase() { - RunPowerShellTest("Test-ExtendedAuditOnDatabase"); + TestRunner.RunTestScript("Test-ExtendedAuditOnDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestExtendedAuditOnServer() { - RunPowerShellTest("Test-ExtendedAuditOnServer"); + TestRunner.RunTestScript("Test-ExtendedAuditOnServer"); } [Fact] @@ -230,7 +212,7 @@ public void TestExtendedAuditOnServer() [Trait(Category.RunType, Category.LiveOnly)] public void TestAuditOnDatabase() { - RunPowerShellTest("Test-AuditOnDatabase"); + TestRunner.RunTestScript("Test-AuditOnDatabase"); } [Fact] @@ -238,7 +220,7 @@ public void TestAuditOnDatabase() [Trait(Category.RunType, Category.LiveOnly)] public void TestAuditOnServer() { - RunPowerShellTest("Test-AuditOnServer"); + TestRunner.RunTestScript("Test-AuditOnServer"); } [Fact] @@ -246,91 +228,91 @@ public void TestAuditOnServer() [Trait(Category.RunType, Category.LiveOnly)] public void TestMSSupportAuditOnServer() { - RunPowerShellTest("Test-MSSupportAuditOnServer"); + TestRunner.RunTestScript("Test-MSSupportAuditOnServer"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestNewDatabaseAuditDiagnosticsAreCreatedOnNeed() { - RunPowerShellTest("Test-NewDatabaseAuditDiagnosticsAreCreatedOnNeed"); + TestRunner.RunTestScript("Test-NewDatabaseAuditDiagnosticsAreCreatedOnNeed"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestNewServerAuditDiagnosticsAreCreatedOnNeed() { - RunPowerShellTest("Test-NewServerAuditDiagnosticsAreCreatedOnNeed"); + TestRunner.RunTestScript("Test-NewServerAuditDiagnosticsAreCreatedOnNeed"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMSSupportNewServerAuditDiagnosticsAreCreatedOnNeed() { - RunPowerShellTest("Test-MSSupportNewServerAuditDiagnosticsAreCreatedOnNeed"); + TestRunner.RunTestScript("Test-MSSupportNewServerAuditDiagnosticsAreCreatedOnNeed"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveAuditOnServer() { - RunPowerShellTest("Test-RemoveAuditOnServer"); + TestRunner.RunTestScript("Test-RemoveAuditOnServer"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMSSupportRemoveAuditOnServer() { - RunPowerShellTest("Test-MSSupportRemoveAuditOnServer"); + TestRunner.RunTestScript("Test-MSSupportRemoveAuditOnServer"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveAuditOnDatabase() { - RunPowerShellTest("Test-RemoveAuditOnDatabase"); + TestRunner.RunTestScript("Test-RemoveAuditOnDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveDatabaseAuditingSettingsMultipleDiagnosticSettings() { - RunPowerShellTest("Test-RemoveDatabaseAuditingSettingsMultipleDiagnosticSettings"); + TestRunner.RunTestScript("Test-RemoveDatabaseAuditingSettingsMultipleDiagnosticSettings"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveServerAuditingSettingsMultipleDiagnosticSettings() { - RunPowerShellTest("Test-RemoveServerAuditingSettingsMultipleDiagnosticSettings"); + TestRunner.RunTestScript("Test-RemoveServerAuditingSettingsMultipleDiagnosticSettings"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMSSupportRemoveServerAuditingSettingsMultipleDiagnosticSettings() { - RunPowerShellTest("Test-MSSupportRemoveServerAuditingSettingsMultipleDiagnosticSettings"); + TestRunner.RunTestScript("Test-MSSupportRemoveServerAuditingSettingsMultipleDiagnosticSettings"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerAuditingToStorageInVNet() { - RunPowerShellTest("Test-ServerAuditingToStorageInVNet"); + TestRunner.RunTestScript("Test-ServerAuditingToStorageInVNet"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMSSupportServerAuditingToStorageInVNet() { - RunPowerShellTest("Test-MSSupportServerAuditingToStorageInVNet"); + TestRunner.RunTestScript("Test-MSSupportServerAuditingToStorageInVNet"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseAuditingToStorageInVNet() { - RunPowerShellTest("Test-DatabaseAuditingToStorageInVNet"); + TestRunner.RunTestScript("Test-DatabaseAuditingToStorageInVNet"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DatabaseBackupStretchTests.cs b/src/Sql/Sql.Test/ScenarioTests/DatabaseBackupStretchTests.cs index 6d6c86809e56..2b899cbc981d 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DatabaseBackupStretchTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DatabaseBackupStretchTests.cs @@ -16,24 +16,20 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class DatabaseBackupStretchTests : SqlTestsBase + public class DatabaseBackupStretchTests : SqlTestRunner { public DatabaseBackupStretchTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestStretchDatabaseListRestorePoints() { - RunPowerShellTest("Test-ListStretchDatabaseRestorePoints"); + TestRunner.RunTestScript("Test-ListStretchDatabaseRestorePoints"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DatabaseBackupTests.cs b/src/Sql/Sql.Test/ScenarioTests/DatabaseBackupTests.cs index b18c7d1fa6ca..d0de8ef6b445 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DatabaseBackupTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DatabaseBackupTests.cs @@ -20,13 +20,10 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class DatabaseBackupTests : SqlTestsBase + public class DatabaseBackupTests : SqlTestRunner { public DatabaseBackupTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact(Skip = "Not recordable")] @@ -35,7 +32,7 @@ public void TestListDatabaseRestorePoints() { // TODO Rewrite SQL backup tests to be recordable // TODO https://github.com/Azure/azure-powershell/issues/4155 - RunPowerShellTest("Test-ListDatabaseRestorePoints"); + TestRunner.RunTestScript("Test-ListDatabaseRestorePoints"); } [Fact(Skip = "Not recordable")] @@ -46,7 +43,7 @@ public void TestRestoreGeoBackup() // TODO https://github.com/Azure/azure-powershell/issues/4155 if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-RestoreGeoBackup"); + TestRunner.RunTestScript("Test-RestoreGeoBackup"); } } @@ -56,7 +53,7 @@ public void TestRestoreDeletedDatabaseBackup() { if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-RestoreDeletedDatabaseBackup"); + TestRunner.RunTestScript("Test-RestoreDeletedDatabaseBackup"); } } @@ -68,7 +65,7 @@ public void TestRestorePointInTimeBackup() // TODO https://github.com/Azure/azure-powershell/issues/4155 if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-RestorePointInTimeBackup"); + TestRunner.RunTestScript("Test-RestorePointInTimeBackup"); } } @@ -80,7 +77,7 @@ public void TestRestoreLongTermRetentionBackup() // TODO https://github.com/Azure/azure-powershell/issues/4155 if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-RestoreLongTermRetentionBackup"); + TestRunner.RunTestScript("Test-RestoreLongTermRetentionBackup"); } } @@ -88,21 +85,21 @@ public void TestRestoreLongTermRetentionBackup() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestLongTermRetentionV2Policy() { - RunPowerShellTest("Test-LongTermRetentionV2Policy"); + TestRunner.RunTestScript("Test-LongTermRetentionV2Policy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestLongTermRetentionV2Backup() { - RunPowerShellTest("Test-LongTermRetentionV2Backup"); + TestRunner.RunTestScript("Test-LongTermRetentionV2Backup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestLongTermRetentionV2ResourceGroupBasedBackup() { - RunPowerShellTest("Test-LongTermRetentionV2ResourceGroupBasedBackup"); + TestRunner.RunTestScript("Test-LongTermRetentionV2ResourceGroupBasedBackup"); } [Fact(Skip = "This is not recordable test")] @@ -113,7 +110,7 @@ public void TestLongTermRetentionV2() // TODO https://github.com/Azure/azure-powershell/issues/4155 if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-LongTermRetentionV2"); + TestRunner.RunTestScript("Test-LongTermRetentionV2"); } } @@ -125,7 +122,7 @@ public void TestCopyLongTermRetentionBackup() // TODO https://github.com/Azure/azure-powershell/issues/4155 if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-CopyLongTermRetentionBackup"); + TestRunner.RunTestScript("Test-CopyLongTermRetentionBackup"); } } @@ -135,7 +132,7 @@ public void TestUpdateLongTermRetentionBackup() { if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-UpdateLongTermRetentionBackup"); + TestRunner.RunTestScript("Test-UpdateLongTermRetentionBackup"); } } @@ -144,7 +141,7 @@ public void TestUpdateLongTermRetentionBackup() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestLongTermRetentionV2ResourceGroupBased() { - RunPowerShellTest("Test-LongTermRetentionV2ResourceGroupBased"); + TestRunner.RunTestScript("Test-LongTermRetentionV2ResourceGroupBased"); } [Fact(Skip = "Not recordable")] @@ -155,7 +152,7 @@ public void TestDatabaseGeoBackupPolicy() // TODO https://github.com/Azure/azure-powershell/issues/4155 if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-DatabaseGeoBackupPolicy"); + TestRunner.RunTestScript("Test-DatabaseGeoBackupPolicy"); } } @@ -167,7 +164,7 @@ public void TestNewDatabaseRestorePoint() // TODO https://github.com/Azure/azure-powershell/issues/4155 if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-NewDatabaseRestorePoint"); + TestRunner.RunTestScript("Test-NewDatabaseRestorePoint"); } } @@ -179,7 +176,7 @@ public void TestRemoveDatabaseRestorePoint() // TODO https://github.com/Azure/azure-powershell/issues/4155 if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-RemoveDatabaseRestorePoint"); + TestRunner.RunTestScript("Test-RemoveDatabaseRestorePoint"); } } @@ -189,7 +186,7 @@ public void TestShortTermRetentionPolicy() { if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-ShortTermRetentionPolicy"); + TestRunner.RunTestScript("Test-ShortTermRetentionPolicy"); } } @@ -197,14 +194,14 @@ public void TestShortTermRetentionPolicy() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateRestoreRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant() { - RunPowerShellTest("Test-CreateRestoreRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant"); + TestRunner.RunTestScript("Test-CreateRestoreRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant"); } [Fact(Skip = "Location 'East US 2 EUAP' is not accepting creation of new Windows Azure SQL Database servers at this time.'")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateRestoreRegularAndZoneRedundantDatabaseWithSourceZoneRedundant() { - RunPowerShellTest("Test-CreateRestoreRegularAndZoneRedundantDatabaseWithSourceZoneRedundant"); + TestRunner.RunTestScript("Test-CreateRestoreRegularAndZoneRedundantDatabaseWithSourceZoneRedundant"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DatabaseCrudStretchTests.cs b/src/Sql/Sql.Test/ScenarioTests/DatabaseCrudStretchTests.cs index 5eccba3cbdea..97e71c7aa2aa 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DatabaseCrudStretchTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DatabaseCrudStretchTests.cs @@ -16,45 +16,41 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class DatabaseCrudStretchTests : SqlTestsBase + public class DatabaseCrudStretchTests : SqlTestRunner { public DatabaseCrudStretchTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestStretchDatabaseCreate() { - RunPowerShellTest("Test-CreateStretchDatabase"); + TestRunner.RunTestScript("Test-CreateStretchDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestStretchDatabaseUpdate() { - RunPowerShellTest("Test-UpdateStretchDatabase"); + TestRunner.RunTestScript("Test-UpdateStretchDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestStretchDatabaseGet() { - RunPowerShellTest("Test-GetStretchDatabase"); + TestRunner.RunTestScript("Test-GetStretchDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestStretchDatabaseRemove() { - RunPowerShellTest("Test-RemoveStretchDatabase"); + TestRunner.RunTestScript("Test-RemoveStretchDatabase"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DatabaseCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/DatabaseCrudTests.cs index 0d0d5e375268..53f230e49c36 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DatabaseCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DatabaseCrudTests.cs @@ -19,112 +19,101 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class DatabaseCrudTests : SqlTestsBase + public class DatabaseCrudTests : SqlTestRunner { public DatabaseCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; - } - - protected override void SetupManagementClients(Rest.ClientRuntime.Azure.TestFramework.MockContext context) - { - // Only SqlClient is needed. - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseCreate() { - RunPowerShellTest("Test-CreateDatabase"); + TestRunner.RunTestScript("Test-CreateDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestVcoreDatabaseCreate() { - RunPowerShellTest("Test-CreateVcoreDatabase"); + TestRunner.RunTestScript("Test-CreateVcoreDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestVcoreDatabaseCreateWithLicenseType() { - RunPowerShellTest("Test-CreateVcoreDatabaseWithLicenseType"); + TestRunner.RunTestScript("Test-CreateVcoreDatabaseWithLicenseType"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateServerlessDatabase() { - RunPowerShellTest("Test-CreateServerlessDatabase"); + TestRunner.RunTestScript("Test-CreateServerlessDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseCreateWithSampleName() { - RunPowerShellTest("Test-CreateDatabaseWithSampleName"); + TestRunner.RunTestScript("Test-CreateDatabaseWithSampleName"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseCreateWithZoneRedundancy() { - RunPowerShellTest("Test-CreateDatabaseWithZoneRedundancy"); + TestRunner.RunTestScript("Test-CreateDatabaseWithZoneRedundancy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseCreateWithMaintenanceConfigurationId() { - RunPowerShellTest("Test-CreateDatabaseWithMaintenanceConfigurationId"); + TestRunner.RunTestScript("Test-CreateDatabaseWithMaintenanceConfigurationId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseUpdate() { - RunPowerShellTest("Test-UpdateDatabase"); + TestRunner.RunTestScript("Test-UpdateDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestVcoreDatabaseUpdate() { - RunPowerShellTest("Test-UpdateVcoreDatabase"); + TestRunner.RunTestScript("Test-UpdateVcoreDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestVcoreDatabaseUpdateWithLicenseType() { - RunPowerShellTest("Test-UpdateVcoreDatabaseLicenseType"); + TestRunner.RunTestScript("Test-UpdateVcoreDatabaseLicenseType"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseUpdateWithZoneRedundancy() { - RunPowerShellTest("Test-UpdateDatabaseWithZoneRedundant"); + TestRunner.RunTestScript("Test-UpdateDatabaseWithZoneRedundant"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseUpdateWithZoneRedundancyNotSpecified() { - RunPowerShellTest("Test-UpdateDatabaseWithZoneRedundantNotSpecified"); + TestRunner.RunTestScript("Test-UpdateDatabaseWithZoneRedundantNotSpecified"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseUpdateWithMaintenanceConfigurationId() { - RunPowerShellTest("Test-UpdateDatabaseWithMaintenanceConfigurationId"); + TestRunner.RunTestScript("Test-UpdateDatabaseWithMaintenanceConfigurationId"); } @@ -132,70 +121,70 @@ public void TestDatabaseUpdateWithMaintenanceConfigurationId() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateServerlessDatabase() { - RunPowerShellTest("Test-UpdateServerlessDatabase"); + TestRunner.RunTestScript("Test-UpdateServerlessDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseRename() { - RunPowerShellTest("Test-RenameDatabase"); + TestRunner.RunTestScript("Test-RenameDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseGet() { - RunPowerShellTest("Test-GetDatabase"); + TestRunner.RunTestScript("Test-GetDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseGetWithZoneRedundancy() { - RunPowerShellTest("Test-GetDatabaseWithZoneRedundancy"); + TestRunner.RunTestScript("Test-GetDatabaseWithZoneRedundancy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseGetWithMaintenanceConfigurationId() { - RunPowerShellTest("Test-GetDatabaseWithMaintenanceConfigurationId"); + TestRunner.RunTestScript("Test-GetDatabaseWithMaintenanceConfigurationId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseRemove() { - RunPowerShellTest("Test-RemoveDatabase"); + TestRunner.RunTestScript("Test-RemoveDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseCancelOperation() { - RunPowerShellTest("Test-CancelDatabaseOperation"); + TestRunner.RunTestScript("Test-CancelDatabaseOperation"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseCreateWithBackupStorageRedundancy() { - RunPowerShellTest("Test-CreateDatabaseWithBackupStorageRedundancy"); + TestRunner.RunTestScript("Test-CreateDatabaseWithBackupStorageRedundancy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseGetWithBackupStorageRedundancy() { - RunPowerShellTest("Test-GetDatabaseWithBackupStorageRedundancy"); + TestRunner.RunTestScript("Test-GetDatabaseWithBackupStorageRedundancy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseCreateWithLedgerEnabled() { - RunPowerShellTest("Test-DatabaseCreateWithLedgerEnabled"); + TestRunner.RunTestScript("Test-DatabaseCreateWithLedgerEnabled"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DistributedAvailabilityGroupTests.cs b/src/Sql/Sql.Test/ScenarioTests/DistributedAvailabilityGroupTests.cs index 5fcde4a2b541..8ed91478d8c5 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DistributedAvailabilityGroupTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DistributedAvailabilityGroupTests.cs @@ -16,47 +16,34 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class DistributedAvailabilityGroupTests : SqlTestsBase + public class DistributedAvailabilityGroupTests : SqlTestRunner { public DistributedAvailabilityGroupTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; - } - - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var newResourcesClient = GetResourcesClient(context); - var sqlClient = GetSqlClient(context); - var networkClient = GetNetworkClient(context); - var graphClient = GetGraphClientVersion1_6(context); - Helper.SetupSomeOfManagementClients(newResourcesClient, sqlClient, networkClient, graphClient); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceLink() { - RunPowerShellTest("Test-ManagedInstanceLink"); + TestRunner.RunTestScript("Test-ManagedInstanceLink"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceLinkErrHandling() { - RunPowerShellTest("Test-ManagedInstanceLinkErrHandling"); + TestRunner.RunTestScript("Test-ManagedInstanceLinkErrHandling"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceLinkPiping() { - RunPowerShellTest("Test-ManagedInstanceLinkPiping"); + TestRunner.RunTestScript("Test-ManagedInstanceLinkPiping"); } } } \ No newline at end of file diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobAgentCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobAgentCrudTests.cs index fd1527f083b5..2d73aac64659 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobAgentCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobAgentCrudTests.cs @@ -19,14 +19,10 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobAgentCrudTests : SqlTestsBase + public class ElasticJobAgentCrudTests : SqlTestRunner { public ElasticJobAgentCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers", - "Microsoft.Sql/servers/databases" - }; } #region Create Tests @@ -35,7 +31,7 @@ public ElasticJobAgentCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAgentCreate() { - RunPowerShellTest("Test-CreateAgent"); + TestRunner.RunTestScript("Test-CreateAgent"); } #endregion @@ -46,7 +42,7 @@ public void TestAgentCreate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAgentUpdate() { - RunPowerShellTest("Test-UpdateAgent"); + TestRunner.RunTestScript("Test-UpdateAgent"); } #endregion @@ -57,7 +53,7 @@ public void TestAgentUpdate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAgentGet() { - RunPowerShellTest("Test-GetAgent"); + TestRunner.RunTestScript("Test-GetAgent"); } #endregion @@ -68,7 +64,7 @@ public void TestAgentGet() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAgentRemove() { - RunPowerShellTest("Test-RemoveAgent"); + TestRunner.RunTestScript("Test-RemoveAgent"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticPoolCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticPoolCrudTests.cs index a436a89c355f..9fb641617969 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticPoolCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticPoolCrudTests.cs @@ -14,19 +14,15 @@ using Microsoft.Azure.Commands.ScenarioTest.SqlTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; using Xunit; using Xunit.Abstractions; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticPoolCrudTests : SqlTestsBase + public class ElasticPoolCrudTests : SqlTestRunner { public ElasticPoolCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } // Currently the test runs too long to be marked as a check-in test. @@ -34,14 +30,14 @@ public ElasticPoolCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestElasticPoolCreate() { - RunPowerShellTest("Test-CreateElasticPool"); + TestRunner.RunTestScript("Test-CreateElasticPool"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestVcoreElasticPoolCreate() { - RunPowerShellTest("Test-CreateVcoreElasticPool"); + TestRunner.RunTestScript("Test-CreateVcoreElasticPool"); } [Fact] @@ -49,126 +45,126 @@ public void TestVcoreElasticPoolCreate() [Trait(Category.RunType, Category.DesktopOnly)] public void TestVcoreElasticPoolCreateWithLicenseType() { - RunPowerShellTest("Test-CreateVcoreElasticPoolWithLicenseType"); + TestRunner.RunTestScript("Test-CreateVcoreElasticPoolWithLicenseType"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestElasticPoolCreateWithZoneRedundancy() { - RunPowerShellTest("Test-CreateElasticPoolWithZoneRedundancy"); + TestRunner.RunTestScript("Test-CreateElasticPoolWithZoneRedundancy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestElasticPoolCreateWithMaintenanceConfigurationId() { - RunPowerShellTest("Test-CreateElasticPoolWithMaintenanceConfigurationId"); + TestRunner.RunTestScript("Test-CreateElasticPoolWithMaintenanceConfigurationId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestHyperscaleElasticPoolCreate() { - RunPowerShellTest("Test-CreateHyperscaleElasticPool"); + TestRunner.RunTestScript("Test-CreateHyperscaleElasticPool"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestHyperscaleElasticPoolCreateWithReplica() { - RunPowerShellTest("Test-CreateHyperscaleElasticPoolWithReplica"); + TestRunner.RunTestScript("Test-CreateHyperscaleElasticPoolWithReplica"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestElasticPoolUpdate() { - RunPowerShellTest("Test-UpdateElasticPool"); + TestRunner.RunTestScript("Test-UpdateElasticPool"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestVcoreElasticPoolUpdate() { - RunPowerShellTest("Test-UpdateVcoreElasticPool"); + TestRunner.RunTestScript("Test-UpdateVcoreElasticPool"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestVcoreElasticPoolUpdateWithLicenseType() { - RunPowerShellTest("Test-UpdateVcoreElasticPoolWithLicenseType"); + TestRunner.RunTestScript("Test-UpdateVcoreElasticPoolWithLicenseType"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestElasticPoolUpdateWithZoneRedundancy() { - RunPowerShellTest("Test-UpdateElasticPoolWithZoneRedundancy"); + TestRunner.RunTestScript("Test-UpdateElasticPoolWithZoneRedundancy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestElasticPoolUpdateWithMaintenanceConfigurationId() { - RunPowerShellTest("Test-UpdateElasticPoolWithMaintenanceConfigurationId"); + TestRunner.RunTestScript("Test-UpdateElasticPoolWithMaintenanceConfigurationId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestHyperscaleElasticPoolUpdateReplicaCount() { - RunPowerShellTest("Test-UpdateHyperscaleElasticPoolReplicaCount"); + TestRunner.RunTestScript("Test-UpdateHyperscaleElasticPoolReplicaCount"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestMoveDatabaseOutHyperscaleElasticPool() { - RunPowerShellTest("Test-MoveDatabaseOutHyperscaleElasticPool"); + TestRunner.RunTestScript("Test-MoveDatabaseOutHyperscaleElasticPool"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestElasticPoolGet() { - RunPowerShellTest("Test-GetElasticPool"); + TestRunner.RunTestScript("Test-GetElasticPool"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestElasticPoolGetWithZoneRedundancy() { - RunPowerShellTest("Test-GetElasticPoolWithZoneRedundancy"); + TestRunner.RunTestScript("Test-GetElasticPoolWithZoneRedundancy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestElasticPoolGetWithMaintenanceConfigurationId() { - RunPowerShellTest("Test-GetElasticPoolWithMaintenanceConfigurationId"); + TestRunner.RunTestScript("Test-GetElasticPoolWithMaintenanceConfigurationId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestHyperscaleElasticPoolGet() { - RunPowerShellTest("Test-GetHyperscaleElasticPool"); + TestRunner.RunTestScript("Test-GetHyperscaleElasticPool"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestElasticPoolRemove() { - RunPowerShellTest("Test-RemoveElasticPool"); + TestRunner.RunTestScript("Test-RemoveElasticPool"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestElasticPoolCancelOperation() { - RunPowerShellTest("Test-ListAndCancelElasticPoolOperation"); + TestRunner.RunTestScript("Test-ListAndCancelElasticPoolOperation"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/EndpointCertificateTests.cs b/src/Sql/Sql.Test/ScenarioTests/EndpointCertificateTests.cs index 076e6de40641..cd5060bd796b 100644 --- a/src/Sql/Sql.Test/ScenarioTests/EndpointCertificateTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/EndpointCertificateTests.cs @@ -16,34 +16,20 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class EndpointCertificateTests : SqlTestsBase + public class EndpointCertificateTests : SqlTestRunner { - public EndpointCertificateTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; - } - - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var newResourcesClient = GetResourcesClient(context); - var sqlClient = GetSqlClient(context); - var networkClient = GetNetworkClient(context); - var graphClient = GetGraphClientVersion1_6(context); - Helper.SetupSomeOfManagementClients(newResourcesClient, sqlClient, networkClient, graphClient); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestEndpointCertificate() { - RunPowerShellTest("Test-EndpointCertificate"); + TestRunner.RunTestScript("Test-EndpointCertificate"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/FailoverTests.cs b/src/Sql/Sql.Test/ScenarioTests/FailoverTests.cs index e34be8ce4f4b..05ff16b5312f 100644 --- a/src/Sql/Sql.Test/ScenarioTests/FailoverTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/FailoverTests.cs @@ -14,82 +14,78 @@ using Microsoft.Azure.Commands.ScenarioTest.SqlTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; using Xunit; using Xunit.Abstractions; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class FailoverTests : SqlTestsBase + public class FailoverTests : SqlTestRunner { public FailoverTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverDatabase() { - RunPowerShellTest("Test-FailoverDatabase"); + TestRunner.RunTestScript("Test-FailoverDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverDatabasePassThru() { - RunPowerShellTest("Test-FailoverDatabasePassThru"); + TestRunner.RunTestScript("Test-FailoverDatabasePassThru"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverDatabaseWithDatabasePiping() { - RunPowerShellTest("Test-FailoverDatabaseWithDatabasePiping"); + TestRunner.RunTestScript("Test-FailoverDatabaseWithDatabasePiping"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverDatabaseWithServerPiping() { - RunPowerShellTest("Test-FailoverDatabaseWithServerPiping"); + TestRunner.RunTestScript("Test-FailoverDatabaseWithServerPiping"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverDatabaseReadableSecondary() { - RunPowerShellTest("Test-FailoverDatabaseReadableSecondary"); + TestRunner.RunTestScript("Test-FailoverDatabaseReadableSecondary"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverStandardDatabaseReadableSecondary() { - RunPowerShellTest("Test-FailoverStandardDatabaseReadableSecondary"); + TestRunner.RunTestScript("Test-FailoverStandardDatabaseReadableSecondary"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverElasticPool() { - RunPowerShellTest("Test-FailoverElasticPool"); + TestRunner.RunTestScript("Test-FailoverElasticPool"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverElasticPoolPassThru() { - RunPowerShellTest("Test-FailoverElasticPoolPassThru"); + TestRunner.RunTestScript("Test-FailoverElasticPoolPassThru"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverElasticPoolWithPoolPiping() { - RunPowerShellTest("Test-FailoverElasticPoolWithPoolPiping"); + TestRunner.RunTestScript("Test-FailoverElasticPoolWithPoolPiping"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/InstanceFailoverGroupTests.cs b/src/Sql/Sql.Test/ScenarioTests/InstanceFailoverGroupTests.cs index 6d828cf809c3..feeecb132ae4 100644 --- a/src/Sql/Sql.Test/ScenarioTests/InstanceFailoverGroupTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/InstanceFailoverGroupTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class InstanceFailoverGroupTests : SqlTestsBase + public class InstanceFailoverGroupTests : SqlTestRunner { public InstanceFailoverGroupTests(ITestOutputHelper output) : base(output) { @@ -29,84 +29,84 @@ public InstanceFailoverGroupTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateInstanceFailoverGroup_Named() { - RunPowerShellTest("Test-CreateInstanceFailoverGroup-Named"); + TestRunner.RunTestScript("Test-CreateInstanceFailoverGroup-Named"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateInstanceFailoverGroup_Positional() { - RunPowerShellTest("Test-CreateInstanceFailoverGroup-Positional"); + TestRunner.RunTestScript("Test-CreateInstanceFailoverGroup-Positional"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateInstanceFailoverGroup_AutomaticPolicy() { - RunPowerShellTest("Test-CreateInstanceFailoverGroup-AutomaticPolicy"); + TestRunner.RunTestScript("Test-CreateInstanceFailoverGroup-AutomaticPolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateInstanceFailoverGroup_AutomaticPolicyGracePeriodReadOnlyFailover() { - RunPowerShellTest("Test-CreateInstanceFailoverGroup-AutomaticPolicyGracePeriodReadOnlyFailover"); + TestRunner.RunTestScript("Test-CreateInstanceFailoverGroup-AutomaticPolicyGracePeriodReadOnlyFailover"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateInstanceFailoverGroup_ManualPolicy() { - RunPowerShellTest("Test-CreateInstanceFailoverGroup-ManualPolicy"); + TestRunner.RunTestScript("Test-CreateInstanceFailoverGroup-ManualPolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetInstanceFailoverGroup_Named() { - RunPowerShellTest("Test-SetInstanceFailoverGroup-Named"); + TestRunner.RunTestScript("Test-SetInstanceFailoverGroup-Named"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetInstanceFailoverGroup_Positional() { - RunPowerShellTest("Test-SetInstanceFailoverGroup-Positional"); + TestRunner.RunTestScript("Test-SetInstanceFailoverGroup-Positional"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetInstanceFailoverGroup_AutomaticWithGracePeriodReadOnlyFailover() { - RunPowerShellTest("Test-SetInstanceFailoverGroup-AutomaticWithGracePeriodReadOnlyFailover"); + TestRunner.RunTestScript("Test-SetInstanceFailoverGroup-AutomaticWithGracePeriodReadOnlyFailover"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetInstanceFailoverGroup_AutomaticToManual() { - RunPowerShellTest("Test-SetInstanceFailoverGroup-AutomaticToManual"); + TestRunner.RunTestScript("Test-SetInstanceFailoverGroup-AutomaticToManual"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetInstanceFailoverGroup_ManualToAutomaticNoGracePeriod() { - RunPowerShellTest("Test-SetInstanceFailoverGroup-ManualToAutomaticNoGracePeriod"); + TestRunner.RunTestScript("Test-SetInstanceFailoverGroup-ManualToAutomaticNoGracePeriod"); } [Fact(Skip = "Command Swith should be executed on secondary.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void Test_SwitchInstanceFailoverGroup() { - RunPowerShellTest("Test-SwitchInstanceFailoverGroup"); + TestRunner.RunTestScript("Test-SwitchInstanceFailoverGroup"); } [Fact(Skip = "Command Swith should be executed on secondary.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void Test_SwitchInstanceFailoverGroupAllowDataLoss() { - RunPowerShellTest("Test-SwitchInstanceFailoverGroupAllowDataLoss"); + TestRunner.RunTestScript("Test-SwitchInstanceFailoverGroupAllowDataLoss"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/LedgerDigestUploadTests.cs b/src/Sql/Sql.Test/ScenarioTests/LedgerDigestUploadTests.cs index b74915dd79d0..d0db2d1a5994 100644 --- a/src/Sql/Sql.Test/ScenarioTests/LedgerDigestUploadTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/LedgerDigestUploadTests.cs @@ -13,48 +13,44 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.ScenarioTest.SqlTests; -using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class LedgerDigestUploadTests : SqlTestsBase + public class LedgerDigestUploadTests : SqlTestRunner { public LedgerDigestUploadTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetDefaultLedgerDigestUpload() { - RunPowerShellTest("Test-GetDefaultLedgerDigestUpload"); + TestRunner.RunTestScript("Test-GetDefaultLedgerDigestUpload"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetLedgerDigestUploadByName() { - RunPowerShellTest("Test-SetLedgerDigestUploadByName"); + TestRunner.RunTestScript("Test-SetLedgerDigestUploadByName"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetLedgerDigestUploadByDatabaseObject() { - RunPowerShellTest("Test-SetLedgerDigestUploadByDatabaseObject"); + TestRunner.RunTestScript("Test-SetLedgerDigestUploadByDatabaseObject"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetLedgerDigestUploadByResourceId() { - RunPowerShellTest("Test-SetLedgerDigestUploadByResourceId"); + TestRunner.RunTestScript("Test-SetLedgerDigestUploadByResourceId"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/LocationCapabilitiesTests.cs b/src/Sql/Sql.Test/ScenarioTests/LocationCapabilitiesTests.cs index 22d90fb0ad60..2d4bff596e49 100644 --- a/src/Sql/Sql.Test/ScenarioTests/LocationCapabilitiesTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/LocationCapabilitiesTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class LocationCapabilitiesTests : SqlTestsBase + public class LocationCapabilitiesTests : SqlTestRunner { public LocationCapabilitiesTests(ITestOutputHelper output) : base(output) { @@ -29,7 +29,7 @@ public LocationCapabilitiesTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestLocationCapabilities() { - RunPowerShellTest("Test-Capabilities"); + TestRunner.RunTestScript("Test-Capabilities"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseBackupTests.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseBackupTests.cs index 1d1ac2af1c64..d665294c100c 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseBackupTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseBackupTests.cs @@ -14,67 +14,53 @@ using Microsoft.Azure.Commands.ScenarioTest.SqlTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { /// /// These tests depends on the existing resources. Please contact MDCSSQLCustomerExp@microsoft.com for instructions. /// - public class ManagedDatabaseBackupTests : SqlTestsBase + public class ManagedDatabaseBackupTests : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var networkClient = GetNetworkClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient); - } - public ManagedDatabaseBackupTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/managedInstances", - "Microsoft.Sql/managedInstances/databases" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void ManagedDatabaseShortTermRetentionPolicy() { - RunPowerShellTest("Test-ManagedLiveDatabaseShortTermRetentionPolicy"); + TestRunner.RunTestScript("Test-ManagedLiveDatabaseShortTermRetentionPolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void ManagedDeletedDatabaseShortTermRetentionPolicy() { - RunPowerShellTest("Test-ManagedDeletedDatabaseShortTermRetentionPolicy"); + TestRunner.RunTestScript("Test-ManagedDeletedDatabaseShortTermRetentionPolicy"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceLongTermRetentionPolicy() { - RunPowerShellTest("Test-ManagedInstanceLongTermRetentionPolicy"); + TestRunner.RunTestScript("Test-ManagedInstanceLongTermRetentionPolicy"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceLongTermRetentionBackup() { - RunPowerShellTest("Test-ManagedInstanceLongTermRetentionBackup"); + TestRunner.RunTestScript("Test-ManagedInstanceLongTermRetentionBackup"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceLongTermRetentionResourceGroupBasedBackup() { - RunPowerShellTest("Test-ManagedInstanceLongTermRetentionResourceGroupBasedBackup"); + TestRunner.RunTestScript("Test-ManagedInstanceLongTermRetentionResourceGroupBasedBackup"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseCrudScenarioTests.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseCrudScenarioTests.cs index 13fa359bb783..aacf47ca55dd 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseCrudScenarioTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseCrudScenarioTests.cs @@ -13,84 +13,68 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.ScenarioTest.SqlTests; -using Microsoft.Azure.Management.Sql; -using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { /// /// These tests depends on the existing resources. Please contact MDCSSQLCustomerExp@microsoft.com for instructions. /// - public class ManagedDatabaseCrudScenarioTests : SqlTestsBase + public class ManagedDatabaseCrudScenarioTests : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var networkClient = GetNetworkClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient); - } - public ManagedDatabaseCrudScenarioTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/managedInstances", - "Microsoft.Sql/managedInstances/databases", - "Microsoft.Sql/managedInstances/managedDatabases" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateManagedDatabase() { - RunPowerShellTest("Test-CreateManagedDatabase"); + TestRunner.RunTestScript("Test-CreateManagedDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetManagedDatabase() { - RunPowerShellTest("Test-GetManagedDatabase"); + TestRunner.RunTestScript("Test-GetManagedDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveManagedDatabase() { - RunPowerShellTest("Test-RemoveManagedDatabase"); + TestRunner.RunTestScript("Test-RemoveManagedDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRestoreManagedDatabase() { - RunPowerShellTest("Test-RestoreManagedDatabase"); + TestRunner.RunTestScript("Test-RestoreManagedDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRestoreDeletedManagedDatabase() { - RunPowerShellTest("Test-RestoreDeletedManagedDatabase"); + TestRunner.RunTestScript("Test-RestoreDeletedManagedDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetManagedDatabaseGeoBackup() { - RunPowerShellTest("Test-GetManagedDatabaseGeoBackup"); + TestRunner.RunTestScript("Test-GetManagedDatabaseGeoBackup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGeoRestoreManagedDatabase() { - RunPowerShellTest("Test-GeoRestoreManagedDatabase"); + TestRunner.RunTestScript("Test-GeoRestoreManagedDatabase"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceCrudScenarioTests.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceCrudScenarioTests.cs index 375571e71ef9..4c40d59f2c5a 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceCrudScenarioTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceCrudScenarioTests.cs @@ -13,86 +13,75 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.ScenarioTest.SqlTests; -using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { /// /// These tests depends on the existing resources. Please contact MDCSSQLCustomerExp@microsoft.com for instructions. /// - public class ManagedInstanceCrudScenarioTests : SqlTestsBase + public class ManagedInstanceCrudScenarioTests : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var networkClient = GetNetworkClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient); - } - public ManagedInstanceCrudScenarioTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { "Microsoft.Sql/managedInstances" }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateManagedInstance() { - RunPowerShellTest("Test-CreateManagedInstance"); + TestRunner.RunTestScript("Test-CreateManagedInstance"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetManagedInstance() { - RunPowerShellTest("Test-SetManagedInstance"); + TestRunner.RunTestScript("Test-SetManagedInstance"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetBackupStorageRedundancy() { - RunPowerShellTest("Test-SetRedundancy"); + TestRunner.RunTestScript("Test-SetRedundancy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveManagedInstance() { - RunPowerShellTest("Test-RemoveManagedInstance"); + TestRunner.RunTestScript("Test-RemoveManagedInstance"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateManagedInstanceWithIdentity() { - RunPowerShellTest("Test-CreateManagedInstanceWithIdentity"); + TestRunner.RunTestScript("Test-CreateManagedInstanceWithIdentity"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateUpdateManagedInstanceWithMinimalTlsVersion() { - RunPowerShellTest("Test-CreateUpdateManagedInstanceWithMinimalTlsVersion"); + TestRunner.RunTestScript("Test-CreateUpdateManagedInstanceWithMinimalTlsVersion"); } [Fact(Skip = "It is unknow for now how to fix this.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateManagedInstanceWithMaintenanceConfigurationId() { - RunPowerShellTest("Test-CreateManagedInstanceWithMaintenanceConfigurationId"); + TestRunner.RunTestScript("Test-CreateManagedInstanceWithMaintenanceConfigurationId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateManagedInstanceWithMultiAzEnabled() { - RunPowerShellTest("Test-CreateManagedInstanceWithMultiAzEnabled"); + TestRunner.RunTestScript("Test-CreateManagedInstanceWithMultiAzEnabled"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceFailoverScenarioTests.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceFailoverScenarioTests.cs index 54e1f56d675f..847a7644cfba 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceFailoverScenarioTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceFailoverScenarioTests.cs @@ -13,7 +13,6 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.ScenarioTest.SqlTests; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; using Xunit; using Xunit.Abstractions; using Microsoft.WindowsAzure.Commands.ScenarioTest; @@ -23,16 +22,8 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests /// /// These tests depends on the existing resources. Please contact MDCSSQLCustomerExp@microsoft.com for instructions. /// - public class ManagedInstanceFailoverScenarioTests : SqlTestsBase + public class ManagedInstanceFailoverScenarioTests : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var networkClient = GetNetworkClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient); - } - public ManagedInstanceFailoverScenarioTests(ITestOutputHelper output) : base(output) { } @@ -41,7 +32,7 @@ public ManagedInstanceFailoverScenarioTests(ITestOutputHelper output) : base(out [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverManagedInstance() { - RunPowerShellTest("Test-FailoverManagedInstance"); + TestRunner.RunTestScript("Test-FailoverManagedInstance"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceOperationScenarioTests.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceOperationScenarioTests.cs index bbe348f4294d..075b26aa3b69 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceOperationScenarioTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceOperationScenarioTests.cs @@ -16,23 +16,14 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { /// /// These tests depends on the existing resources. Please contact MDCSSQLCustomerExp@microsoft.com for instructions. /// - public class ManagedInstanceOperationScenarioTests : SqlTestsBase + public class ManagedInstanceOperationScenarioTests : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var networkClient = GetNetworkClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient); - } - public ManagedInstanceOperationScenarioTests(ITestOutputHelper output) : base(output) { ////base.resourceTypesToIgnoreApiVersion = new string[] { "Microsoft.Sql/managedInstance/operations" }; @@ -42,14 +33,14 @@ public ManagedInstanceOperationScenarioTests(ITestOutputHelper output) : base(ou [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetManagedInstanceOperation() { - RunPowerShellTest("Test-GetManagedInstanceOperation"); + TestRunner.RunTestScript("Test-GetManagedInstanceOperation"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestStopManagedInstanceOperation() { - RunPowerShellTest("Test-StopManagedInstanceOperation"); + TestRunner.RunTestScript("Test-StopManagedInstanceOperation"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ReadScaleCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ReadScaleCrudTests.cs index 8c01d7bac993..f451004f9944 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ReadScaleCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ReadScaleCrudTests.cs @@ -19,34 +19,31 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ReadScaleCrudTests : SqlTestsBase + public class ReadScaleCrudTests : SqlTestRunner { public ReadScaleCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseReadScaleCreateUpdate() { - RunPowerShellTest("Test-CreateUpdateDatabaseReadScale"); + TestRunner.RunTestScript("Test-CreateUpdateDatabaseReadScale"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseReadScaleGet() { - RunPowerShellTest("Test-GetDatabaseReadScale"); + TestRunner.RunTestScript("Test-GetDatabaseReadScale"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseReadReplicaCount() { - RunPowerShellTest("Test-DatabaseReadReplicaCount"); + TestRunner.RunTestScript("Test-DatabaseReadReplicaCount"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ServerCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServerCrudTests.cs index 0d02afae8005..4cd792fb26d1 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerCrudTests.cs @@ -16,11 +16,10 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServerCrudTests : SqlTestsBase + public class ServerCrudTests : SqlTestRunner { public ServerCrudTests(ITestOutputHelper output) : base(output) { @@ -30,105 +29,105 @@ public ServerCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerCreate() { - RunPowerShellTest("Test-CreateServer"); + TestRunner.RunTestScript("Test-CreateServer"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerUpdate() { - RunPowerShellTest("Test-UpdateServer"); + TestRunner.RunTestScript("Test-UpdateServer"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerGet() { - RunPowerShellTest("Test-GetServer"); + TestRunner.RunTestScript("Test-GetServer"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerRemove() { - RunPowerShellTest("Test-RemoveServer"); + TestRunner.RunTestScript("Test-RemoveServer"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerCreateWithIdentity() { - RunPowerShellTest("Test-CreateServerWithIdentity"); + TestRunner.RunTestScript("Test-CreateServerWithIdentity"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerUpdateWithIdentity() { - RunPowerShellTest("Test-UpdateServerWithIdentity"); + TestRunner.RunTestScript("Test-UpdateServerWithIdentity"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerCreateWithFederatedClientId() { - RunPowerShellTest("Test-CreateServerWithFederatedClientId"); + TestRunner.RunTestScript("Test-CreateServerWithFederatedClientId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerUpdateWithFederatedClientId() { - RunPowerShellTest("Test-UpdatingServerWithFederatedClientId"); + TestRunner.RunTestScript("Test-UpdatingServerWithFederatedClientId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerUpdateWithoutIdentity() { - RunPowerShellTest("Test-UpdateServerWithoutIdentity"); + TestRunner.RunTestScript("Test-UpdateServerWithoutIdentity"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerCreateAndGetWithPublicNetworkAccess() { - RunPowerShellTest("Test-CreateAndGetServerWithPublicNetworkAccess"); + TestRunner.RunTestScript("Test-CreateAndGetServerWithPublicNetworkAccess"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerUpdateWithPublicNetworkAccess() { - RunPowerShellTest("Test-UpdateServerWithPublicNetworkAccess"); + TestRunner.RunTestScript("Test-UpdateServerWithPublicNetworkAccess"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestOutboundFirewallRulesCRUD() { - RunPowerShellTest("Test-OutboundFirewallRulesCRUD"); + TestRunner.RunTestScript("Test-OutboundFirewallRulesCRUD"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerCreateAndGetWithRestrictOutboundNetworkAccess() { - RunPowerShellTest("Test-CreateAndGetServerWithRestrictOutboundNetworkAccess"); + TestRunner.RunTestScript("Test-CreateAndGetServerWithRestrictOutboundNetworkAccess"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerUpdateWithRestrictOutboundNetworkAccess() { - RunPowerShellTest("Test-UpdateServerWithRestrictOutboundNetworkAccess"); + TestRunner.RunTestScript("Test-UpdateServerWithRestrictOutboundNetworkAccess"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void CreateandUpdateServerWithMinimalTlsVersion() { - RunPowerShellTest("Test-CreateandUpdateServerWithMinimalTlsVersion"); + TestRunner.RunTestScript("Test-CreateandUpdateServerWithMinimalTlsVersion"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ServerDnsAliasTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServerDnsAliasTests.cs index 3e61b99cabe8..56e8b8e000ad 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerDnsAliasTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerDnsAliasTests.cs @@ -19,41 +19,38 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServerDnsAliasTests : SqlTestsBase + public class ServerDnsAliasTests : SqlTestRunner { public ServerDnsAliasTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateServerDnsAlias() { - RunPowerShellTest("Test-CreateServerDnsAlias"); + TestRunner.RunTestScript("Test-CreateServerDnsAlias"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerDnsAliasUpdate() { - RunPowerShellTest("Test-UpdateServerDnsAlias"); + TestRunner.RunTestScript("Test-UpdateServerDnsAlias"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerDnsAliasGet() { - RunPowerShellTest("Test-GetServerDnsAlias"); + TestRunner.RunTestScript("Test-GetServerDnsAlias"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerDnsAliasRemove() { - RunPowerShellTest("Test-RemoveServerDnsAlias"); + TestRunner.RunTestScript("Test-RemoveServerDnsAlias"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ServerTrustCertificateTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServerTrustCertificateTests.cs index b888fec07e6c..1c90dfcaea6c 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerTrustCertificateTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerTrustCertificateTests.cs @@ -16,48 +16,34 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServerTrustCertificateTests : SqlTestsBase + public class ServerTrustCertificateTests : SqlTestRunner { public ServerTrustCertificateTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; - } - - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var newResourcesClient = GetResourcesClient(context); - var sqlClient = GetSqlClient(context); - var networkClient = GetNetworkClient(context); - var graphClient = GetGraphClientVersion1_6(context); - Helper.SetupSomeOfManagementClients(newResourcesClient, sqlClient, networkClient, graphClient); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerTrustCertificate() { - RunPowerShellTest("Test-ServerTrustCertificate"); + TestRunner.RunTestScript("Test-ServerTrustCertificate"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerTrustCertificateErrHandling() { - RunPowerShellTest("Test-ServerTrustCertificateErrHandling"); + TestRunner.RunTestScript("Test-ServerTrustCertificateErrHandling"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerTrustCertificatePiping() { - RunPowerShellTest("Test-ServerTrustCertificatePiping"); + TestRunner.RunTestScript("Test-ServerTrustCertificatePiping"); } - } } \ No newline at end of file diff --git a/src/Sql/Sql.Test/ScenarioTests/ServerTrustGroupTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServerTrustGroupTests.cs index 043663b7c6f3..4b25ed979286 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerTrustGroupTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerTrustGroupTests.cs @@ -16,33 +16,20 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServerTrustGroupTests : SqlTestsBase + public class ServerTrustGroupTests : SqlTestRunner { public ServerTrustGroupTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; - } - - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var newResourcesClient = GetResourcesClient(context); - var sqlClient = GetSqlClient(context); - var networkClient = GetNetworkClient(context); - var graphClient = GetGraphClientVersion1_6(context); - Helper.SetupSomeOfManagementClients(newResourcesClient, sqlClient, networkClient, graphClient); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerTrustGroup() { - RunPowerShellTest("Test-ServerTrustGroup"); + TestRunner.RunTestScript("Test-ServerTrustGroup"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ServiceObjectiveTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServiceObjectiveTests.cs index 630b34aabb2f..69137753da27 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServiceObjectiveTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServiceObjectiveTests.cs @@ -19,27 +19,24 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServiceObjectiveTests : SqlTestsBase + public class ServiceObjectiveTests : SqlTestRunner { public ServiceObjectiveTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetServerServiceObjective() { - RunPowerShellTest("Test-GetServerServiceObjective"); + TestRunner.RunTestScript("Test-GetServerServiceObjective"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetServerServiceObjectiveByLocation() { - RunPowerShellTest("Test-GetServerServiceObjectiveByLocation"); + TestRunner.RunTestScript("Test-GetServerServiceObjectiveByLocation"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs b/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs new file mode 100644 index 000000000000..45f1297fc3d5 --- /dev/null +++ b/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs @@ -0,0 +1,189 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ---------------------------------------------------------------------------------- + +using Microsoft.Azure.Management.Network; +using Microsoft.Azure.Test.HttpRecorder; +using Microsoft.WindowsAzure.Commands.ScenarioTest; +using System.Collections.Generic; +using Microsoft.Azure.Management.Internal.Resources; +using Microsoft.Azure.Management.Sql; +using CommonStorage = Microsoft.Azure.Management.Storage.Version2017_10_01; +using Microsoft.Rest.ClientRuntime.Azure.TestFramework; +using Xunit.Abstractions; +using Microsoft.Azure.Management.EventHub; +using Microsoft.Azure.Management.OperationalInsights; +using SDKMonitor = Microsoft.Azure.Management.Monitor; +using CommonMonitor = Microsoft.Azure.Management.Monitor.Version2018_09_01; +using Microsoft.Azure.Management.KeyVault; +using Microsoft.Azure.Graph.RBAC; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; +using Microsoft.Azure.Commands.TestFx; + +namespace Microsoft.Azure.Commands.ScenarioTest.SqlTests +{ + public class SqlTestRunner + { + protected string[] resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/managedInstances", + "Microsoft.Sql/managedInstances/databases", + "Microsoft.Sql/managedInstances/managedDatabases", + "Microsoft.Sql/servers", + "Microsoft.Sql/servers/databases", + "Microsoft.Sql/servers/elasticPools" + }; + private const string TenantIdKey = "TenantId"; + + protected readonly ITestRunner TestRunner; + + protected SqlTestRunner(ITestOutputHelper output) + { + TestRunner = TestManager.CreateInstance(output) + .WithNewPsScriptFilename($"{GetType().Name}.ps1") + .WithProjectSubfolderForTests("ScenarioTests") + .WithCommonPsScripts(new[] + { + @"Common.ps1", + @"../AzureRM.Storage.ps1", + @"../AzureRM.Resources.ps1" + }) + .WithNewRmModules(helper => new[] + { + helper.RMProfileModule, + helper.GetRMModulePath("Az.Sql.psd1"), + helper.RMNetworkModule, + helper.RMOperationalInsightsModule, + helper.RMEventHubModule, + helper.RMMonitorModule, + helper.RMKeyVaultModule + }) + .WithRecordMatcher( + (bool ignoreResourcesClient, Dictionary providers, Dictionary userAgents) => + new PermissiveRecordMatcherWithResourceApiExclusion(ignoreResourcesClient, providers, userAgents, resourceTypesToIgnoreApiVersion) + ) + .WithNewRecordMatcherArguments( + userAgentsToIgnore: new Dictionary + { + {"Microsoft.Azure.Graph.RBAC.Version1_6.GraphRbacManagementClient", "1.42-previewInternal"}, + {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"} + }, + resourceProviders: new Dictionary + { + {"Microsoft.Resources", null}, + {"Microsoft.Features", null}, + {"Microsoft.Authorization", null}, + {"Microsoft.Network", null}, + {"Microsoft.KeyVault", null}, + {"Microsoft.EventHub", null}, + {"Microsoft.Insights", null}, + {"Microsoft.OperationalInsights", null} + } + ).WithManagementClients( + GetSqlClient, + GetMonitorManagementClient, + GetCommonMonitorManagementClient, + GetEventHubManagementClient, + GetOperationalInsightsManagementClient, + GetResourcesClient, + GetGraphClient, + GetGraphClientVersion1_6, + GetKeyVaultClient, + GetNetworkClient, + GetStorageManagementClient + ) + .Build(); + } + + protected SqlManagementClient GetSqlClient(MockContext context) + { + return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); + } + + protected SDKMonitor.IMonitorManagementClient GetMonitorManagementClient(MockContext context) + { + return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); + } + + protected CommonMonitor.IMonitorManagementClient GetCommonMonitorManagementClient(MockContext context) + { + return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); + } + + protected IEventHubManagementClient GetEventHubManagementClient(MockContext context) + { + return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); + } + + protected IOperationalInsightsManagementClient GetOperationalInsightsManagementClient(MockContext context) + { + return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); + } + + protected ResourceManagementClient GetResourcesClient(MockContext context) + { + return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); + } + + protected GraphRbacManagementClient GetGraphClient(MockContext context) + { + GraphRbacManagementClient graphClient = context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); + graphClient.BaseUri = TestEnvironmentFactory.GetTestEnvironment().Endpoints.GraphUri; + graphClient.TenantID = TestEnvironmentFactory.GetTestEnvironment().Tenant; + return graphClient; + } + + protected Microsoft.Azure.Graph.RBAC.Version1_6.GraphRbacManagementClient GetGraphClientVersion1_6(MockContext context) + { + Microsoft.Azure.Graph.RBAC.Version1_6.GraphRbacManagementClient graphClient = context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); + graphClient.BaseUri = TestEnvironmentFactory.GetTestEnvironment().Endpoints.GraphUri; + string tenantId = null; + + if (HttpMockServer.Mode == HttpRecorderMode.Record) + { + tenantId = TestEnvironmentFactory.GetTestEnvironment().Tenant; + HttpMockServer.Variables[TenantIdKey] = tenantId; + } + else if (HttpMockServer.Mode == HttpRecorderMode.Playback) + { + if (HttpMockServer.Variables.ContainsKey(TenantIdKey)) + { + tenantId = HttpMockServer.Variables[TenantIdKey]; + } + } + graphClient.TenantID = tenantId; + if (AzureRmProfileProvider.Instance != null && + AzureRmProfileProvider.Instance.Profile != null && + AzureRmProfileProvider.Instance.Profile.DefaultContext != null && + AzureRmProfileProvider.Instance.Profile.DefaultContext.Tenant != null) + { + AzureRmProfileProvider.Instance.Profile.DefaultContext.Tenant.Id = tenantId; + } + return graphClient; + } + + protected KeyVaultManagementClient GetKeyVaultClient(MockContext context) + { + return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); + } + + protected NetworkManagementClient GetNetworkClient(MockContext context) + { + return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); + } + + protected static CommonStorage.StorageManagementClient GetStorageManagementClient(MockContext context) + { + return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); + } + } +} diff --git a/src/Sql/Sql.Test/ScenarioTests/TransparentDataEncryptionCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/TransparentDataEncryptionCrudTests.cs index 859b88f1410d..b669f3d7ae7a 100644 --- a/src/Sql/Sql.Test/ScenarioTests/TransparentDataEncryptionCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/TransparentDataEncryptionCrudTests.cs @@ -19,41 +19,38 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class TransparentDataEncryptionCrudTests : SqlTestsBase + public class TransparentDataEncryptionCrudTests : SqlTestRunner { public TransparentDataEncryptionCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseTransparentDataEncryptionUpdate() { - RunPowerShellTest("Test-UpdateTransparentDataEncryption"); + TestRunner.RunTestScript("Test-UpdateTransparentDataEncryption"); } [Fact(Skip = "Gets empty status when expecting encrypting")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseTransparentDataEncryptionGet() { - RunPowerShellTest("Test-GetTransparentDataEncryption"); + TestRunner.RunTestScript("Test-GetTransparentDataEncryption"); } [Fact(Skip = "TODO: Skipping as the model got updated from Legacy Sdk")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerTransparentDataEncryptionProtectorGet() { - RunPowerShellTest("Test-GetTransparentDataEncryptionProtector"); + TestRunner.RunTestScript("Test-GetTransparentDataEncryptionProtector"); } [Fact(Skip = "TODO: only works for live mode. Mihymel will fix the test issue for Create-ServerKeyVaultKeyTestEnvironment")] [Trait(Category.RunType, Category.LiveOnly)] public void TestServerTransparentDataEncryptionProtectorSet() { - RunPowerShellTest("Test-SetTransparentDataEncryptionProtector"); + TestRunner.RunTestScript("Test-SetTransparentDataEncryptionProtector"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/VirtualClusterCrudScenarioTests.cs b/src/Sql/Sql.Test/ScenarioTests/VirtualClusterCrudScenarioTests.cs index 90b0d75514a8..71ff2f8ee408 100644 --- a/src/Sql/Sql.Test/ScenarioTests/VirtualClusterCrudScenarioTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/VirtualClusterCrudScenarioTests.cs @@ -13,36 +13,23 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.ScenarioTest.SqlTests; -using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class VirtualClusterCrudScenarioTests : SqlTestsBase + public class VirtualClusterCrudScenarioTests : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var networkClient = GetNetworkClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient); - } - public VirtualClusterCrudScenarioTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/managedInstances" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetVirtualCluster() { - RunPowerShellTest("Test-GetVirtualCluster"); + TestRunner.RunTestScript("Test-GetVirtualCluster"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/VirtualNetworkRuleTest.cs b/src/Sql/Sql.Test/ScenarioTests/VirtualNetworkRuleTest.cs index f93fced18557..69109e5baf35 100644 --- a/src/Sql/Sql.Test/ScenarioTests/VirtualNetworkRuleTest.cs +++ b/src/Sql/Sql.Test/ScenarioTests/VirtualNetworkRuleTest.cs @@ -16,45 +16,34 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class VirtualNetworkRuleTest : SqlTestsBase + public class VirtualNetworkRuleTest : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var networkClient = GetNetworkClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient); - } public VirtualNetworkRuleTest(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestVirtualNetworkRuleCreateAndUpdate() { - RunPowerShellTest("Test-CreateAndUpdateVirtualNetworkRule"); + TestRunner.RunTestScript("Test-CreateAndUpdateVirtualNetworkRule"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestVirtualNetworkRuleGet() { - RunPowerShellTest("Test-GetVirtualNetworkRule"); + TestRunner.RunTestScript("Test-GetVirtualNetworkRule"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestVirtualNetworkRuleRemove() { - RunPowerShellTest("Test-RemoveVirtualNetworkRule"); + TestRunner.RunTestScript("Test-RemoveVirtualNetworkRule"); } } }