From 5b879147d41c47c8ee8fba85f04fb53094e20bb9 Mon Sep 17 00:00:00 2001 From: Ziyue Zheng Date: Thu, 26 May 2022 13:00:04 +0800 Subject: [PATCH 1/4] Add SqlTestRunner to replace SqlTestsBase --- ...dvancedDataSecurityManagedInstanceTests.cs | 18 +-- .../AdvancedDataSecurityTests.cs | 16 +-- .../Sql.Test/ScenarioTests/AdvisorTests.cs | 28 ++-- src/Sql/Sql.Test/ScenarioTests/AuditTests.cs | 102 ++++++------- .../ScenarioTests/DataClassificationTests.cs | 23 +-- .../ScenarioTests/DataMaskingTests.cs | 25 +--- .../Sql.Test/ScenarioTests/DataSyncTests.cs | 39 +++-- .../ScenarioTests/DatabaseActivationTests.cs | 9 +- .../DatabaseBackupStretchTests.cs | 8 +- .../ScenarioTests/DatabaseBackupTests.cs | 41 +++--- .../ScenarioTests/DatabaseCrudStretchTests.cs | 14 +- .../ScenarioTests/DatabaseCrudTests.cs | 59 ++++---- .../ScenarioTests/DatabaseReplicationTests.cs | 33 ++--- .../DistributedAvailabilityGroupTests.cs | 21 +-- .../ScenarioTests/ElasticJobAgentCrudTests.cs | 14 +- .../ElasticJobCredentialCrudTests.cs | 13 +- .../ScenarioTests/ElasticJobCrudTests.cs | 13 +- .../ElasticJobExecutionCrudTests.cs | 17 +-- .../ScenarioTests/ElasticJobStepCrudTests.cs | 13 +- .../ElasticJobTargetCrudTests.cs | 9 +- .../ElasticJobTargetGroupCrudTests.cs | 11 +- .../ScenarioTests/ElasticPoolCrudTests.cs | 46 +++--- .../ScenarioTests/EndpointCertificateTests.cs | 18 +-- .../ScenarioTests/FailoverGroupTests.cs | 43 +++--- .../Sql.Test/ScenarioTests/FailoverTests.cs | 24 ++-- .../ScenarioTests/ImportExportTests.cs | 13 +- .../ScenarioTests/IndexRecommendationTests.cs | 6 +- .../InstanceFailoverGroupTests.cs | 26 ++-- .../ScenarioTests/InstancePoolCrudTests.cs | 29 ++-- .../ScenarioTests/LedgerDigestUploadTests.cs | 14 +- .../LocationCapabilitiesTests.cs | 4 +- .../ManagedDatabaseBackupTests.cs | 26 +--- .../ManagedDatabaseCrudScenarioTests.cs | 32 ++--- .../ManagedDatabaseLogReplayScenarioTest.cs | 25 +--- ...stanceActiveDirectoryAdministratorTests.cs | 16 +-- .../ManagedInstanceCrudScenarioTests.cs | 29 ++-- .../ManagedInstanceFailoverScenarioTests.cs | 13 +- .../ManagedInstanceKeyVaultKeyTests.cs | 26 +--- .../ManagedInstanceOperationScenarioTests.cs | 15 +- .../ManagedInstanceProtectorTests.cs | 36 ++--- .../ScenarioTests/ReadScaleCrudTests.cs | 11 +- .../ScenarioTests/RecommendedActionTests.cs | 20 +-- .../RecommendedElasticPoolTests.cs | 4 +- .../ServerActiveDirectoryAdministratorTest.cs | 4 +- .../ServerCommunicationLinkCrudTests.cs | 11 +- .../Sql.Test/ScenarioTests/ServerCrudTests.cs | 33 +++-- ...erverDisasterRecoveryConfigurationTests.cs | 4 +- .../ScenarioTests/ServerDnsAliasTests.cs | 13 +- .../ScenarioTests/ServerKeyVaultKeyTests.cs | 24 +--- .../ServerTrustCertificateTests.cs | 22 +-- .../ScenarioTests/ServerTrustGroupTests.cs | 17 +-- .../ScenarioTests/ServiceObjectiveTests.cs | 9 +- .../ScenarioTests/ServiceTierAdvisorTests.cs | 9 +- .../{SqlTestsBase.cs => SqlTestRunner.cs} | 136 +++++++++--------- .../ScenarioTests/TDECertificateTests.cs | 24 ++-- .../ThreatDetectionClassicStorageTests.cs | 13 +- .../ScenarioTests/ThreatDetectionTests.cs | 24 +--- .../TransparentDataEncryptionCrudTests.cs | 13 +- .../VirtualClusterCrudScenarioTests.cs | 17 +-- .../ScenarioTests/VirtualNetworkRuleTest.cs | 19 +-- .../VulnerabilityAssessmentMiTests.cs | 28 +--- .../VulnerabilityAssessmentTests.cs | 28 +--- 62 files changed, 506 insertions(+), 944 deletions(-) rename src/Sql/Sql.Test/ScenarioTests/{SqlTestsBase.cs => SqlTestRunner.cs} (64%) diff --git a/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityManagedInstanceTests.cs b/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityManagedInstanceTests.cs index b53ff1d6e918..38705d6d86d3 100644 --- a/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityManagedInstanceTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityManagedInstanceTests.cs @@ -14,36 +14,22 @@ using Microsoft.Azure.Commands.ScenarioTest.SqlTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using System.Collections.Generic; using Xunit; using Xunit.Abstractions; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class AdvancedDataSecurityManagedInstanceTests : SqlTestsBase + public class AdvancedDataSecurityManagedInstanceTests : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var resourcesClient = GetResourcesClient(context); - var networkClient = GetNetworkClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, networkClient, resourcesClient); - } - public AdvancedDataSecurityManagedInstanceTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/managedInstances", - "Microsoft.Sql/managedInstances/databases" - }; } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void AdvancedDataSecurityPolicyTest() { - RunPowerShellTest("Test-AdvancedDataSecurityPolicyManagedInstanceTest"); + TestRunner.RunTestScript("Test-AdvancedDataSecurityPolicyManagedInstanceTest"); } } } \ No newline at end of file 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/AdvisorTests.cs b/src/Sql/Sql.Test/ScenarioTests/AdvisorTests.cs index 4d5eb18e01cf..944e535f0fe0 100644 --- a/src/Sql/Sql.Test/ScenarioTests/AdvisorTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/AdvisorTests.cs @@ -19,14 +19,10 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class AdvisorTests : SqlTestsBase + public class AdvisorTests : SqlTestRunner { public AdvisorTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers", - "Microsoft.Sql/servers/databases" - }; } #region Server Advisor Tests @@ -35,28 +31,28 @@ public AdvisorTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListServerAdvisors() { - RunPowerShellTest("Test-ListServerAdvisors"); + TestRunner.RunTestScript("Test-ListServerAdvisors"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListServerAdvisorsExpanded() { - RunPowerShellTest("Test-ListServerAdvisorsExpanded"); + TestRunner.RunTestScript("Test-ListServerAdvisorsExpanded"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetServerAdvisor() { - RunPowerShellTest("Test-GetServerAdvisor"); + TestRunner.RunTestScript("Test-GetServerAdvisor"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateServerAdvisor() { - RunPowerShellTest("Test-UpdateServerAdvisor"); + TestRunner.RunTestScript("Test-UpdateServerAdvisor"); } #endregion @@ -67,27 +63,27 @@ public void TestUpdateServerAdvisor() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListDatabaseAdvisors() { - RunPowerShellTest("Test-ListDatabaseAdvisors"); + TestRunner.RunTestScript("Test-ListDatabaseAdvisors"); } [Fact(Skip = "unable to re-record")] public void TestListDatabaseAdvisorsExpanded() { - RunPowerShellTest("Test-ListDatabaseAdvisorsExpanded"); + TestRunner.RunTestScript("Test-ListDatabaseAdvisorsExpanded"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetDatabaseAdvisor() { - RunPowerShellTest("Test-GetDatabaseAdvisor"); + TestRunner.RunTestScript("Test-GetDatabaseAdvisor"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateDatabaseAdvisor() { - RunPowerShellTest("Test-UpdateDatabaseAdvisor"); + TestRunner.RunTestScript("Test-UpdateDatabaseAdvisor"); } #endregion @@ -98,21 +94,21 @@ public void TestUpdateDatabaseAdvisor() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListElasticPoolAdvisors() { - RunPowerShellTest("Test-ListElasticPoolAdvisors"); + TestRunner.RunTestScript("Test-ListElasticPoolAdvisors"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListElasticPoolAdvisorsExpanded() { - RunPowerShellTest("Test-ListElasticPoolAdvisorsExpanded"); + TestRunner.RunTestScript("Test-ListElasticPoolAdvisorsExpanded"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetElasticPoolAdvisor() { - RunPowerShellTest("Test-GetElasticPoolAdvisor"); + TestRunner.RunTestScript("Test-GetElasticPoolAdvisor"); } #endregion 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/DataClassificationTests.cs b/src/Sql/Sql.Test/ScenarioTests/DataClassificationTests.cs index be925826b166..4f222d0379e8 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DataClassificationTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DataClassificationTests.cs @@ -15,54 +15,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 DataClassificationTests : SqlTestsBase + public class DataClassificationTests : SqlTestRunner { public DataClassificationTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/managedInstances", - "Microsoft.Sql/servers", - "Microsoft.Sql/managedInstances/databases" - }; } - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var networkClient = GetNetworkClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient); - } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDataClassificationOnSqlDatabase() { - RunPowerShellTest("Test-DataClassificationOnSqlDatabase"); + TestRunner.RunTestScript("Test-DataClassificationOnSqlDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestErrorIsThrownWhenInvalidClassificationIsSet() { - RunPowerShellTest("Test-ErrorIsThrownWhenInvalidClassificationIsSet"); + TestRunner.RunTestScript("Test-ErrorIsThrownWhenInvalidClassificationIsSet"); } [Fact(Skip = "not able to re - record because 'Managed Instance is not accepting creation of instances with General Purpose edition and Generation 4 hardware in this region.'")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBasicDataClassificationOnSqlManagedDatabase() { - RunPowerShellTest("Test-BasicDataClassificationOnSqlManagedDatabase"); + TestRunner.RunTestScript("Test-BasicDataClassificationOnSqlManagedDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestEnableDisableRecommendationsOnSqlDatabase() { - RunPowerShellTest("Test-EnableDisableRecommendationsOnSqlDatabase"); + TestRunner.RunTestScript("Test-EnableDisableRecommendationsOnSqlDatabase"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DataMaskingTests.cs b/src/Sql/Sql.Test/ScenarioTests/DataMaskingTests.cs index cd2b4d515859..e8888812608d 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DataMaskingTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DataMaskingTests.cs @@ -16,66 +16,55 @@ 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 DataMaskingTests : SqlTestsBase + public class DataMaskingTests : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient); - } - public DataMaskingTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingPrivilegedUsersChanges() { - RunPowerShellTest("Test-DatabaseDataMaskingPrivilegedUsersChanges"); + TestRunner.RunTestScript("Test-DatabaseDataMaskingPrivilegedUsersChanges"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingBasicRuleLifecycle() { - RunPowerShellTest("Test-DatabaseDataMaskingBasicRuleLifecycle"); + TestRunner.RunTestScript("Test-DatabaseDataMaskingBasicRuleLifecycle"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingNumberRuleLifecycle() { - RunPowerShellTest("Test-DatabaseDataMaskingNumberRuleLifecycle"); + TestRunner.RunTestScript("Test-DatabaseDataMaskingNumberRuleLifecycle"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingTextRuleLifecycle() { - RunPowerShellTest("Test-DatabaseDataMaskingTextRuleLifecycle"); + TestRunner.RunTestScript("Test-DatabaseDataMaskingTextRuleLifecycle"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingRuleCreationFailures() { - RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationFailures"); + TestRunner.RunTestScript("Test-DatabaseDataMaskingRuleCreationFailures"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingRuleCreationWithoutPolicy() { - RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationWithoutPolicy"); + TestRunner.RunTestScript("Test-DatabaseDataMaskingRuleCreationWithoutPolicy"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DataSyncTests.cs b/src/Sql/Sql.Test/ScenarioTests/DataSyncTests.cs index bccee04301d8..b3bf06f613de 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DataSyncTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DataSyncTests.cs @@ -13,128 +13,121 @@ // ---------------------------------------------------------------------------------- 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 DataSyncTests : SqlTestsBase + public class DataSyncTests : SqlTestRunner { public DataSyncTests(ITestOutputHelper output) : base(output) { - XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output)); - - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers", - "Microsoft.Sql/managedInstances/databases" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncAgentCreate() { - RunPowerShellTest("Test-CreateSyncAgent"); + TestRunner.RunTestScript("Test-CreateSyncAgent"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncAgentsGetAndList() { - RunPowerShellTest("Test-GetAndListSyncAgents"); + TestRunner.RunTestScript("Test-GetAndListSyncAgents"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncAgentRemove() { - RunPowerShellTest("Test-RemoveSyncAgent"); + TestRunner.RunTestScript("Test-RemoveSyncAgent"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncAgentKeyCreate() { - RunPowerShellTest("Test-CreateSyncAgentKey"); + TestRunner.RunTestScript("Test-CreateSyncAgentKey"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncAgentLinkedDatabaseList() { - RunPowerShellTest("Test-listSyncAgentLinkedDatabase"); + TestRunner.RunTestScript("Test-listSyncAgentLinkedDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncGroupCreate() { - RunPowerShellTest("Test-CreateSyncGroup"); + TestRunner.RunTestScript("Test-CreateSyncGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncGroupUpdate() { - RunPowerShellTest("Test-UpdateSyncGroup"); + TestRunner.RunTestScript("Test-UpdateSyncGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncGroupsGetAndList() { - RunPowerShellTest("Test-GetAndListSyncGroups"); + TestRunner.RunTestScript("Test-GetAndListSyncGroups"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncGroupHubSchemaRefreshAndGet() { - RunPowerShellTest("Test-RefreshAndGetSyncGroupHubSchema"); + TestRunner.RunTestScript("Test-RefreshAndGetSyncGroupHubSchema"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncGroupRemove() { - RunPowerShellTest("Test-RemoveSyncGroup"); + TestRunner.RunTestScript("Test-RemoveSyncGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncMemberCreate() { - RunPowerShellTest("Test-CreateSyncMember"); + TestRunner.RunTestScript("Test-CreateSyncMember"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncMembersGetAndList() { - RunPowerShellTest("Test-GetAndListSyncMembers"); + TestRunner.RunTestScript("Test-GetAndListSyncMembers"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncMemberUpdate() { - RunPowerShellTest("Test-UpdateSyncMember"); + TestRunner.RunTestScript("Test-UpdateSyncMember"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncMemberSchemaRefreshAndGet() { - RunPowerShellTest("Test-RefreshAndGetSyncMemberSchema"); + TestRunner.RunTestScript("Test-RefreshAndGetSyncMemberSchema"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncMemberRemove() { - RunPowerShellTest("Test-RemoveSyncMember"); + TestRunner.RunTestScript("Test-RemoveSyncMember"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DatabaseActivationTests.cs b/src/Sql/Sql.Test/ScenarioTests/DatabaseActivationTests.cs index 9158d53e5579..cce3ec59f8e9 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DatabaseActivationTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DatabaseActivationTests.cs @@ -19,27 +19,24 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class DatabaseActivationTests : SqlTestsBase + public class DatabaseActivationTests : SqlTestRunner { public DatabaseActivationTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact(Skip = "The test takes the longest time to run. Skip it to workaround timeout temporarily.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabasePauseResume() { - RunPowerShellTest("Test-DatabasePauseResume"); + TestRunner.RunTestScript("Test-DatabasePauseResume"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabasePauseResumePiped() { - RunPowerShellTest("Test-DatabasePauseResumePiped"); + TestRunner.RunTestScript("Test-DatabasePauseResumePiped"); } } } 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/DatabaseReplicationTests.cs b/src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.cs index 6c29f14aab31..4866640dfa5e 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.cs @@ -19,111 +19,108 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class DatabaseReplicationTests : SqlTestsBase + public class DatabaseReplicationTests : SqlTestRunner { public DatabaseReplicationTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateDatabaseCopy() { - RunPowerShellTest("Test-CreateDatabaseCopy"); + TestRunner.RunTestScript("Test-CreateDatabaseCopy"); } [Fact(Skip = "Taking too long - try again before PR merge")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateVcoreDatabaseCopy() { - RunPowerShellTest("Test-CreateVcoreDatabaseCopy"); + TestRunner.RunTestScript("Test-CreateVcoreDatabaseCopy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateSecondaryDatabase() { - RunPowerShellTest("Test-CreateSecondaryDatabase"); + TestRunner.RunTestScript("Test-CreateSecondaryDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateNamedSecondaryDatabase() { - RunPowerShellTest("Test-CreateNamedSecondaryDatabase"); + TestRunner.RunTestScript("Test-CreateNamedSecondaryDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateNamedSecondaryDatabaseNegative() { - RunPowerShellTest("Test-CreateNamedSecondaryDatabaseNegative"); + TestRunner.RunTestScript("Test-CreateNamedSecondaryDatabaseNegative"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetReplicationLink() { - RunPowerShellTest("Test-GetReplicationLink"); + TestRunner.RunTestScript("Test-GetReplicationLink"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveSecondaryDatabase() { - RunPowerShellTest("Test-RemoveSecondaryDatabase"); + TestRunner.RunTestScript("Test-RemoveSecondaryDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverSecondaryDatabase() { - RunPowerShellTest("Test-FailoverSecondaryDatabase"); + TestRunner.RunTestScript("Test-FailoverSecondaryDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateDatabaseCopyWithBackupStorageRedundancy() { - RunPowerShellTest("Test-CreateDatabaseCopyWithBackupStorageRedundancy"); + TestRunner.RunTestScript("Test-CreateDatabaseCopyWithBackupStorageRedundancy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateSecondaryDatabaseWithBackupStorageRedundancy() { - RunPowerShellTest("Test-CreateSecondaryDatabaseWithBackupStorageRedundancy"); + TestRunner.RunTestScript("Test-CreateSecondaryDatabaseWithBackupStorageRedundancy"); } [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 TestCreateCopyRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant() { - RunPowerShellTest("Test-CreateCopyRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant"); + TestRunner.RunTestScript("Test-CreateCopyRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant"); } [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 TestCreateCopyRegularAndZoneRedundantDatabaseWithSourceZoneRedundant() { - RunPowerShellTest("Test-CreateCopyRegularAndZoneRedundantDatabaseWithSourceZoneRedundant"); + TestRunner.RunTestScript("Test-CreateCopyRegularAndZoneRedundantDatabaseWithSourceZoneRedundant"); } [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 TestCreateSecondaryRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant() { - RunPowerShellTest("Test-CreateSecondaryRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant"); + TestRunner.RunTestScript("Test-CreateSecondaryRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant"); } [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 TestCreateSecondaryRegularAndZoneRedundantDatabaseWithSourceZoneRedundant() { - RunPowerShellTest("Test-CreateSecondaryRegularAndZoneRedundantDatabaseWithSourceZoneRedundant"); + TestRunner.RunTestScript("Test-CreateSecondaryRegularAndZoneRedundantDatabaseWithSourceZoneRedundant"); } } } 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/ElasticJobCredentialCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobCredentialCrudTests.cs index afdaac601543..c8390c1f78ad 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobCredentialCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobCredentialCrudTests.cs @@ -19,13 +19,10 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobCredentialCrudTests : SqlTestsBase + public class ElasticJobCredentialCrudTests : SqlTestRunner { public ElasticJobCredentialCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } #region Create Tests @@ -34,7 +31,7 @@ public ElasticJobCredentialCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobCredentialCreate() { - RunPowerShellTest("Test-CreateJobCredential"); + TestRunner.RunTestScript("Test-CreateJobCredential"); } #endregion @@ -45,7 +42,7 @@ public void TestJobCredentialCreate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobCredentialUpdate() { - RunPowerShellTest("Test-UpdateJobCredential"); + TestRunner.RunTestScript("Test-UpdateJobCredential"); } #endregion @@ -56,7 +53,7 @@ public void TestJobCredentialUpdate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobCredentialGet() { - RunPowerShellTest("Test-GetJobCredential"); + TestRunner.RunTestScript("Test-GetJobCredential"); } #endregion @@ -67,7 +64,7 @@ public void TestJobCredentialGet() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobCredentialRemove() { - RunPowerShellTest("Test-RemoveJobCredential"); + TestRunner.RunTestScript("Test-RemoveJobCredential"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobCrudTests.cs index 52f6dcd17ed9..a86c3328393c 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobCrudTests.cs @@ -19,13 +19,10 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobCrudTests : SqlTestsBase + public class ElasticJobCrudTests : SqlTestRunner { public ElasticJobCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } #region Create Tests @@ -37,7 +34,7 @@ public ElasticJobCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobCreate() { - RunPowerShellTest("Test-CreateJob"); + TestRunner.RunTestScript("Test-CreateJob"); } #endregion @@ -48,7 +45,7 @@ public void TestJobCreate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobUpdate() { - RunPowerShellTest("Test-UpdateJob"); + TestRunner.RunTestScript("Test-UpdateJob"); } #endregion @@ -59,7 +56,7 @@ public void TestJobUpdate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobGet() { - RunPowerShellTest("Test-GetJob"); + TestRunner.RunTestScript("Test-GetJob"); } #endregion @@ -70,7 +67,7 @@ public void TestJobGet() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobRemove() { - RunPowerShellTest("Test-RemoveJob"); + TestRunner.RunTestScript("Test-RemoveJob"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobExecutionCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobExecutionCrudTests.cs index a8d28130e17e..d9aa88544b70 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobExecutionCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobExecutionCrudTests.cs @@ -19,13 +19,10 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobExecutionCrudTests : SqlTestsBase + public class ElasticJobExecutionCrudTests : SqlTestRunner { public ElasticJobExecutionCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } #region Start Job Tests @@ -34,14 +31,14 @@ public ElasticJobExecutionCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStart() { - RunPowerShellTest("Test-StartJob"); + TestRunner.RunTestScript("Test-StartJob"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStartWait() { - RunPowerShellTest("Test-StartJobWait"); + TestRunner.RunTestScript("Test-StartJobWait"); } #endregion @@ -52,7 +49,7 @@ public void TestJobStartWait() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStop() { - RunPowerShellTest("Test-StopJob"); + TestRunner.RunTestScript("Test-StopJob"); } #endregion @@ -63,7 +60,7 @@ public void TestJobStop() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobExecutionGet() { - RunPowerShellTest("Test-GetJobExecution"); + TestRunner.RunTestScript("Test-GetJobExecution"); } #endregion @@ -75,7 +72,7 @@ public void TestJobExecutionGet() public void TestJobStepExecutionGet() { - RunPowerShellTest("Test-GetJobStepExecution"); + TestRunner.RunTestScript("Test-GetJobStepExecution"); } #endregion @@ -86,7 +83,7 @@ public void TestJobStepExecutionGet() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobTargetExecutionGet() { - RunPowerShellTest("Test-GetJobTargetExecution"); + TestRunner.RunTestScript("Test-GetJobTargetExecution"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobStepCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobStepCrudTests.cs index 92a155cc65ca..c7ce3c5971c2 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobStepCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobStepCrudTests.cs @@ -19,13 +19,10 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobStepCrudTests : SqlTestsBase + public class ElasticJobStepCrudTests : SqlTestRunner { public ElasticJobStepCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } #region Create Tests @@ -34,7 +31,7 @@ public ElasticJobStepCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStepCreate() { - RunPowerShellTest("Test-CreateJobStep"); + TestRunner.RunTestScript("Test-CreateJobStep"); } #endregion @@ -45,7 +42,7 @@ public void TestJobStepCreate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStepUpdate() { - RunPowerShellTest("Test-UpdateJobStep"); + TestRunner.RunTestScript("Test-UpdateJobStep"); } #endregion @@ -56,7 +53,7 @@ public void TestJobStepUpdate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStepGet() { - RunPowerShellTest("Test-GetJobStep"); + TestRunner.RunTestScript("Test-GetJobStep"); } #endregion @@ -67,7 +64,7 @@ public void TestJobStepGet() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStepRemove() { - RunPowerShellTest("Test-RemoveJobStep"); + TestRunner.RunTestScript("Test-RemoveJobStep"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetCrudTests.cs index 9a6bf43144fa..1a1159665bad 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetCrudTests.cs @@ -19,27 +19,24 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobTargetCrudTests : SqlTestsBase + public class ElasticJobTargetCrudTests : SqlTestRunner { public ElasticJobTargetCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestTargetAdd() { - RunPowerShellTest("Test-AddTarget"); + TestRunner.RunTestScript("Test-AddTarget"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestTargetRemove() { - RunPowerShellTest("Test-RemoveTarget"); + TestRunner.RunTestScript("Test-RemoveTarget"); } } } \ No newline at end of file diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetGroupCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetGroupCrudTests.cs index d5024729eee6..3a0f0eb7addb 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetGroupCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetGroupCrudTests.cs @@ -19,13 +19,10 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobTargetGroupCrudTests : SqlTestsBase + public class ElasticJobTargetGroupCrudTests : SqlTestRunner { public ElasticJobTargetGroupCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } #region Create Tests @@ -34,7 +31,7 @@ public ElasticJobTargetGroupCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestTargetGroupCreate() { - RunPowerShellTest("Test-CreateTargetGroup"); + TestRunner.RunTestScript("Test-CreateTargetGroup"); } #endregion @@ -45,7 +42,7 @@ public void TestTargetGroupCreate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestTargetGroupGet() { - RunPowerShellTest("Test-GetTargetGroup"); + TestRunner.RunTestScript("Test-GetTargetGroup"); } #endregion @@ -56,7 +53,7 @@ public void TestTargetGroupGet() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestTargetGroupRemove() { - RunPowerShellTest("Test-RemoveTargetGroup"); + TestRunner.RunTestScript("Test-RemoveTargetGroup"); } #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/FailoverGroupTests.cs b/src/Sql/Sql.Test/ScenarioTests/FailoverGroupTests.cs index f50e8b1dbf13..5caf8534144d 100644 --- a/src/Sql/Sql.Test/ScenarioTests/FailoverGroupTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/FailoverGroupTests.cs @@ -19,146 +19,143 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class FailoverGroupTests : SqlTestsBase + public class FailoverGroupTests : SqlTestRunner { public FailoverGroupTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverGroup() { - RunPowerShellTest("Test-FailoverGroup"); + TestRunner.RunTestScript("Test-FailoverGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_Named() { - RunPowerShellTest("Test-CreateFailoverGroup-Named"); + TestRunner.RunTestScript("Test-CreateFailoverGroup-Named"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_Positional() { - RunPowerShellTest("Test-CreateFailoverGroup-Positional"); + TestRunner.RunTestScript("Test-CreateFailoverGroup-Positional"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_AutomaticPolicy() { - RunPowerShellTest("Test-CreateFailoverGroup-AutomaticPolicy"); + TestRunner.RunTestScript("Test-CreateFailoverGroup-AutomaticPolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_AutomaticPolicyGracePeriodReadOnlyFailover() { - RunPowerShellTest("Test-CreateFailoverGroup-AutomaticPolicyGracePeriodReadOnlyFailover"); + TestRunner.RunTestScript("Test-CreateFailoverGroup-AutomaticPolicyGracePeriodReadOnlyFailover"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_ZeroGracePeriod() { - RunPowerShellTest("Test-CreateFailoverGroup-ZeroGracePeriod"); + TestRunner.RunTestScript("Test-CreateFailoverGroup-ZeroGracePeriod"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_ManualPolicy() { - RunPowerShellTest("Test-CreateFailoverGroup-ManualPolicy"); + TestRunner.RunTestScript("Test-CreateFailoverGroup-ManualPolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_Overflow() { - RunPowerShellTest("Test-CreateFailoverGroup-Overflow"); + TestRunner.RunTestScript("Test-CreateFailoverGroup-Overflow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_Named() { - RunPowerShellTest("Test-SetFailoverGroup-Named"); + TestRunner.RunTestScript("Test-SetFailoverGroup-Named"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_Positional() { - RunPowerShellTest("Test-SetFailoverGroup-Positional"); + TestRunner.RunTestScript("Test-SetFailoverGroup-Positional"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_PipeServer() { - RunPowerShellTest("Test-SetFailoverGroup-PipeServer"); + TestRunner.RunTestScript("Test-SetFailoverGroup-PipeServer"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_AutomaticWithGracePeriodReadOnlyFailover() { - RunPowerShellTest("Test-SetFailoverGroup-AutomaticWithGracePeriodReadOnlyFailover"); + TestRunner.RunTestScript("Test-SetFailoverGroup-AutomaticWithGracePeriodReadOnlyFailover"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_AutomaticWithGracePeriodZero() { - RunPowerShellTest("Test-SetFailoverGroup-AutomaticWithGracePeriodZero"); + TestRunner.RunTestScript("Test-SetFailoverGroup-AutomaticWithGracePeriodZero"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_AutomaticToManual() { - RunPowerShellTest("Test-SetFailoverGroup-AutomaticToManual"); + TestRunner.RunTestScript("Test-SetFailoverGroup-AutomaticToManual"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_ManualToAutomaticNoGracePeriod() { - RunPowerShellTest("Test-SetFailoverGroup-ManualToAutomaticNoGracePeriod"); + TestRunner.RunTestScript("Test-SetFailoverGroup-ManualToAutomaticNoGracePeriod"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_Overflow() { - RunPowerShellTest("Test-SetFailoverGroup-Overflow"); + TestRunner.RunTestScript("Test-SetFailoverGroup-Overflow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void Test_AddRemoveDatabasesToFromFailoverGroup() { - RunPowerShellTest("Test-AddRemoveDatabasesToFromFailoverGroup"); + TestRunner.RunTestScript("Test-AddRemoveDatabasesToFromFailoverGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSwitchFailoverGroup() { - RunPowerShellTest("Test-SwitchFailoverGroup"); + TestRunner.RunTestScript("Test-SwitchFailoverGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSwitchFailoverGroupAllowDataLoss() { - RunPowerShellTest("Test-SwitchFailoverGroupAllowDataLoss"); + TestRunner.RunTestScript("Test-SwitchFailoverGroupAllowDataLoss"); } } } 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/ImportExportTests.cs b/src/Sql/Sql.Test/ScenarioTests/ImportExportTests.cs index 1630061abfe0..d1a03076197c 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ImportExportTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ImportExportTests.cs @@ -19,27 +19,24 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ImportExportTests : SqlTestsBase + public class ImportExportTests : SqlTestRunner { public ImportExportTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestExportDatabase() { - RunPowerShellTest("Test-ExportDatabase"); + TestRunner.RunTestScript("Test-ExportDatabase"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestExportDatabase_NetworkIsolation() { - RunPowerShellTest("Test-ExportDatabaseNetworkIsolation"); + TestRunner.RunTestScript("Test-ExportDatabaseNetworkIsolation"); } [Fact(Skip = "Cannot re-record.")] @@ -47,7 +44,7 @@ public void TestExportDatabase_NetworkIsolation() [Trait(Category.Sql, "Needs to be re-recorded")] public void TestImportNewDatabase() { - RunPowerShellTest("Test-ImportNewDatabase"); + TestRunner.RunTestScript("Test-ImportNewDatabase"); } [Fact(Skip = "Cannot re-record.")] @@ -55,7 +52,7 @@ public void TestImportNewDatabase() [Trait(Category.Sql, "Needs to be re-recorded")] public void TestImportNewDatabase_NetworkIsolation() { - RunPowerShellTest("Test-ImportNewDatabaseNetworkIsolation"); + TestRunner.RunTestScript("Test-ImportNewDatabaseNetworkIsolation"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/IndexRecommendationTests.cs b/src/Sql/Sql.Test/ScenarioTests/IndexRecommendationTests.cs index 43b26cea0b79..816d621818ff 100644 --- a/src/Sql/Sql.Test/ScenarioTests/IndexRecommendationTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/IndexRecommendationTests.cs @@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class IndexRecommendationTests : SqlTestsBase + public class IndexRecommendationTests : SqlTestRunner { public IndexRecommendationTests(ITestOutputHelper output) : base(output) { @@ -34,7 +34,7 @@ public void TestGetIndexRecommendation() // TODO https://github.com/Azure/azure-powershell/issues/4156 if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-GetIndexRecommendations"); + TestRunner.RunTestScript("Test-GetIndexRecommendations"); } } @@ -46,7 +46,7 @@ public void TestCreateIndex() // TODO https://github.com/Azure/azure-powershell/issues/4156 if (TestMockSupport.RunningMocked) { - RunPowerShellTest("Test-CreateIndex"); + TestRunner.RunTestScript("Test-CreateIndex"); } } } 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/InstancePoolCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/InstancePoolCrudTests.cs index 3444fdbfa96f..6f4475f98106 100644 --- a/src/Sql/Sql.Test/ScenarioTests/InstancePoolCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/InstancePoolCrudTests.cs @@ -16,24 +16,15 @@ 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 InstancePoolCrudTests : SqlTestsBase + public class InstancePoolCrudTests : SqlTestRunner { public InstancePoolCrudTests(ITestOutputHelper output) : base(output) { } - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var networkClient = GetNetworkClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient); - } - #region Instance pool /// @@ -43,7 +34,7 @@ protected override void SetupManagementClients(RestTestFramework.MockContext con [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateInstancePool() { - RunPowerShellTest("Test-CreateInstancePool"); + TestRunner.RunTestScript("Test-CreateInstancePool"); } /// @@ -53,7 +44,7 @@ public void TestCreateInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateInstancePool() { - RunPowerShellTest("Test-UpdateInstancePool"); + TestRunner.RunTestScript("Test-UpdateInstancePool"); } /// @@ -63,14 +54,14 @@ public void TestUpdateInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetInstancePool() { - RunPowerShellTest("Test-GetInstancePool"); + TestRunner.RunTestScript("Test-GetInstancePool"); } [Fact(Skip = "Skip due to long setup time for managed instance pool")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveInstancePool() { - RunPowerShellTest("Test-RemoveInstancePool"); + TestRunner.RunTestScript("Test-RemoveInstancePool"); } #endregion @@ -84,7 +75,7 @@ public void TestRemoveInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateManagedInstanceInInstancePool() { - RunPowerShellTest("Test-CreateManagedInstanceInInstancePool"); + TestRunner.RunTestScript("Test-CreateManagedInstanceInInstancePool"); } /// @@ -94,7 +85,7 @@ public void TestCreateManagedInstanceInInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetManagedInstanceInInstancePool() { - RunPowerShellTest("Test-GetManagedInstanceInInstancePool"); + TestRunner.RunTestScript("Test-GetManagedInstanceInInstancePool"); } /// @@ -104,7 +95,7 @@ public void TestGetManagedInstanceInInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateManagedInstanceInInstancePool() { - RunPowerShellTest("Test-UpdateManagedInstanceInInstancePool"); + TestRunner.RunTestScript("Test-UpdateManagedInstanceInInstancePool"); } /// @@ -114,7 +105,7 @@ public void TestUpdateManagedInstanceInInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDeleteManagedInstanceInInstancePool() { - RunPowerShellTest("Test-DeleteManagedInstanceInInstancePool"); + TestRunner.RunTestScript("Test-DeleteManagedInstanceInInstancePool"); } #endregion @@ -128,7 +119,7 @@ public void TestDeleteManagedInstanceInInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetInstancePoolUsage() { - RunPowerShellTest("Test-GetInstancePoolUsage"); + TestRunner.RunTestScript("Test-GetInstancePoolUsage"); } #endregion 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/ManagedDatabaseLogReplayScenarioTest.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseLogReplayScenarioTest.cs index 544199017027..d189e39ae46b 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseLogReplayScenarioTest.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseLogReplayScenarioTest.cs @@ -13,64 +13,51 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.ScenarioTest.SqlTests; -using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; using Xunit; using Xunit.Abstractions; using Microsoft.WindowsAzure.Commands.ScenarioTest; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ManagedDatabaseLogReplayScenarioTest : SqlTestsBase + public class ManagedDatabaseLogReplayScenarioTest : 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 ManagedDatabaseLogReplayScenarioTest(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/managedInstances", - "Microsoft.Sql/managedInstances/databases" - }; } [Fact(Skip = "Depends on hardcoded resource to rerecord")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedDatabaseLogReplayService() { - RunPowerShellTest("Test-ManagedDatabaseLogReplay"); + TestRunner.RunTestScript("Test-ManagedDatabaseLogReplay"); } [Fact(Skip = "Depends on hardcoded resource to rerecord")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCompleteManagedDatabaseLogReplayService() { - RunPowerShellTest("Test-CompleteManagedDatabaseLogReplay"); + TestRunner.RunTestScript("Test-CompleteManagedDatabaseLogReplay"); } [Fact(Skip = "Depends on hardcoded resource to rerecord")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCancelManagedDatabaseLogReplayService() { - RunPowerShellTest("Test-CancelManagedDatabaseLogReplay"); + TestRunner.RunTestScript("Test-CancelManagedDatabaseLogReplay"); } [Fact(Skip = "Depends on hardcoded resource to rerecord")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestPipingManagedDatabaseLogReplayService() { - RunPowerShellTest("Test-ManagedDatabaseLogReplayPiping"); + TestRunner.RunTestScript("Test-ManagedDatabaseLogReplayPiping"); } [Fact(Skip = "Depends on hardcoded resource to rerecord")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestPipingCompleteCancelManagedDatabaseLogReplayService() { - RunPowerShellTest("Test-PipingCompleteCancelManagedDatabaseLogReplay"); + TestRunner.RunTestScript("Test-PipingCompleteCancelManagedDatabaseLogReplay"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceActiveDirectoryAdministratorTests.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceActiveDirectoryAdministratorTests.cs index 95cbe24af062..257d1e0503fc 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceActiveDirectoryAdministratorTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceActiveDirectoryAdministratorTests.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 ManagedInstanceActiveDirectoryAdministratorTests : SqlTestsBase + public class ManagedInstanceActiveDirectoryAdministratorTests : SqlTestRunner { public ManagedInstanceActiveDirectoryAdministratorTests(ITestOutputHelper output) : base(output) { } - - 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(Skip = "MDCS Customer Experience team should re-record this test.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceActiveDirectoryAdministrator() { - RunPowerShellTest("Test-ManagedInstanceActiveDirectoryAdministrator"); + TestRunner.RunTestScript("Test-ManagedInstanceActiveDirectoryAdministrator"); } } } - - 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/ManagedInstanceKeyVaultKeyTests.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceKeyVaultKeyTests.cs index 9a3ab0696ece..8f59afd758b3 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceKeyVaultKeyTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceKeyVaultKeyTests.cs @@ -16,62 +16,48 @@ 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 ManagedInstanceKeyVaultKeyTests : SqlTestsBase + public class ManagedInstanceKeyVaultKeyTests : SqlTestRunner { public ManagedInstanceKeyVaultKeyTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/managedInstances" - }; - } - - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var graphClient = GetGraphClient(context); - var networkClient = GetNetworkClient(context); - var keyVaultClient = GetKeyVaultClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient, graphClient, keyVaultClient); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceKeyVaultKeyCI() { - RunPowerShellTest("Test-ManagedInstanceKeyVaultKeyCI"); + TestRunner.RunTestScript("Test-ManagedInstanceKeyVaultKeyCI"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceKeyVaultKey() { - RunPowerShellTest("Test-ManagedInstanceKeyVaultKey"); + TestRunner.RunTestScript("Test-ManagedInstanceKeyVaultKey"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceKeyVaultKeyInputObject() { - RunPowerShellTest("Test-ManagedInstanceKeyVaultKeyInputObject"); + TestRunner.RunTestScript("Test-ManagedInstanceKeyVaultKeyInputObject"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceKeyVaultKeyResourceId() { - RunPowerShellTest("Test-ManagedInstanceKeyVaultKeyResourceId"); + TestRunner.RunTestScript("Test-ManagedInstanceKeyVaultKeyResourceId"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceKeyVaultKeyPiping() { - RunPowerShellTest("Test-ManagedInstanceKeyVaultKeyPiping"); + TestRunner.RunTestScript("Test-ManagedInstanceKeyVaultKeyPiping"); } } } 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/ManagedInstanceProtectorTests.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceProtectorTests.cs index 7c17af52fe9a..da6bd16b0344 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceProtectorTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceProtectorTests.cs @@ -16,97 +16,83 @@ 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 ManagedInstanceProtectorTests : SqlTestsBase + public class ManagedInstanceProtectorTests : SqlTestRunner { public ManagedInstanceProtectorTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/managedInstances" - }; - } - - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var graphClient = GetGraphClient(context); - var networkClient = GetNetworkClient(context); - var keyVaultClient = GetKeyVaultClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient, graphClient, keyVaultClient); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorCI() { - RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorCI"); + TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorCI"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorByokFailsWithoutKeyId() { - RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorByokFailsWithoutKeyId"); + TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorByokFailsWithoutKeyId"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorServiceManaged() { - RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorServiceManaged"); + TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorServiceManaged"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorServiceManagedInputObject() { - RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedInputObject"); + TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedInputObject"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorServiceManagedResourceId() { - RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedResourceId"); + TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedResourceId"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorServiceManagedPiping() { - RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedPiping"); + TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedPiping"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorByok() { - RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorByok"); + TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorByok"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorByokInputObject() { - RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorByokInputObject"); + TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorByokInputObject"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorByokResourceId() { - RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorByokResourceId"); + TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorByokResourceId"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorByokPiping() { - RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorByokPiping"); + TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorByokPiping"); } } } 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/RecommendedActionTests.cs b/src/Sql/Sql.Test/ScenarioTests/RecommendedActionTests.cs index 5d4b0cd4b3e1..875bed16ec0f 100644 --- a/src/Sql/Sql.Test/ScenarioTests/RecommendedActionTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/RecommendedActionTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class RecommendedActionTests : SqlTestsBase + public class RecommendedActionTests : SqlTestRunner { public RecommendedActionTests(ITestOutputHelper output) : base(output) { @@ -31,21 +31,21 @@ public RecommendedActionTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListServerRecommendedActions() { - RunPowerShellTest("Test-ListServerRecommendedActions"); + TestRunner.RunTestScript("Test-ListServerRecommendedActions"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetServerRecommendedAction() { - RunPowerShellTest("Test-GetServerRecommendedAction"); + TestRunner.RunTestScript("Test-GetServerRecommendedAction"); } [Fact(Skip = "This action is not supported on backend. Verified with feature owners.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateServerRecommendedAction() { - RunPowerShellTest("Test-UpdateServerRecommendedAction"); + TestRunner.RunTestScript("Test-UpdateServerRecommendedAction"); } #endregion @@ -56,21 +56,21 @@ public void TestUpdateServerRecommendedAction() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListDatabaseRecommendedActions() { - RunPowerShellTest("Test-ListDatabaseRecommendedActions"); + TestRunner.RunTestScript("Test-ListDatabaseRecommendedActions"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetDatabaseRecommendedAction() { - RunPowerShellTest("Test-GetDatabaseRecommendedAction"); + TestRunner.RunTestScript("Test-GetDatabaseRecommendedAction"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateDatabaseRecommendedAction() { - RunPowerShellTest("Test-UpdateDatabaseRecommendedAction"); + TestRunner.RunTestScript("Test-UpdateDatabaseRecommendedAction"); } #endregion @@ -81,21 +81,21 @@ public void TestUpdateDatabaseRecommendedAction() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListElasticPoolRecommendedActions() { - RunPowerShellTest("Test-ListElasticPoolRecommendedActions"); + TestRunner.RunTestScript("Test-ListElasticPoolRecommendedActions"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetElasticPoolRecommendedAction() { - RunPowerShellTest("Test-GetElasticPoolRecommendedAction"); + TestRunner.RunTestScript("Test-GetElasticPoolRecommendedAction"); } [Fact(Skip = "This action is not supported on backend. Verified with feature owners.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateElasticPoolRecommendedAction() { - RunPowerShellTest("Test-UpdateElasticPoolRecommendedAction"); + TestRunner.RunTestScript("Test-UpdateElasticPoolRecommendedAction"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/RecommendedElasticPoolTests.cs b/src/Sql/Sql.Test/ScenarioTests/RecommendedElasticPoolTests.cs index dca399542894..77e8f413a4c8 100644 --- a/src/Sql/Sql.Test/ScenarioTests/RecommendedElasticPoolTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/RecommendedElasticPoolTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class RecommendedElasticPoolTests : SqlTestsBase + public class RecommendedElasticPoolTests : SqlTestRunner { public RecommendedElasticPoolTests(ITestOutputHelper output) : base(output) { @@ -29,7 +29,7 @@ public RecommendedElasticPoolTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void ListRecommendedElasticPools() { - RunPowerShellTest("Test-ElasticPoolRecommendation"); + TestRunner.RunTestScript("Test-ElasticPoolRecommendation"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ServerActiveDirectoryAdministratorTest.cs b/src/Sql/Sql.Test/ScenarioTests/ServerActiveDirectoryAdministratorTest.cs index c5b0b0ce7c4c..0b30067e3199 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerActiveDirectoryAdministratorTest.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerActiveDirectoryAdministratorTest.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServerActiveDirectoryAdministratorTest : SqlTestsBase + public class ServerActiveDirectoryAdministratorTest : SqlTestRunner { public ServerActiveDirectoryAdministratorTest(ITestOutputHelper output) : base(output) { @@ -29,7 +29,7 @@ public ServerActiveDirectoryAdministratorTest(ITestOutputHelper output) : base(o [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerActiveDirectoryAdministratorCRUD() { - RunPowerShellTest("Test-ServerActiveDirectoryAdministrator"); + TestRunner.RunTestScript("Test-ServerActiveDirectoryAdministrator"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs index 31a6213c5a8d..e07d1f1bcd5f 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs @@ -19,34 +19,31 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServerCommunicationLinkCrudTests : SqlTestsBase + public class ServerCommunicationLinkCrudTests : SqlTestRunner { public ServerCommunicationLinkCrudTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerCommunicationLinkCreate() { - RunPowerShellTest("Test-CreateServerCommunicationLink"); + TestRunner.RunTestScript("Test-CreateServerCommunicationLink"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerCommunicationLinkGet() { - RunPowerShellTest("Test-GetServerCommunicationLink"); + TestRunner.RunTestScript("Test-GetServerCommunicationLink"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerCommunicationLinkRemove() { - RunPowerShellTest("Test-RemoveServerCommunicationLink"); + TestRunner.RunTestScript("Test-RemoveServerCommunicationLink"); } } } 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/ServerDisasterRecoveryConfigurationTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServerDisasterRecoveryConfigurationTests.cs index 2ee2820dd2d6..ac8334474c9a 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerDisasterRecoveryConfigurationTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerDisasterRecoveryConfigurationTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServerDisasterRecoveryConfigurationTests : SqlTestsBase + public class ServerDisasterRecoveryConfigurationTests : SqlTestRunner { public ServerDisasterRecoveryConfigurationTests(ITestOutputHelper output) : base(output) { @@ -29,7 +29,7 @@ public ServerDisasterRecoveryConfigurationTests(ITestOutputHelper output) : base [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerDisasterRecoveryConfiguration() { - RunPowerShellTest("Test-ServerDisasterRecoveryConfiguration"); + TestRunner.RunTestScript("Test-ServerDisasterRecoveryConfiguration"); } } } 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/ServerKeyVaultKeyTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServerKeyVaultKeyTests.cs index 8e7cb7a2b451..2090e4296753 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerKeyVaultKeyTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerKeyVaultKeyTests.cs @@ -16,50 +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 ServerKeyVaultKeyTests : SqlTestsBase + public class ServerKeyVaultKeyTests : SqlTestRunner { - - - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - var graphClient = GetGraphClient(context); - var networkClient = GetNetworkClient(context); - var keyVaultClient = GetKeyVaultClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient, graphClient, keyVaultClient); - } - public ServerKeyVaultKeyTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact(Skip = "Requires hardcoded resource 'akvtdekeyvaultcl'")] [Trait(Category.RunType, Category.LiveOnly)] public void TestServerKeyVaultKeyAdd() { - RunPowerShellTest("Test-AddServerKeyVaultKey"); + TestRunner.RunTestScript("Test-AddServerKeyVaultKey"); } [Fact(Skip = "Requires hardcoded resource 'akvtdekeyvaultcl'")] [Trait(Category.RunType, Category.LiveOnly)] public void TestServerKeyVaultKeyGet() { - RunPowerShellTest("Test-GetServerKeyVaultKey"); + TestRunner.RunTestScript("Test-GetServerKeyVaultKey"); } [Fact(Skip = "TODO: only works for live mode. Mihymel will fix the test issue for Create-ServerKeyVaultKeyTestEnvironment")] [Trait(Category.RunType, Category.LiveOnly)] public void TestServerKeyVaultKeyRemove() { - RunPowerShellTest("Test-RemoveServerKeyVaultKey"); + TestRunner.RunTestScript("Test-RemoveServerKeyVaultKey"); } } } 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/ServiceTierAdvisorTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServiceTierAdvisorTests.cs index 68c1e650fc5c..f0f38a488f71 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServiceTierAdvisorTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServiceTierAdvisorTests.cs @@ -19,27 +19,24 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServiceTierAdvisorTests : SqlTestsBase + public class ServiceTierAdvisorTests : SqlTestRunner { public ServiceTierAdvisorTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void GetUpgradeDatabaseHint() { - RunPowerShellTest("Test-GetUpgradeDatabaseHint"); + TestRunner.RunTestScript("Test-GetUpgradeDatabaseHint"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void GetUpgradeServerHint() { - RunPowerShellTest("Test-GetUpgradeServerHint"); + TestRunner.RunTestScript("Test-GetUpgradeServerHint"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/SqlTestsBase.cs b/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs similarity index 64% rename from src/Sql/Sql.Test/ScenarioTests/SqlTestsBase.cs rename to src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs index 646540d2237f..ced6700dfbe4 100644 --- a/src/Sql/Sql.Test/ScenarioTests/SqlTestsBase.cs +++ b/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs @@ -34,77 +34,80 @@ 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 SqlTestsBase : RMTestBase, IDisposable + public class SqlTestRunner { - protected EnvironmentSetupHelper Helper; - protected string[] resourceTypesToIgnoreApiVersion; + protected string[] resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/managedInstances", + "Microsoft.Sql/managedInstances/databases", + "Microsoft.Sql/managedInstances/managedDatabases", + "Microsoft.Sql/servers", + "Microsoft.Sql/servers/databases" + }; private const string TenantIdKey = "TenantId"; - protected SqlTestsBase(ITestOutputHelper output) - { - Helper = new EnvironmentSetupHelper(); - - var tracer = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(tracer); - Helper.TracingInterceptor = tracer; - } - - protected virtual void SetupManagementClients(MockContext context) - { - var sqlClient = GetSqlClient(context); - var newResourcesClient = GetResourcesClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient); - } + protected readonly ITestRunner TestRunner; - protected void RunPowerShellTest(params string[] scripts) + protected SqlTestRunner(ITestOutputHelper output) { - TestExecutionHelpers.SetUpSessionAndProfile(); - var sf = new StackTrace().GetFrame(1); - var callingClassType = sf.GetMethod().ReflectedType?.ToString(); - var mockName = sf.GetMethod().Name; - - var d = 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} - }; - - var providersToIgnore = new Dictionary - { - {"Microsoft.Azure.Graph.RBAC.Version1_6.GraphRbacManagementClient", "1.42-previewInternal"}, - {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"} - }; - HttpMockServer.Matcher = new PermissiveRecordMatcherWithResourceApiExclusion(true, d, providersToIgnore, resourceTypesToIgnoreApiVersion); - HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords"); - - // Enable undo functionality as well as mock recording - using (var context = MockContext.Start(callingClassType, mockName)) - { - Helper.SetupEnvironment(AzureModule.AzureResourceManager); - SetupManagementClients(context); - Helper.SetupModules(AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + GetType().Name + ".ps1", - Helper.RMProfileModule, - Helper.GetRMModulePath(@"AzureRM.Sql.psd1"), - Helper.RMNetworkModule, - "AzureRM.Storage.ps1", - "AzureRM.Resources.ps1", - Helper.RMOperationalInsightsModule, - Helper.RMEventHubModule, - Helper.RMMonitorModule, - Helper.RMKeyVaultModule); - Helper.RunPowerShellTest(scripts); - } + 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.RMStorageModule, + 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) @@ -188,12 +191,5 @@ protected static CommonStorage.StorageManagementClient GetStorageManagementClien { return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); } - - public void Dispose() - { - XunitTracingInterceptor.RemoveFromContext(Helper.TracingInterceptor); - Helper.TracingInterceptor = null; - Helper = null; - } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/TDECertificateTests.cs b/src/Sql/Sql.Test/ScenarioTests/TDECertificateTests.cs index 6cbebaf7a1b5..d0444aaadab1 100644 --- a/src/Sql/Sql.Test/ScenarioTests/TDECertificateTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/TDECertificateTests.cs @@ -13,83 +13,79 @@ // ---------------------------------------------------------------------------------- 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 TDECertificateTests : SqlTestsBase + public class TDECertificateTests : SqlTestRunner { public TDECertificateTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerDefaultParameterSetNoPassword() { - RunPowerShellTest("Test-AddTdeCertificateForSqlServerDefaultParameterSetNoPassword"); + TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerDefaultParameterSetNoPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerDefaultParameterSetWithPassword() { - RunPowerShellTest("Test-AddTdeCertificateForSqlServerDefaultParameterSetWithPassword"); + TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerDefaultParameterSetWithPassword"); } [Fact(Skip = "Skip due to long setup time for managed instance")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForManagedInstanceDefaultParameterSetNoPassword() { - RunPowerShellTest("Test-AddTdeCertificateForManagedInstanceDefaultParameterSetNoPassword"); + TestRunner.RunTestScript("Test-AddTdeCertificateForManagedInstanceDefaultParameterSetNoPassword"); } [Fact(Skip = "Skip due to long setup time for managed instance")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForManagedInstanceDefaultParameterSetWithPassword() { - RunPowerShellTest("Test-AddTdeCertificateForManagedInstanceDefaultParameterSetWithPassword"); + TestRunner.RunTestScript("Test-AddTdeCertificateForManagedInstanceDefaultParameterSetWithPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerInputObjectParameterSetWithPassword() { - RunPowerShellTest("Test-AddTdeCertificateForSqlServerInputObjectParameterSetWithPassword"); + TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerInputObjectParameterSetWithPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerResourceIdParameterSetWithPassword() { - RunPowerShellTest("Test-AddTdeCertificateForSqlServerResourceIdParameterSetWithPassword"); + TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerResourceIdParameterSetWithPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerInputObjectParameterSetNoPassword() { - RunPowerShellTest("Test-AddTdeCertificateForSqlServerInputObjectParameterSetNoPassword"); + TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerInputObjectParameterSetNoPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerResourceIdParameterSetNoPassword() { - RunPowerShellTest("Test-AddTdeCertificateForSqlServerResourceIdParameterSetNoPassword"); + TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerResourceIdParameterSetNoPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerWithPiping() { - RunPowerShellTest("Test-AddTdeCertificateForSqlServerWithPiping"); + TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerWithPiping"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs index 5caecb728c19..a12b6bc1c971 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs @@ -16,20 +16,11 @@ 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 ThreatDetectionClassicStorageTests : SqlTestsBase + public class ThreatDetectionClassicStorageTests : 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 ThreatDetectionClassicStorageTests(ITestOutputHelper output) : base(output) { } @@ -40,7 +31,7 @@ public ThreatDetectionClassicStorageTests(ITestOutputHelper output) : base(outpu // See issue https://github.com/Azure/azure-powershell/issues/6601 public void ThreatDetectionUpdatePolicyWithClassicStorage() { - RunPowerShellTest("Test-ThreatDetectionUpdatePolicyWithClassicStorage"); + TestRunner.RunTestScript("Test-ThreatDetectionUpdatePolicyWithClassicStorage"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs index e5b06acff212..ed4318dfae46 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs @@ -16,60 +16,48 @@ 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 ThreatDetectionTests : SqlTestsBase + public class ThreatDetectionTests : 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 ThreatDetectionTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers" - }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void ThreatDetectionGetDefaultPolicy() { - RunPowerShellTest("Test-ThreatDetectionGetDefaultPolicy"); + TestRunner.RunTestScript("Test-ThreatDetectionGetDefaultPolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void ThreatDetectionDatabaseUpdatePolicy() { - RunPowerShellTest("Test-ThreatDetectionDatabaseUpdatePolicy"); + TestRunner.RunTestScript("Test-ThreatDetectionDatabaseUpdatePolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void ThreatDetectionServerUpdatePolicy() { - RunPowerShellTest("Test-ThreatDetectionServerUpdatePolicy"); + TestRunner.RunTestScript("Test-ThreatDetectionServerUpdatePolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void DisablingThreatDetection() { - RunPowerShellTest("Test-DisablingThreatDetection"); + TestRunner.RunTestScript("Test-DisablingThreatDetection"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void InvalidArgumentsThreatDetection() { - RunPowerShellTest("Test-InvalidArgumentsThreatDetection"); + TestRunner.RunTestScript("Test-InvalidArgumentsThreatDetection"); } } } 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"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentMiTests.cs b/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentMiTests.cs index fcd116159640..57160034907e 100644 --- a/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentMiTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentMiTests.cs @@ -16,27 +16,13 @@ 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 VulnerabilityAssessmentMiTests : SqlTestsBase + public class VulnerabilityAssessmentMiTests : SqlTestRunner { - protected override void SetupManagementClients(RestTestFramework.MockContext context) - { - var sqlClient = GetSqlClient(context); - var storageV2Client = GetStorageManagementClient(context); - var newResourcesClient = GetResourcesClient(context); - var networkClient = GetNetworkClient(context); - Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient, networkClient); - } - public VulnerabilityAssessmentMiTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/managedInstances", - "Microsoft.Sql/managedInstances/databases" - }; } #region Managed Instance Policy Tests @@ -45,7 +31,7 @@ public VulnerabilityAssessmentMiTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedInstanceSettingsTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentManagedInstanceSettingsTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedInstanceSettingsTest"); } #endregion @@ -56,14 +42,14 @@ public void VulnerabilityAssessmentManagedInstanceSettingsTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedDatabaseWithSettingsNotDefinedTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentManagedDatabaseWithSettingsNotDefinedTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedDatabaseWithSettingsNotDefinedTest"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedDatabaseSettingsTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentManagedDatabaseSettingsTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedDatabaseSettingsTest"); } #endregion @@ -74,7 +60,7 @@ public void VulnerabilityAssessmentManagedDatabaseSettingsTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedDatabaseBaselineTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentManagedDatabaseBaselineTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedDatabaseBaselineTest"); } #endregion @@ -85,14 +71,14 @@ public void VulnerabilityAssessmentManagedDatabaseBaselineTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedDatabaseScanRecordGetListTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentManagedDatabaseScanRecordGetListTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedDatabaseScanRecordGetListTest"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedDatabaseScanConvertTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentManagedDatabaseScanConvertTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedDatabaseScanConvertTest"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs b/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs index 798bada0aa63..d3961e176cfb 100644 --- a/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs @@ -16,27 +16,13 @@ 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 VulnerabilityAssessmentTests : SqlTestsBase + public class VulnerabilityAssessmentTests : 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 VulnerabilityAssessmentTests(ITestOutputHelper output) : base(output) { - base.resourceTypesToIgnoreApiVersion = new string[] { - "Microsoft.Sql/servers", - "Microsoft.Sql/managedInstances", - "Microsoft.Sql/managedInstances/databases" - }; } #region Server Policy Tests @@ -45,7 +31,7 @@ public VulnerabilityAssessmentTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentServerSettingsTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentServerSettingsTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentServerSettingsTest"); } #endregion @@ -56,14 +42,14 @@ public void VulnerabilityAssessmentServerSettingsTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentWithSettingsNotDefinedTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentWithSettingsNotDefinedTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentWithSettingsNotDefinedTest"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentSettingsTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentSettingsTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentSettingsTest"); } #endregion @@ -74,7 +60,7 @@ public void VulnerabilityAssessmentSettingsTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentBaselineTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentBaselineTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentBaselineTest"); } #endregion @@ -85,14 +71,14 @@ public void VulnerabilityAssessmentBaselineTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentScanRecordGetListTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentScanRecordGetListTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentScanRecordGetListTest"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentScanConvertTest() { - RunPowerShellTest("Test-VulnerabilityAssessmentScanConvertTest"); + TestRunner.RunTestScript("Test-VulnerabilityAssessmentScanConvertTest"); } #endregion From 1c5574bcd41cb9372c70607fca14eb8e5adb97c5 Mon Sep 17 00:00:00 2001 From: Ziyue Zheng Date: Thu, 26 May 2022 15:32:49 +0800 Subject: [PATCH 2/4] Add SqlTestRunner to replace SqlTestsBase --- src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs b/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs index ced6700dfbe4..a34b245f8ad9 100644 --- a/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs +++ b/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs @@ -12,19 +12,13 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.Azure.Management.Network; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; -using System; -using System.IO; using System.Collections.Generic; -using System.Diagnostics; using Microsoft.Azure.Management.Internal.Resources; using Microsoft.Azure.Management.Sql; using CommonStorage = Microsoft.Azure.Management.Storage.Version2017_10_01; -using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.Rest.ClientRuntime.Azure.TestFramework; using Xunit.Abstractions; using Microsoft.Azure.Management.EventHub; @@ -45,7 +39,8 @@ public class SqlTestRunner "Microsoft.Sql/managedInstances/databases", "Microsoft.Sql/managedInstances/managedDatabases", "Microsoft.Sql/servers", - "Microsoft.Sql/servers/databases" + "Microsoft.Sql/servers/databases", + "Microsoft.Sql/servers/elasticPools" }; private const string TenantIdKey = "TenantId"; From bfda4f49e7e479094bfdf6d1aa7d7a542dc31ad9 Mon Sep 17 00:00:00 2001 From: Ziyue Zheng Date: Tue, 31 May 2022 02:37:58 +0800 Subject: [PATCH 3/4] Add SqlTestRunner to replace SqlTestsBase --- ...dvancedDataSecurityManagedInstanceTests.cs | 18 +- .../Sql.Test/ScenarioTests/AdvisorTests.cs | 28 +-- .../ScenarioTests/DataClassificationTests.cs | 23 +- .../ScenarioTests/DataMaskingTests.cs | 25 ++- .../Sql.Test/ScenarioTests/DataSyncTests.cs | 39 ++-- .../ScenarioTests/DatabaseActivationTests.cs | 9 +- .../ScenarioTests/DatabaseReplicationTests.cs | 33 +-- .../ElasticJobCredentialCrudTests.cs | 13 +- .../ScenarioTests/ElasticJobCrudTests.cs | 13 +- .../ElasticJobExecutionCrudTests.cs | 17 +- .../ScenarioTests/ElasticJobStepCrudTests.cs | 13 +- .../ElasticJobTargetCrudTests.cs | 9 +- .../ElasticJobTargetGroupCrudTests.cs | 11 +- .../ScenarioTests/FailoverGroupTests.cs | 43 ++-- .../ScenarioTests/ImportExportTests.cs | 13 +- .../ScenarioTests/IndexRecommendationTests.cs | 6 +- .../ScenarioTests/InstancePoolCrudTests.cs | 29 ++- .../ManagedDatabaseLogReplayScenarioTest.cs | 25 ++- ...stanceActiveDirectoryAdministratorTests.cs | 16 +- .../ManagedInstanceKeyVaultKeyTests.cs | 26 ++- .../ManagedInstanceProtectorTests.cs | 36 +++- .../ScenarioTests/RecommendedActionTests.cs | 20 +- .../RecommendedElasticPoolTests.cs | 4 +- .../ServerActiveDirectoryAdministratorTest.cs | 4 +- .../ServerCommunicationLinkCrudTests.cs | 11 +- ...erverDisasterRecoveryConfigurationTests.cs | 4 +- .../ScenarioTests/ServerKeyVaultKeyTests.cs | 24 ++- .../ScenarioTests/ServiceTierAdvisorTests.cs | 9 +- .../Sql.Test/ScenarioTests/SqlTestsBase.cs | 199 ++++++++++++++++++ .../ScenarioTests/TDECertificateTests.cs | 24 ++- .../ThreatDetectionClassicStorageTests.cs | 13 +- .../ScenarioTests/ThreatDetectionTests.cs | 24 ++- .../VulnerabilityAssessmentMiTests.cs | 28 ++- .../VulnerabilityAssessmentTests.cs | 28 ++- 34 files changed, 626 insertions(+), 211 deletions(-) create mode 100644 src/Sql/Sql.Test/ScenarioTests/SqlTestsBase.cs diff --git a/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityManagedInstanceTests.cs b/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityManagedInstanceTests.cs index 38705d6d86d3..b53ff1d6e918 100644 --- a/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityManagedInstanceTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityManagedInstanceTests.cs @@ -14,22 +14,36 @@ using Microsoft.Azure.Commands.ScenarioTest.SqlTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; +using System.Collections.Generic; using Xunit; using Xunit.Abstractions; +using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class AdvancedDataSecurityManagedInstanceTests : SqlTestRunner + public class AdvancedDataSecurityManagedInstanceTests : SqlTestsBase { + protected override void SetupManagementClients(RestTestFramework.MockContext context) + { + var sqlClient = GetSqlClient(context); + var resourcesClient = GetResourcesClient(context); + var networkClient = GetNetworkClient(context); + Helper.SetupSomeOfManagementClients(sqlClient, networkClient, resourcesClient); + } + public AdvancedDataSecurityManagedInstanceTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/managedInstances", + "Microsoft.Sql/managedInstances/databases" + }; } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void AdvancedDataSecurityPolicyTest() { - TestRunner.RunTestScript("Test-AdvancedDataSecurityPolicyManagedInstanceTest"); + RunPowerShellTest("Test-AdvancedDataSecurityPolicyManagedInstanceTest"); } } } \ No newline at end of file diff --git a/src/Sql/Sql.Test/ScenarioTests/AdvisorTests.cs b/src/Sql/Sql.Test/ScenarioTests/AdvisorTests.cs index 944e535f0fe0..4d5eb18e01cf 100644 --- a/src/Sql/Sql.Test/ScenarioTests/AdvisorTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/AdvisorTests.cs @@ -19,10 +19,14 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class AdvisorTests : SqlTestRunner + public class AdvisorTests : SqlTestsBase { public AdvisorTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers", + "Microsoft.Sql/servers/databases" + }; } #region Server Advisor Tests @@ -31,28 +35,28 @@ public AdvisorTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListServerAdvisors() { - TestRunner.RunTestScript("Test-ListServerAdvisors"); + RunPowerShellTest("Test-ListServerAdvisors"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListServerAdvisorsExpanded() { - TestRunner.RunTestScript("Test-ListServerAdvisorsExpanded"); + RunPowerShellTest("Test-ListServerAdvisorsExpanded"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetServerAdvisor() { - TestRunner.RunTestScript("Test-GetServerAdvisor"); + RunPowerShellTest("Test-GetServerAdvisor"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateServerAdvisor() { - TestRunner.RunTestScript("Test-UpdateServerAdvisor"); + RunPowerShellTest("Test-UpdateServerAdvisor"); } #endregion @@ -63,27 +67,27 @@ public void TestUpdateServerAdvisor() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListDatabaseAdvisors() { - TestRunner.RunTestScript("Test-ListDatabaseAdvisors"); + RunPowerShellTest("Test-ListDatabaseAdvisors"); } [Fact(Skip = "unable to re-record")] public void TestListDatabaseAdvisorsExpanded() { - TestRunner.RunTestScript("Test-ListDatabaseAdvisorsExpanded"); + RunPowerShellTest("Test-ListDatabaseAdvisorsExpanded"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetDatabaseAdvisor() { - TestRunner.RunTestScript("Test-GetDatabaseAdvisor"); + RunPowerShellTest("Test-GetDatabaseAdvisor"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateDatabaseAdvisor() { - TestRunner.RunTestScript("Test-UpdateDatabaseAdvisor"); + RunPowerShellTest("Test-UpdateDatabaseAdvisor"); } #endregion @@ -94,21 +98,21 @@ public void TestUpdateDatabaseAdvisor() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListElasticPoolAdvisors() { - TestRunner.RunTestScript("Test-ListElasticPoolAdvisors"); + RunPowerShellTest("Test-ListElasticPoolAdvisors"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListElasticPoolAdvisorsExpanded() { - TestRunner.RunTestScript("Test-ListElasticPoolAdvisorsExpanded"); + RunPowerShellTest("Test-ListElasticPoolAdvisorsExpanded"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetElasticPoolAdvisor() { - TestRunner.RunTestScript("Test-GetElasticPoolAdvisor"); + RunPowerShellTest("Test-GetElasticPoolAdvisor"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/DataClassificationTests.cs b/src/Sql/Sql.Test/ScenarioTests/DataClassificationTests.cs index 4f222d0379e8..be925826b166 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DataClassificationTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DataClassificationTests.cs @@ -15,41 +15,54 @@ 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 DataClassificationTests : SqlTestRunner + public class DataClassificationTests : SqlTestsBase { public DataClassificationTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/managedInstances", + "Microsoft.Sql/servers", + "Microsoft.Sql/managedInstances/databases" + }; } + protected override void SetupManagementClients(RestTestFramework.MockContext context) + { + var sqlClient = GetSqlClient(context); + var newResourcesClient = GetResourcesClient(context); + var networkClient = GetNetworkClient(context); + Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient); + } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDataClassificationOnSqlDatabase() { - TestRunner.RunTestScript("Test-DataClassificationOnSqlDatabase"); + RunPowerShellTest("Test-DataClassificationOnSqlDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestErrorIsThrownWhenInvalidClassificationIsSet() { - TestRunner.RunTestScript("Test-ErrorIsThrownWhenInvalidClassificationIsSet"); + RunPowerShellTest("Test-ErrorIsThrownWhenInvalidClassificationIsSet"); } [Fact(Skip = "not able to re - record because 'Managed Instance is not accepting creation of instances with General Purpose edition and Generation 4 hardware in this region.'")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestBasicDataClassificationOnSqlManagedDatabase() { - TestRunner.RunTestScript("Test-BasicDataClassificationOnSqlManagedDatabase"); + RunPowerShellTest("Test-BasicDataClassificationOnSqlManagedDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestEnableDisableRecommendationsOnSqlDatabase() { - TestRunner.RunTestScript("Test-EnableDisableRecommendationsOnSqlDatabase"); + RunPowerShellTest("Test-EnableDisableRecommendationsOnSqlDatabase"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DataMaskingTests.cs b/src/Sql/Sql.Test/ScenarioTests/DataMaskingTests.cs index e8888812608d..cd2b4d515859 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DataMaskingTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DataMaskingTests.cs @@ -16,55 +16,66 @@ 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 DataMaskingTests : SqlTestRunner + public class DataMaskingTests : SqlTestsBase { + protected override void SetupManagementClients(RestTestFramework.MockContext context) + { + var sqlClient = GetSqlClient(context); + var newResourcesClient = GetResourcesClient(context); + Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient); + } + public DataMaskingTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingPrivilegedUsersChanges() { - TestRunner.RunTestScript("Test-DatabaseDataMaskingPrivilegedUsersChanges"); + RunPowerShellTest("Test-DatabaseDataMaskingPrivilegedUsersChanges"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingBasicRuleLifecycle() { - TestRunner.RunTestScript("Test-DatabaseDataMaskingBasicRuleLifecycle"); + RunPowerShellTest("Test-DatabaseDataMaskingBasicRuleLifecycle"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingNumberRuleLifecycle() { - TestRunner.RunTestScript("Test-DatabaseDataMaskingNumberRuleLifecycle"); + RunPowerShellTest("Test-DatabaseDataMaskingNumberRuleLifecycle"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingTextRuleLifecycle() { - TestRunner.RunTestScript("Test-DatabaseDataMaskingTextRuleLifecycle"); + RunPowerShellTest("Test-DatabaseDataMaskingTextRuleLifecycle"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingRuleCreationFailures() { - TestRunner.RunTestScript("Test-DatabaseDataMaskingRuleCreationFailures"); + RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationFailures"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabaseDataMaskingRuleCreationWithoutPolicy() { - TestRunner.RunTestScript("Test-DatabaseDataMaskingRuleCreationWithoutPolicy"); + RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationWithoutPolicy"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DataSyncTests.cs b/src/Sql/Sql.Test/ScenarioTests/DataSyncTests.cs index b3bf06f613de..bccee04301d8 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DataSyncTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DataSyncTests.cs @@ -13,121 +13,128 @@ // ---------------------------------------------------------------------------------- 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 DataSyncTests : SqlTestRunner + public class DataSyncTests : SqlTestsBase { public DataSyncTests(ITestOutputHelper output) : base(output) { + XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output)); + + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers", + "Microsoft.Sql/managedInstances/databases" + }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncAgentCreate() { - TestRunner.RunTestScript("Test-CreateSyncAgent"); + RunPowerShellTest("Test-CreateSyncAgent"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncAgentsGetAndList() { - TestRunner.RunTestScript("Test-GetAndListSyncAgents"); + RunPowerShellTest("Test-GetAndListSyncAgents"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncAgentRemove() { - TestRunner.RunTestScript("Test-RemoveSyncAgent"); + RunPowerShellTest("Test-RemoveSyncAgent"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncAgentKeyCreate() { - TestRunner.RunTestScript("Test-CreateSyncAgentKey"); + RunPowerShellTest("Test-CreateSyncAgentKey"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncAgentLinkedDatabaseList() { - TestRunner.RunTestScript("Test-listSyncAgentLinkedDatabase"); + RunPowerShellTest("Test-listSyncAgentLinkedDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncGroupCreate() { - TestRunner.RunTestScript("Test-CreateSyncGroup"); + RunPowerShellTest("Test-CreateSyncGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncGroupUpdate() { - TestRunner.RunTestScript("Test-UpdateSyncGroup"); + RunPowerShellTest("Test-UpdateSyncGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncGroupsGetAndList() { - TestRunner.RunTestScript("Test-GetAndListSyncGroups"); + RunPowerShellTest("Test-GetAndListSyncGroups"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncGroupHubSchemaRefreshAndGet() { - TestRunner.RunTestScript("Test-RefreshAndGetSyncGroupHubSchema"); + RunPowerShellTest("Test-RefreshAndGetSyncGroupHubSchema"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncGroupRemove() { - TestRunner.RunTestScript("Test-RemoveSyncGroup"); + RunPowerShellTest("Test-RemoveSyncGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncMemberCreate() { - TestRunner.RunTestScript("Test-CreateSyncMember"); + RunPowerShellTest("Test-CreateSyncMember"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncMembersGetAndList() { - TestRunner.RunTestScript("Test-GetAndListSyncMembers"); + RunPowerShellTest("Test-GetAndListSyncMembers"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncMemberUpdate() { - TestRunner.RunTestScript("Test-UpdateSyncMember"); + RunPowerShellTest("Test-UpdateSyncMember"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncMemberSchemaRefreshAndGet() { - TestRunner.RunTestScript("Test-RefreshAndGetSyncMemberSchema"); + RunPowerShellTest("Test-RefreshAndGetSyncMemberSchema"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSyncMemberRemove() { - TestRunner.RunTestScript("Test-RemoveSyncMember"); + RunPowerShellTest("Test-RemoveSyncMember"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DatabaseActivationTests.cs b/src/Sql/Sql.Test/ScenarioTests/DatabaseActivationTests.cs index cce3ec59f8e9..9158d53e5579 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DatabaseActivationTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DatabaseActivationTests.cs @@ -19,24 +19,27 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class DatabaseActivationTests : SqlTestRunner + public class DatabaseActivationTests : SqlTestsBase { public DatabaseActivationTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } [Fact(Skip = "The test takes the longest time to run. Skip it to workaround timeout temporarily.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabasePauseResume() { - TestRunner.RunTestScript("Test-DatabasePauseResume"); + RunPowerShellTest("Test-DatabasePauseResume"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDatabasePauseResumePiped() { - TestRunner.RunTestScript("Test-DatabasePauseResumePiped"); + RunPowerShellTest("Test-DatabasePauseResumePiped"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.cs b/src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.cs index 4866640dfa5e..6c29f14aab31 100644 --- a/src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.cs @@ -19,108 +19,111 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class DatabaseReplicationTests : SqlTestRunner + public class DatabaseReplicationTests : SqlTestsBase { public DatabaseReplicationTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateDatabaseCopy() { - TestRunner.RunTestScript("Test-CreateDatabaseCopy"); + RunPowerShellTest("Test-CreateDatabaseCopy"); } [Fact(Skip = "Taking too long - try again before PR merge")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateVcoreDatabaseCopy() { - TestRunner.RunTestScript("Test-CreateVcoreDatabaseCopy"); + RunPowerShellTest("Test-CreateVcoreDatabaseCopy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateSecondaryDatabase() { - TestRunner.RunTestScript("Test-CreateSecondaryDatabase"); + RunPowerShellTest("Test-CreateSecondaryDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateNamedSecondaryDatabase() { - TestRunner.RunTestScript("Test-CreateNamedSecondaryDatabase"); + RunPowerShellTest("Test-CreateNamedSecondaryDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateNamedSecondaryDatabaseNegative() { - TestRunner.RunTestScript("Test-CreateNamedSecondaryDatabaseNegative"); + RunPowerShellTest("Test-CreateNamedSecondaryDatabaseNegative"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetReplicationLink() { - TestRunner.RunTestScript("Test-GetReplicationLink"); + RunPowerShellTest("Test-GetReplicationLink"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveSecondaryDatabase() { - TestRunner.RunTestScript("Test-RemoveSecondaryDatabase"); + RunPowerShellTest("Test-RemoveSecondaryDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverSecondaryDatabase() { - TestRunner.RunTestScript("Test-FailoverSecondaryDatabase"); + RunPowerShellTest("Test-FailoverSecondaryDatabase"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateDatabaseCopyWithBackupStorageRedundancy() { - TestRunner.RunTestScript("Test-CreateDatabaseCopyWithBackupStorageRedundancy"); + RunPowerShellTest("Test-CreateDatabaseCopyWithBackupStorageRedundancy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateSecondaryDatabaseWithBackupStorageRedundancy() { - TestRunner.RunTestScript("Test-CreateSecondaryDatabaseWithBackupStorageRedundancy"); + RunPowerShellTest("Test-CreateSecondaryDatabaseWithBackupStorageRedundancy"); } [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 TestCreateCopyRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant() { - TestRunner.RunTestScript("Test-CreateCopyRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant"); + RunPowerShellTest("Test-CreateCopyRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant"); } [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 TestCreateCopyRegularAndZoneRedundantDatabaseWithSourceZoneRedundant() { - TestRunner.RunTestScript("Test-CreateCopyRegularAndZoneRedundantDatabaseWithSourceZoneRedundant"); + RunPowerShellTest("Test-CreateCopyRegularAndZoneRedundantDatabaseWithSourceZoneRedundant"); } [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 TestCreateSecondaryRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant() { - TestRunner.RunTestScript("Test-CreateSecondaryRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant"); + RunPowerShellTest("Test-CreateSecondaryRegularAndZoneRedundantDatabaseWithSourceNotZoneRedundant"); } [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 TestCreateSecondaryRegularAndZoneRedundantDatabaseWithSourceZoneRedundant() { - TestRunner.RunTestScript("Test-CreateSecondaryRegularAndZoneRedundantDatabaseWithSourceZoneRedundant"); + RunPowerShellTest("Test-CreateSecondaryRegularAndZoneRedundantDatabaseWithSourceZoneRedundant"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobCredentialCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobCredentialCrudTests.cs index c8390c1f78ad..afdaac601543 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobCredentialCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobCredentialCrudTests.cs @@ -19,10 +19,13 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobCredentialCrudTests : SqlTestRunner + public class ElasticJobCredentialCrudTests : SqlTestsBase { public ElasticJobCredentialCrudTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } #region Create Tests @@ -31,7 +34,7 @@ public ElasticJobCredentialCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobCredentialCreate() { - TestRunner.RunTestScript("Test-CreateJobCredential"); + RunPowerShellTest("Test-CreateJobCredential"); } #endregion @@ -42,7 +45,7 @@ public void TestJobCredentialCreate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobCredentialUpdate() { - TestRunner.RunTestScript("Test-UpdateJobCredential"); + RunPowerShellTest("Test-UpdateJobCredential"); } #endregion @@ -53,7 +56,7 @@ public void TestJobCredentialUpdate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobCredentialGet() { - TestRunner.RunTestScript("Test-GetJobCredential"); + RunPowerShellTest("Test-GetJobCredential"); } #endregion @@ -64,7 +67,7 @@ public void TestJobCredentialGet() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobCredentialRemove() { - TestRunner.RunTestScript("Test-RemoveJobCredential"); + RunPowerShellTest("Test-RemoveJobCredential"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobCrudTests.cs index a86c3328393c..52f6dcd17ed9 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobCrudTests.cs @@ -19,10 +19,13 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobCrudTests : SqlTestRunner + public class ElasticJobCrudTests : SqlTestsBase { public ElasticJobCrudTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } #region Create Tests @@ -34,7 +37,7 @@ public ElasticJobCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobCreate() { - TestRunner.RunTestScript("Test-CreateJob"); + RunPowerShellTest("Test-CreateJob"); } #endregion @@ -45,7 +48,7 @@ public void TestJobCreate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobUpdate() { - TestRunner.RunTestScript("Test-UpdateJob"); + RunPowerShellTest("Test-UpdateJob"); } #endregion @@ -56,7 +59,7 @@ public void TestJobUpdate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobGet() { - TestRunner.RunTestScript("Test-GetJob"); + RunPowerShellTest("Test-GetJob"); } #endregion @@ -67,7 +70,7 @@ public void TestJobGet() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobRemove() { - TestRunner.RunTestScript("Test-RemoveJob"); + RunPowerShellTest("Test-RemoveJob"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobExecutionCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobExecutionCrudTests.cs index d9aa88544b70..a8d28130e17e 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobExecutionCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobExecutionCrudTests.cs @@ -19,10 +19,13 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobExecutionCrudTests : SqlTestRunner + public class ElasticJobExecutionCrudTests : SqlTestsBase { public ElasticJobExecutionCrudTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } #region Start Job Tests @@ -31,14 +34,14 @@ public ElasticJobExecutionCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStart() { - TestRunner.RunTestScript("Test-StartJob"); + RunPowerShellTest("Test-StartJob"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStartWait() { - TestRunner.RunTestScript("Test-StartJobWait"); + RunPowerShellTest("Test-StartJobWait"); } #endregion @@ -49,7 +52,7 @@ public void TestJobStartWait() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStop() { - TestRunner.RunTestScript("Test-StopJob"); + RunPowerShellTest("Test-StopJob"); } #endregion @@ -60,7 +63,7 @@ public void TestJobStop() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobExecutionGet() { - TestRunner.RunTestScript("Test-GetJobExecution"); + RunPowerShellTest("Test-GetJobExecution"); } #endregion @@ -72,7 +75,7 @@ public void TestJobExecutionGet() public void TestJobStepExecutionGet() { - TestRunner.RunTestScript("Test-GetJobStepExecution"); + RunPowerShellTest("Test-GetJobStepExecution"); } #endregion @@ -83,7 +86,7 @@ public void TestJobStepExecutionGet() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobTargetExecutionGet() { - TestRunner.RunTestScript("Test-GetJobTargetExecution"); + RunPowerShellTest("Test-GetJobTargetExecution"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobStepCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobStepCrudTests.cs index c7ce3c5971c2..92a155cc65ca 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobStepCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobStepCrudTests.cs @@ -19,10 +19,13 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobStepCrudTests : SqlTestRunner + public class ElasticJobStepCrudTests : SqlTestsBase { public ElasticJobStepCrudTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } #region Create Tests @@ -31,7 +34,7 @@ public ElasticJobStepCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStepCreate() { - TestRunner.RunTestScript("Test-CreateJobStep"); + RunPowerShellTest("Test-CreateJobStep"); } #endregion @@ -42,7 +45,7 @@ public void TestJobStepCreate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStepUpdate() { - TestRunner.RunTestScript("Test-UpdateJobStep"); + RunPowerShellTest("Test-UpdateJobStep"); } #endregion @@ -53,7 +56,7 @@ public void TestJobStepUpdate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStepGet() { - TestRunner.RunTestScript("Test-GetJobStep"); + RunPowerShellTest("Test-GetJobStep"); } #endregion @@ -64,7 +67,7 @@ public void TestJobStepGet() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestJobStepRemove() { - TestRunner.RunTestScript("Test-RemoveJobStep"); + RunPowerShellTest("Test-RemoveJobStep"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetCrudTests.cs index 1a1159665bad..9a6bf43144fa 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetCrudTests.cs @@ -19,24 +19,27 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobTargetCrudTests : SqlTestRunner + public class ElasticJobTargetCrudTests : SqlTestsBase { public ElasticJobTargetCrudTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestTargetAdd() { - TestRunner.RunTestScript("Test-AddTarget"); + RunPowerShellTest("Test-AddTarget"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestTargetRemove() { - TestRunner.RunTestScript("Test-RemoveTarget"); + RunPowerShellTest("Test-RemoveTarget"); } } } \ No newline at end of file diff --git a/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetGroupCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetGroupCrudTests.cs index 3a0f0eb7addb..d5024729eee6 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetGroupCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ElasticJobTargetGroupCrudTests.cs @@ -19,10 +19,13 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ElasticJobTargetGroupCrudTests : SqlTestRunner + public class ElasticJobTargetGroupCrudTests : SqlTestsBase { public ElasticJobTargetGroupCrudTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } #region Create Tests @@ -31,7 +34,7 @@ public ElasticJobTargetGroupCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestTargetGroupCreate() { - TestRunner.RunTestScript("Test-CreateTargetGroup"); + RunPowerShellTest("Test-CreateTargetGroup"); } #endregion @@ -42,7 +45,7 @@ public void TestTargetGroupCreate() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestTargetGroupGet() { - TestRunner.RunTestScript("Test-GetTargetGroup"); + RunPowerShellTest("Test-GetTargetGroup"); } #endregion @@ -53,7 +56,7 @@ public void TestTargetGroupGet() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestTargetGroupRemove() { - TestRunner.RunTestScript("Test-RemoveTargetGroup"); + RunPowerShellTest("Test-RemoveTargetGroup"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/FailoverGroupTests.cs b/src/Sql/Sql.Test/ScenarioTests/FailoverGroupTests.cs index 5caf8534144d..f50e8b1dbf13 100644 --- a/src/Sql/Sql.Test/ScenarioTests/FailoverGroupTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/FailoverGroupTests.cs @@ -19,143 +19,146 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class FailoverGroupTests : SqlTestRunner + public class FailoverGroupTests : SqlTestsBase { public FailoverGroupTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestFailoverGroup() { - TestRunner.RunTestScript("Test-FailoverGroup"); + RunPowerShellTest("Test-FailoverGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_Named() { - TestRunner.RunTestScript("Test-CreateFailoverGroup-Named"); + RunPowerShellTest("Test-CreateFailoverGroup-Named"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_Positional() { - TestRunner.RunTestScript("Test-CreateFailoverGroup-Positional"); + RunPowerShellTest("Test-CreateFailoverGroup-Positional"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_AutomaticPolicy() { - TestRunner.RunTestScript("Test-CreateFailoverGroup-AutomaticPolicy"); + RunPowerShellTest("Test-CreateFailoverGroup-AutomaticPolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_AutomaticPolicyGracePeriodReadOnlyFailover() { - TestRunner.RunTestScript("Test-CreateFailoverGroup-AutomaticPolicyGracePeriodReadOnlyFailover"); + RunPowerShellTest("Test-CreateFailoverGroup-AutomaticPolicyGracePeriodReadOnlyFailover"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_ZeroGracePeriod() { - TestRunner.RunTestScript("Test-CreateFailoverGroup-ZeroGracePeriod"); + RunPowerShellTest("Test-CreateFailoverGroup-ZeroGracePeriod"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_ManualPolicy() { - TestRunner.RunTestScript("Test-CreateFailoverGroup-ManualPolicy"); + RunPowerShellTest("Test-CreateFailoverGroup-ManualPolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateFailoverGroup_Overflow() { - TestRunner.RunTestScript("Test-CreateFailoverGroup-Overflow"); + RunPowerShellTest("Test-CreateFailoverGroup-Overflow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_Named() { - TestRunner.RunTestScript("Test-SetFailoverGroup-Named"); + RunPowerShellTest("Test-SetFailoverGroup-Named"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_Positional() { - TestRunner.RunTestScript("Test-SetFailoverGroup-Positional"); + RunPowerShellTest("Test-SetFailoverGroup-Positional"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_PipeServer() { - TestRunner.RunTestScript("Test-SetFailoverGroup-PipeServer"); + RunPowerShellTest("Test-SetFailoverGroup-PipeServer"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_AutomaticWithGracePeriodReadOnlyFailover() { - TestRunner.RunTestScript("Test-SetFailoverGroup-AutomaticWithGracePeriodReadOnlyFailover"); + RunPowerShellTest("Test-SetFailoverGroup-AutomaticWithGracePeriodReadOnlyFailover"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_AutomaticWithGracePeriodZero() { - TestRunner.RunTestScript("Test-SetFailoverGroup-AutomaticWithGracePeriodZero"); + RunPowerShellTest("Test-SetFailoverGroup-AutomaticWithGracePeriodZero"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_AutomaticToManual() { - TestRunner.RunTestScript("Test-SetFailoverGroup-AutomaticToManual"); + RunPowerShellTest("Test-SetFailoverGroup-AutomaticToManual"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_ManualToAutomaticNoGracePeriod() { - TestRunner.RunTestScript("Test-SetFailoverGroup-ManualToAutomaticNoGracePeriod"); + RunPowerShellTest("Test-SetFailoverGroup-ManualToAutomaticNoGracePeriod"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetFailoverGroup_Overflow() { - TestRunner.RunTestScript("Test-SetFailoverGroup-Overflow"); + RunPowerShellTest("Test-SetFailoverGroup-Overflow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void Test_AddRemoveDatabasesToFromFailoverGroup() { - TestRunner.RunTestScript("Test-AddRemoveDatabasesToFromFailoverGroup"); + RunPowerShellTest("Test-AddRemoveDatabasesToFromFailoverGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSwitchFailoverGroup() { - TestRunner.RunTestScript("Test-SwitchFailoverGroup"); + RunPowerShellTest("Test-SwitchFailoverGroup"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSwitchFailoverGroupAllowDataLoss() { - TestRunner.RunTestScript("Test-SwitchFailoverGroupAllowDataLoss"); + RunPowerShellTest("Test-SwitchFailoverGroupAllowDataLoss"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ImportExportTests.cs b/src/Sql/Sql.Test/ScenarioTests/ImportExportTests.cs index d1a03076197c..1630061abfe0 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ImportExportTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ImportExportTests.cs @@ -19,24 +19,27 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ImportExportTests : SqlTestRunner + public class ImportExportTests : SqlTestsBase { public ImportExportTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestExportDatabase() { - TestRunner.RunTestScript("Test-ExportDatabase"); + RunPowerShellTest("Test-ExportDatabase"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestExportDatabase_NetworkIsolation() { - TestRunner.RunTestScript("Test-ExportDatabaseNetworkIsolation"); + RunPowerShellTest("Test-ExportDatabaseNetworkIsolation"); } [Fact(Skip = "Cannot re-record.")] @@ -44,7 +47,7 @@ public void TestExportDatabase_NetworkIsolation() [Trait(Category.Sql, "Needs to be re-recorded")] public void TestImportNewDatabase() { - TestRunner.RunTestScript("Test-ImportNewDatabase"); + RunPowerShellTest("Test-ImportNewDatabase"); } [Fact(Skip = "Cannot re-record.")] @@ -52,7 +55,7 @@ public void TestImportNewDatabase() [Trait(Category.Sql, "Needs to be re-recorded")] public void TestImportNewDatabase_NetworkIsolation() { - TestRunner.RunTestScript("Test-ImportNewDatabaseNetworkIsolation"); + RunPowerShellTest("Test-ImportNewDatabaseNetworkIsolation"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/IndexRecommendationTests.cs b/src/Sql/Sql.Test/ScenarioTests/IndexRecommendationTests.cs index 816d621818ff..43b26cea0b79 100644 --- a/src/Sql/Sql.Test/ScenarioTests/IndexRecommendationTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/IndexRecommendationTests.cs @@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class IndexRecommendationTests : SqlTestRunner + public class IndexRecommendationTests : SqlTestsBase { public IndexRecommendationTests(ITestOutputHelper output) : base(output) { @@ -34,7 +34,7 @@ public void TestGetIndexRecommendation() // TODO https://github.com/Azure/azure-powershell/issues/4156 if (TestMockSupport.RunningMocked) { - TestRunner.RunTestScript("Test-GetIndexRecommendations"); + RunPowerShellTest("Test-GetIndexRecommendations"); } } @@ -46,7 +46,7 @@ public void TestCreateIndex() // TODO https://github.com/Azure/azure-powershell/issues/4156 if (TestMockSupport.RunningMocked) { - TestRunner.RunTestScript("Test-CreateIndex"); + RunPowerShellTest("Test-CreateIndex"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/InstancePoolCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/InstancePoolCrudTests.cs index 6f4475f98106..3444fdbfa96f 100644 --- a/src/Sql/Sql.Test/ScenarioTests/InstancePoolCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/InstancePoolCrudTests.cs @@ -16,15 +16,24 @@ 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 InstancePoolCrudTests : SqlTestRunner + public class InstancePoolCrudTests : SqlTestsBase { public InstancePoolCrudTests(ITestOutputHelper output) : base(output) { } + protected override void SetupManagementClients(RestTestFramework.MockContext context) + { + var sqlClient = GetSqlClient(context); + var newResourcesClient = GetResourcesClient(context); + var networkClient = GetNetworkClient(context); + Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient); + } + #region Instance pool /// @@ -34,7 +43,7 @@ public InstancePoolCrudTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateInstancePool() { - TestRunner.RunTestScript("Test-CreateInstancePool"); + RunPowerShellTest("Test-CreateInstancePool"); } /// @@ -44,7 +53,7 @@ public void TestCreateInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateInstancePool() { - TestRunner.RunTestScript("Test-UpdateInstancePool"); + RunPowerShellTest("Test-UpdateInstancePool"); } /// @@ -54,14 +63,14 @@ public void TestUpdateInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetInstancePool() { - TestRunner.RunTestScript("Test-GetInstancePool"); + RunPowerShellTest("Test-GetInstancePool"); } [Fact(Skip = "Skip due to long setup time for managed instance pool")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveInstancePool() { - TestRunner.RunTestScript("Test-RemoveInstancePool"); + RunPowerShellTest("Test-RemoveInstancePool"); } #endregion @@ -75,7 +84,7 @@ public void TestRemoveInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateManagedInstanceInInstancePool() { - TestRunner.RunTestScript("Test-CreateManagedInstanceInInstancePool"); + RunPowerShellTest("Test-CreateManagedInstanceInInstancePool"); } /// @@ -85,7 +94,7 @@ public void TestCreateManagedInstanceInInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetManagedInstanceInInstancePool() { - TestRunner.RunTestScript("Test-GetManagedInstanceInInstancePool"); + RunPowerShellTest("Test-GetManagedInstanceInInstancePool"); } /// @@ -95,7 +104,7 @@ public void TestGetManagedInstanceInInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateManagedInstanceInInstancePool() { - TestRunner.RunTestScript("Test-UpdateManagedInstanceInInstancePool"); + RunPowerShellTest("Test-UpdateManagedInstanceInInstancePool"); } /// @@ -105,7 +114,7 @@ public void TestUpdateManagedInstanceInInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDeleteManagedInstanceInInstancePool() { - TestRunner.RunTestScript("Test-DeleteManagedInstanceInInstancePool"); + RunPowerShellTest("Test-DeleteManagedInstanceInInstancePool"); } #endregion @@ -119,7 +128,7 @@ public void TestDeleteManagedInstanceInInstancePool() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetInstancePoolUsage() { - TestRunner.RunTestScript("Test-GetInstancePoolUsage"); + RunPowerShellTest("Test-GetInstancePoolUsage"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseLogReplayScenarioTest.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseLogReplayScenarioTest.cs index d189e39ae46b..544199017027 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseLogReplayScenarioTest.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseLogReplayScenarioTest.cs @@ -13,51 +13,64 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.ScenarioTest.SqlTests; +using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; using Xunit; using Xunit.Abstractions; using Microsoft.WindowsAzure.Commands.ScenarioTest; namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ManagedDatabaseLogReplayScenarioTest : SqlTestRunner + public class ManagedDatabaseLogReplayScenarioTest : SqlTestsBase { + 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 ManagedDatabaseLogReplayScenarioTest(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/managedInstances", + "Microsoft.Sql/managedInstances/databases" + }; } [Fact(Skip = "Depends on hardcoded resource to rerecord")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedDatabaseLogReplayService() { - TestRunner.RunTestScript("Test-ManagedDatabaseLogReplay"); + RunPowerShellTest("Test-ManagedDatabaseLogReplay"); } [Fact(Skip = "Depends on hardcoded resource to rerecord")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCompleteManagedDatabaseLogReplayService() { - TestRunner.RunTestScript("Test-CompleteManagedDatabaseLogReplay"); + RunPowerShellTest("Test-CompleteManagedDatabaseLogReplay"); } [Fact(Skip = "Depends on hardcoded resource to rerecord")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCancelManagedDatabaseLogReplayService() { - TestRunner.RunTestScript("Test-CancelManagedDatabaseLogReplay"); + RunPowerShellTest("Test-CancelManagedDatabaseLogReplay"); } [Fact(Skip = "Depends on hardcoded resource to rerecord")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestPipingManagedDatabaseLogReplayService() { - TestRunner.RunTestScript("Test-ManagedDatabaseLogReplayPiping"); + RunPowerShellTest("Test-ManagedDatabaseLogReplayPiping"); } [Fact(Skip = "Depends on hardcoded resource to rerecord")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestPipingCompleteCancelManagedDatabaseLogReplayService() { - TestRunner.RunTestScript("Test-PipingCompleteCancelManagedDatabaseLogReplay"); + RunPowerShellTest("Test-PipingCompleteCancelManagedDatabaseLogReplay"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceActiveDirectoryAdministratorTests.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceActiveDirectoryAdministratorTests.cs index 257d1e0503fc..95cbe24af062 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceActiveDirectoryAdministratorTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceActiveDirectoryAdministratorTests.cs @@ -16,20 +16,32 @@ 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 ManagedInstanceActiveDirectoryAdministratorTests : SqlTestRunner + public class ManagedInstanceActiveDirectoryAdministratorTests : SqlTestsBase { public ManagedInstanceActiveDirectoryAdministratorTests(ITestOutputHelper output) : base(output) { } + + 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(Skip = "MDCS Customer Experience team should re-record this test.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceActiveDirectoryAdministrator() { - TestRunner.RunTestScript("Test-ManagedInstanceActiveDirectoryAdministrator"); + RunPowerShellTest("Test-ManagedInstanceActiveDirectoryAdministrator"); } } } + + diff --git a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceKeyVaultKeyTests.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceKeyVaultKeyTests.cs index 8f59afd758b3..9a3ab0696ece 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceKeyVaultKeyTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceKeyVaultKeyTests.cs @@ -16,48 +16,62 @@ 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 ManagedInstanceKeyVaultKeyTests : SqlTestRunner + public class ManagedInstanceKeyVaultKeyTests : SqlTestsBase { public ManagedInstanceKeyVaultKeyTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/managedInstances" + }; + } + + protected override void SetupManagementClients(RestTestFramework.MockContext context) + { + var sqlClient = GetSqlClient(context); + var newResourcesClient = GetResourcesClient(context); + var graphClient = GetGraphClient(context); + var networkClient = GetNetworkClient(context); + var keyVaultClient = GetKeyVaultClient(context); + Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient, graphClient, keyVaultClient); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceKeyVaultKeyCI() { - TestRunner.RunTestScript("Test-ManagedInstanceKeyVaultKeyCI"); + RunPowerShellTest("Test-ManagedInstanceKeyVaultKeyCI"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceKeyVaultKey() { - TestRunner.RunTestScript("Test-ManagedInstanceKeyVaultKey"); + RunPowerShellTest("Test-ManagedInstanceKeyVaultKey"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceKeyVaultKeyInputObject() { - TestRunner.RunTestScript("Test-ManagedInstanceKeyVaultKeyInputObject"); + RunPowerShellTest("Test-ManagedInstanceKeyVaultKeyInputObject"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceKeyVaultKeyResourceId() { - TestRunner.RunTestScript("Test-ManagedInstanceKeyVaultKeyResourceId"); + RunPowerShellTest("Test-ManagedInstanceKeyVaultKeyResourceId"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestManagedInstanceKeyVaultKeyPiping() { - TestRunner.RunTestScript("Test-ManagedInstanceKeyVaultKeyPiping"); + RunPowerShellTest("Test-ManagedInstanceKeyVaultKeyPiping"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceProtectorTests.cs b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceProtectorTests.cs index da6bd16b0344..7c17af52fe9a 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceProtectorTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ManagedInstanceProtectorTests.cs @@ -16,83 +16,97 @@ 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 ManagedInstanceProtectorTests : SqlTestRunner + public class ManagedInstanceProtectorTests : SqlTestsBase { public ManagedInstanceProtectorTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/managedInstances" + }; + } + + protected override void SetupManagementClients(RestTestFramework.MockContext context) + { + var sqlClient = GetSqlClient(context); + var newResourcesClient = GetResourcesClient(context); + var graphClient = GetGraphClient(context); + var networkClient = GetNetworkClient(context); + var keyVaultClient = GetKeyVaultClient(context); + Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient, graphClient, keyVaultClient); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorCI() { - TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorCI"); + RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorCI"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorByokFailsWithoutKeyId() { - TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorByokFailsWithoutKeyId"); + RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorByokFailsWithoutKeyId"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorServiceManaged() { - TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorServiceManaged"); + RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorServiceManaged"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorServiceManagedInputObject() { - TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedInputObject"); + RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedInputObject"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorServiceManagedResourceId() { - TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedResourceId"); + RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedResourceId"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorServiceManagedPiping() { - TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedPiping"); + RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorServiceManagedPiping"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorByok() { - TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorByok"); + RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorByok"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorByokInputObject() { - TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorByokInputObject"); + RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorByokInputObject"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorByokResourceId() { - TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorByokResourceId"); + RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorByokResourceId"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetGetManagedInstanceEncryptionProtectorByokPiping() { - TestRunner.RunTestScript("Test-SetGetManagedInstanceEncryptionProtectorByokPiping"); + RunPowerShellTest("Test-SetGetManagedInstanceEncryptionProtectorByokPiping"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/RecommendedActionTests.cs b/src/Sql/Sql.Test/ScenarioTests/RecommendedActionTests.cs index 875bed16ec0f..5d4b0cd4b3e1 100644 --- a/src/Sql/Sql.Test/ScenarioTests/RecommendedActionTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/RecommendedActionTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class RecommendedActionTests : SqlTestRunner + public class RecommendedActionTests : SqlTestsBase { public RecommendedActionTests(ITestOutputHelper output) : base(output) { @@ -31,21 +31,21 @@ public RecommendedActionTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListServerRecommendedActions() { - TestRunner.RunTestScript("Test-ListServerRecommendedActions"); + RunPowerShellTest("Test-ListServerRecommendedActions"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetServerRecommendedAction() { - TestRunner.RunTestScript("Test-GetServerRecommendedAction"); + RunPowerShellTest("Test-GetServerRecommendedAction"); } [Fact(Skip = "This action is not supported on backend. Verified with feature owners.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateServerRecommendedAction() { - TestRunner.RunTestScript("Test-UpdateServerRecommendedAction"); + RunPowerShellTest("Test-UpdateServerRecommendedAction"); } #endregion @@ -56,21 +56,21 @@ public void TestUpdateServerRecommendedAction() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListDatabaseRecommendedActions() { - TestRunner.RunTestScript("Test-ListDatabaseRecommendedActions"); + RunPowerShellTest("Test-ListDatabaseRecommendedActions"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetDatabaseRecommendedAction() { - TestRunner.RunTestScript("Test-GetDatabaseRecommendedAction"); + RunPowerShellTest("Test-GetDatabaseRecommendedAction"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateDatabaseRecommendedAction() { - TestRunner.RunTestScript("Test-UpdateDatabaseRecommendedAction"); + RunPowerShellTest("Test-UpdateDatabaseRecommendedAction"); } #endregion @@ -81,21 +81,21 @@ public void TestUpdateDatabaseRecommendedAction() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListElasticPoolRecommendedActions() { - TestRunner.RunTestScript("Test-ListElasticPoolRecommendedActions"); + RunPowerShellTest("Test-ListElasticPoolRecommendedActions"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetElasticPoolRecommendedAction() { - TestRunner.RunTestScript("Test-GetElasticPoolRecommendedAction"); + RunPowerShellTest("Test-GetElasticPoolRecommendedAction"); } [Fact(Skip = "This action is not supported on backend. Verified with feature owners.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateElasticPoolRecommendedAction() { - TestRunner.RunTestScript("Test-UpdateElasticPoolRecommendedAction"); + RunPowerShellTest("Test-UpdateElasticPoolRecommendedAction"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/RecommendedElasticPoolTests.cs b/src/Sql/Sql.Test/ScenarioTests/RecommendedElasticPoolTests.cs index 77e8f413a4c8..dca399542894 100644 --- a/src/Sql/Sql.Test/ScenarioTests/RecommendedElasticPoolTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/RecommendedElasticPoolTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class RecommendedElasticPoolTests : SqlTestRunner + public class RecommendedElasticPoolTests : SqlTestsBase { public RecommendedElasticPoolTests(ITestOutputHelper output) : base(output) { @@ -29,7 +29,7 @@ public RecommendedElasticPoolTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void ListRecommendedElasticPools() { - TestRunner.RunTestScript("Test-ElasticPoolRecommendation"); + RunPowerShellTest("Test-ElasticPoolRecommendation"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ServerActiveDirectoryAdministratorTest.cs b/src/Sql/Sql.Test/ScenarioTests/ServerActiveDirectoryAdministratorTest.cs index 0b30067e3199..c5b0b0ce7c4c 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerActiveDirectoryAdministratorTest.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerActiveDirectoryAdministratorTest.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServerActiveDirectoryAdministratorTest : SqlTestRunner + public class ServerActiveDirectoryAdministratorTest : SqlTestsBase { public ServerActiveDirectoryAdministratorTest(ITestOutputHelper output) : base(output) { @@ -29,7 +29,7 @@ public ServerActiveDirectoryAdministratorTest(ITestOutputHelper output) : base(o [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerActiveDirectoryAdministratorCRUD() { - TestRunner.RunTestScript("Test-ServerActiveDirectoryAdministrator"); + RunPowerShellTest("Test-ServerActiveDirectoryAdministrator"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs index e07d1f1bcd5f..31a6213c5a8d 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs @@ -19,31 +19,34 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServerCommunicationLinkCrudTests : SqlTestRunner + public class ServerCommunicationLinkCrudTests : SqlTestsBase { public ServerCommunicationLinkCrudTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerCommunicationLinkCreate() { - TestRunner.RunTestScript("Test-CreateServerCommunicationLink"); + RunPowerShellTest("Test-CreateServerCommunicationLink"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerCommunicationLinkGet() { - TestRunner.RunTestScript("Test-GetServerCommunicationLink"); + RunPowerShellTest("Test-GetServerCommunicationLink"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerCommunicationLinkRemove() { - TestRunner.RunTestScript("Test-RemoveServerCommunicationLink"); + RunPowerShellTest("Test-RemoveServerCommunicationLink"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ServerDisasterRecoveryConfigurationTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServerDisasterRecoveryConfigurationTests.cs index ac8334474c9a..2ee2820dd2d6 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerDisasterRecoveryConfigurationTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerDisasterRecoveryConfigurationTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServerDisasterRecoveryConfigurationTests : SqlTestRunner + public class ServerDisasterRecoveryConfigurationTests : SqlTestsBase { public ServerDisasterRecoveryConfigurationTests(ITestOutputHelper output) : base(output) { @@ -29,7 +29,7 @@ public ServerDisasterRecoveryConfigurationTests(ITestOutputHelper output) : base [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestServerDisasterRecoveryConfiguration() { - TestRunner.RunTestScript("Test-ServerDisasterRecoveryConfiguration"); + RunPowerShellTest("Test-ServerDisasterRecoveryConfiguration"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ServerKeyVaultKeyTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServerKeyVaultKeyTests.cs index 2090e4296753..8e7cb7a2b451 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServerKeyVaultKeyTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServerKeyVaultKeyTests.cs @@ -16,34 +16,50 @@ 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 ServerKeyVaultKeyTests : SqlTestRunner + public class ServerKeyVaultKeyTests : SqlTestsBase { + + + protected override void SetupManagementClients(RestTestFramework.MockContext context) + { + var sqlClient = GetSqlClient(context); + var newResourcesClient = GetResourcesClient(context); + var graphClient = GetGraphClient(context); + var networkClient = GetNetworkClient(context); + var keyVaultClient = GetKeyVaultClient(context); + Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient, graphClient, keyVaultClient); + } + public ServerKeyVaultKeyTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } [Fact(Skip = "Requires hardcoded resource 'akvtdekeyvaultcl'")] [Trait(Category.RunType, Category.LiveOnly)] public void TestServerKeyVaultKeyAdd() { - TestRunner.RunTestScript("Test-AddServerKeyVaultKey"); + RunPowerShellTest("Test-AddServerKeyVaultKey"); } [Fact(Skip = "Requires hardcoded resource 'akvtdekeyvaultcl'")] [Trait(Category.RunType, Category.LiveOnly)] public void TestServerKeyVaultKeyGet() { - TestRunner.RunTestScript("Test-GetServerKeyVaultKey"); + RunPowerShellTest("Test-GetServerKeyVaultKey"); } [Fact(Skip = "TODO: only works for live mode. Mihymel will fix the test issue for Create-ServerKeyVaultKeyTestEnvironment")] [Trait(Category.RunType, Category.LiveOnly)] public void TestServerKeyVaultKeyRemove() { - TestRunner.RunTestScript("Test-RemoveServerKeyVaultKey"); + RunPowerShellTest("Test-RemoveServerKeyVaultKey"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ServiceTierAdvisorTests.cs b/src/Sql/Sql.Test/ScenarioTests/ServiceTierAdvisorTests.cs index f0f38a488f71..68c1e650fc5c 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ServiceTierAdvisorTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ServiceTierAdvisorTests.cs @@ -19,24 +19,27 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests { - public class ServiceTierAdvisorTests : SqlTestRunner + public class ServiceTierAdvisorTests : SqlTestsBase { public ServiceTierAdvisorTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void GetUpgradeDatabaseHint() { - TestRunner.RunTestScript("Test-GetUpgradeDatabaseHint"); + RunPowerShellTest("Test-GetUpgradeDatabaseHint"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void GetUpgradeServerHint() { - TestRunner.RunTestScript("Test-GetUpgradeServerHint"); + RunPowerShellTest("Test-GetUpgradeServerHint"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/SqlTestsBase.cs b/src/Sql/Sql.Test/ScenarioTests/SqlTestsBase.cs new file mode 100644 index 000000000000..646540d2237f --- /dev/null +++ b/src/Sql/Sql.Test/ScenarioTests/SqlTestsBase.cs @@ -0,0 +1,199 @@ +// ---------------------------------------------------------------------------------- +// +// 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.Commands.Common.Authentication; +using Microsoft.Azure.Management.Network; +using Microsoft.Azure.Test.HttpRecorder; +using Microsoft.WindowsAzure.Commands.ScenarioTest; +using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; +using System; +using System.IO; +using System.Collections.Generic; +using System.Diagnostics; +using Microsoft.Azure.Management.Internal.Resources; +using Microsoft.Azure.Management.Sql; +using CommonStorage = Microsoft.Azure.Management.Storage.Version2017_10_01; +using Microsoft.Azure.ServiceManagement.Common.Models; +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; + +namespace Microsoft.Azure.Commands.ScenarioTest.SqlTests +{ + public class SqlTestsBase : RMTestBase, IDisposable + { + protected EnvironmentSetupHelper Helper; + protected string[] resourceTypesToIgnoreApiVersion; + private const string TenantIdKey = "TenantId"; + + protected SqlTestsBase(ITestOutputHelper output) + { + Helper = new EnvironmentSetupHelper(); + + var tracer = new XunitTracingInterceptor(output); + XunitTracingInterceptor.AddToContext(tracer); + Helper.TracingInterceptor = tracer; + } + + protected virtual void SetupManagementClients(MockContext context) + { + var sqlClient = GetSqlClient(context); + var newResourcesClient = GetResourcesClient(context); + Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient); + } + + protected void RunPowerShellTest(params string[] scripts) + { + TestExecutionHelpers.SetUpSessionAndProfile(); + var sf = new StackTrace().GetFrame(1); + var callingClassType = sf.GetMethod().ReflectedType?.ToString(); + var mockName = sf.GetMethod().Name; + + var d = 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} + }; + + var providersToIgnore = new Dictionary + { + {"Microsoft.Azure.Graph.RBAC.Version1_6.GraphRbacManagementClient", "1.42-previewInternal"}, + {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"} + }; + HttpMockServer.Matcher = new PermissiveRecordMatcherWithResourceApiExclusion(true, d, providersToIgnore, resourceTypesToIgnoreApiVersion); + HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords"); + + // Enable undo functionality as well as mock recording + using (var context = MockContext.Start(callingClassType, mockName)) + { + Helper.SetupEnvironment(AzureModule.AzureResourceManager); + SetupManagementClients(context); + Helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + GetType().Name + ".ps1", + Helper.RMProfileModule, + Helper.GetRMModulePath(@"AzureRM.Sql.psd1"), + Helper.RMNetworkModule, + "AzureRM.Storage.ps1", + "AzureRM.Resources.ps1", + Helper.RMOperationalInsightsModule, + Helper.RMEventHubModule, + Helper.RMMonitorModule, + Helper.RMKeyVaultModule); + Helper.RunPowerShellTest(scripts); + } + } + + 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()); + } + + public void Dispose() + { + XunitTracingInterceptor.RemoveFromContext(Helper.TracingInterceptor); + Helper.TracingInterceptor = null; + Helper = null; + } + } +} diff --git a/src/Sql/Sql.Test/ScenarioTests/TDECertificateTests.cs b/src/Sql/Sql.Test/ScenarioTests/TDECertificateTests.cs index d0444aaadab1..6cbebaf7a1b5 100644 --- a/src/Sql/Sql.Test/ScenarioTests/TDECertificateTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/TDECertificateTests.cs @@ -13,79 +13,83 @@ // ---------------------------------------------------------------------------------- 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 TDECertificateTests : SqlTestRunner + public class TDECertificateTests : SqlTestsBase { public TDECertificateTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerDefaultParameterSetNoPassword() { - TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerDefaultParameterSetNoPassword"); + RunPowerShellTest("Test-AddTdeCertificateForSqlServerDefaultParameterSetNoPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerDefaultParameterSetWithPassword() { - TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerDefaultParameterSetWithPassword"); + RunPowerShellTest("Test-AddTdeCertificateForSqlServerDefaultParameterSetWithPassword"); } [Fact(Skip = "Skip due to long setup time for managed instance")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForManagedInstanceDefaultParameterSetNoPassword() { - TestRunner.RunTestScript("Test-AddTdeCertificateForManagedInstanceDefaultParameterSetNoPassword"); + RunPowerShellTest("Test-AddTdeCertificateForManagedInstanceDefaultParameterSetNoPassword"); } [Fact(Skip = "Skip due to long setup time for managed instance")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForManagedInstanceDefaultParameterSetWithPassword() { - TestRunner.RunTestScript("Test-AddTdeCertificateForManagedInstanceDefaultParameterSetWithPassword"); + RunPowerShellTest("Test-AddTdeCertificateForManagedInstanceDefaultParameterSetWithPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerInputObjectParameterSetWithPassword() { - TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerInputObjectParameterSetWithPassword"); + RunPowerShellTest("Test-AddTdeCertificateForSqlServerInputObjectParameterSetWithPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerResourceIdParameterSetWithPassword() { - TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerResourceIdParameterSetWithPassword"); + RunPowerShellTest("Test-AddTdeCertificateForSqlServerResourceIdParameterSetWithPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerInputObjectParameterSetNoPassword() { - TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerInputObjectParameterSetNoPassword"); + RunPowerShellTest("Test-AddTdeCertificateForSqlServerInputObjectParameterSetNoPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerResourceIdParameterSetNoPassword() { - TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerResourceIdParameterSetNoPassword"); + RunPowerShellTest("Test-AddTdeCertificateForSqlServerResourceIdParameterSetNoPassword"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAddTdeCertificateForSqlServerWithPiping() { - TestRunner.RunTestScript("Test-AddTdeCertificateForSqlServerWithPiping"); + RunPowerShellTest("Test-AddTdeCertificateForSqlServerWithPiping"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs index a12b6bc1c971..5caecb728c19 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs @@ -16,11 +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 ThreatDetectionClassicStorageTests : SqlTestRunner + public class ThreatDetectionClassicStorageTests : SqlTestsBase { + 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 ThreatDetectionClassicStorageTests(ITestOutputHelper output) : base(output) { } @@ -31,7 +40,7 @@ public ThreatDetectionClassicStorageTests(ITestOutputHelper output) : base(outpu // See issue https://github.com/Azure/azure-powershell/issues/6601 public void ThreatDetectionUpdatePolicyWithClassicStorage() { - TestRunner.RunTestScript("Test-ThreatDetectionUpdatePolicyWithClassicStorage"); + RunPowerShellTest("Test-ThreatDetectionUpdatePolicyWithClassicStorage"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs index ed4318dfae46..e5b06acff212 100644 --- a/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/ThreatDetectionTests.cs @@ -16,48 +16,60 @@ 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 ThreatDetectionTests : SqlTestRunner + public class ThreatDetectionTests : SqlTestsBase { + 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 ThreatDetectionTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers" + }; } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void ThreatDetectionGetDefaultPolicy() { - TestRunner.RunTestScript("Test-ThreatDetectionGetDefaultPolicy"); + RunPowerShellTest("Test-ThreatDetectionGetDefaultPolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void ThreatDetectionDatabaseUpdatePolicy() { - TestRunner.RunTestScript("Test-ThreatDetectionDatabaseUpdatePolicy"); + RunPowerShellTest("Test-ThreatDetectionDatabaseUpdatePolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void ThreatDetectionServerUpdatePolicy() { - TestRunner.RunTestScript("Test-ThreatDetectionServerUpdatePolicy"); + RunPowerShellTest("Test-ThreatDetectionServerUpdatePolicy"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void DisablingThreatDetection() { - TestRunner.RunTestScript("Test-DisablingThreatDetection"); + RunPowerShellTest("Test-DisablingThreatDetection"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void InvalidArgumentsThreatDetection() { - TestRunner.RunTestScript("Test-InvalidArgumentsThreatDetection"); + RunPowerShellTest("Test-InvalidArgumentsThreatDetection"); } } } diff --git a/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentMiTests.cs b/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentMiTests.cs index 57160034907e..fcd116159640 100644 --- a/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentMiTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentMiTests.cs @@ -16,13 +16,27 @@ 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 VulnerabilityAssessmentMiTests : SqlTestRunner + public class VulnerabilityAssessmentMiTests : SqlTestsBase { + protected override void SetupManagementClients(RestTestFramework.MockContext context) + { + var sqlClient = GetSqlClient(context); + var storageV2Client = GetStorageManagementClient(context); + var newResourcesClient = GetResourcesClient(context); + var networkClient = GetNetworkClient(context); + Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient, networkClient); + } + public VulnerabilityAssessmentMiTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/managedInstances", + "Microsoft.Sql/managedInstances/databases" + }; } #region Managed Instance Policy Tests @@ -31,7 +45,7 @@ public VulnerabilityAssessmentMiTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedInstanceSettingsTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedInstanceSettingsTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentManagedInstanceSettingsTest"); } #endregion @@ -42,14 +56,14 @@ public void VulnerabilityAssessmentManagedInstanceSettingsTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedDatabaseWithSettingsNotDefinedTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedDatabaseWithSettingsNotDefinedTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentManagedDatabaseWithSettingsNotDefinedTest"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedDatabaseSettingsTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedDatabaseSettingsTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentManagedDatabaseSettingsTest"); } #endregion @@ -60,7 +74,7 @@ public void VulnerabilityAssessmentManagedDatabaseSettingsTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedDatabaseBaselineTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedDatabaseBaselineTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentManagedDatabaseBaselineTest"); } #endregion @@ -71,14 +85,14 @@ public void VulnerabilityAssessmentManagedDatabaseBaselineTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedDatabaseScanRecordGetListTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedDatabaseScanRecordGetListTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentManagedDatabaseScanRecordGetListTest"); } [Fact(Skip = "Requires manual set up.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentManagedDatabaseScanConvertTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentManagedDatabaseScanConvertTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentManagedDatabaseScanConvertTest"); } #endregion diff --git a/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs b/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs index d3961e176cfb..798bada0aa63 100644 --- a/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs +++ b/src/Sql/Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.cs @@ -16,13 +16,27 @@ 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 VulnerabilityAssessmentTests : SqlTestRunner + public class VulnerabilityAssessmentTests : SqlTestsBase { + 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 VulnerabilityAssessmentTests(ITestOutputHelper output) : base(output) { + base.resourceTypesToIgnoreApiVersion = new string[] { + "Microsoft.Sql/servers", + "Microsoft.Sql/managedInstances", + "Microsoft.Sql/managedInstances/databases" + }; } #region Server Policy Tests @@ -31,7 +45,7 @@ public VulnerabilityAssessmentTests(ITestOutputHelper output) : base(output) [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentServerSettingsTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentServerSettingsTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentServerSettingsTest"); } #endregion @@ -42,14 +56,14 @@ public void VulnerabilityAssessmentServerSettingsTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentWithSettingsNotDefinedTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentWithSettingsNotDefinedTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentWithSettingsNotDefinedTest"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentSettingsTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentSettingsTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentSettingsTest"); } #endregion @@ -60,7 +74,7 @@ public void VulnerabilityAssessmentSettingsTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentBaselineTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentBaselineTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentBaselineTest"); } #endregion @@ -71,14 +85,14 @@ public void VulnerabilityAssessmentBaselineTest() [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentScanRecordGetListTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentScanRecordGetListTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentScanRecordGetListTest"); } [Fact(Skip = "Cannot re-record.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void VulnerabilityAssessmentScanConvertTest() { - TestRunner.RunTestScript("Test-VulnerabilityAssessmentScanConvertTest"); + RunPowerShellTest("Test-VulnerabilityAssessmentScanConvertTest"); } #endregion From 2bb305c28018ee77e60482487dda8c758ac4a6c6 Mon Sep 17 00:00:00 2001 From: Ziyue Zheng Date: Tue, 7 Jun 2022 18:25:29 +0800 Subject: [PATCH 4/4] Update SqlTestRunner.cs --- src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs b/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs index a34b245f8ad9..45f1297fc3d5 100644 --- a/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs +++ b/src/Sql/Sql.Test/ScenarioTests/SqlTestRunner.cs @@ -60,7 +60,6 @@ protected SqlTestRunner(ITestOutputHelper output) .WithNewRmModules(helper => new[] { helper.RMProfileModule, - helper.RMStorageModule, helper.GetRMModulePath("Az.Sql.psd1"), helper.RMNetworkModule, helper.RMOperationalInsightsModule,