diff --git a/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerController.cs b/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerController.cs deleted file mode 100644 index b8d104e7424b..000000000000 --- a/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerController.cs +++ /dev/null @@ -1,147 +0,0 @@ -// ---------------------------------------------------------------------------------- -// -// 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.Test.HttpRecorder; -using Microsoft.Rest.ClientRuntime.Azure.TestFramework; -using Microsoft.WindowsAzure.Commands.ScenarioTest; -using System; -using System.IO; -using System.Linq; -using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory; -using Microsoft.Azure.Management.Storage.Version2017_10_01; -using System.Collections.Generic; -using System.Diagnostics; -using Microsoft.Azure.ServiceManagement.Common.Models; -using Microsoft.Azure.Management.DeploymentManager; -using Microsoft.Azure.Management.ManagedServiceIdentity; -using Microsoft.Azure.Graph.RBAC; -using Microsoft.Azure.Management.Authorization; -using Microsoft.Azure.Management.ResourceManager; - -namespace Microsoft.Azure.Commands.DeploymentManager.Test.ScenarioTests -{ - public class DeploymentManagerController - { - private readonly EnvironmentSetupHelper _helper; - - public ResourceManagementClient ResourceManagementClient { get; private set; } - - public AzureDeploymentManagerClient DeploymentManagerClient { get; private set; } - - public StorageManagementClient StorageClient { get; private set; } - - public ManagedServiceIdentityClient ManagedServiceIdentityClient { get; private set; } - - public GraphRbacManagementClient GraphManagementClient { get; private set; } - - public AuthorizationManagementClient AuthorizationManagementClient { get; private set; } - - public DeploymentManagerController() - { - _helper = new EnvironmentSetupHelper(); - } - - public static DeploymentManagerController NewInstance => new DeploymentManagerController(); - - private void SetupManagementClients(MockContext context) - { - DeploymentManagerClient = GetDeploymentManagementClient(context); - ResourceManagementClient = GetResourceManagementClient(context); - StorageClient = GetStorageManagementClient(context); - ManagedServiceIdentityClient = GetManagedServiceIdentityClient(context); - GraphManagementClient = GetGraphManagementClient(context); - AuthorizationManagementClient = GetAuthorizationManagementClient(context); - - _helper.SetupManagementClients( - DeploymentManagerClient, - StorageClient, - ResourceManagementClient, - ManagedServiceIdentityClient, - GraphManagementClient, - AuthorizationManagementClient); - } - - public void RunPowerShellTest(XunitTracingInterceptor logger, params string[] scripts) - { - var sf = new StackTrace().GetFrame(1); - var callingClassType = sf.GetMethod().ReflectedType?.ToString(); - var mockName = sf.GetMethod().Name; - - _helper.TracingInterceptor = logger; - - var d = new Dictionary - { - {"Microsoft.Resources", null}, - {"Microsoft.Features", null}, - {"Microsoft.Authorization", null} - }; - var providersToIgnore = new Dictionary(); - HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore); - - HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords"); - using (var context = MockContext.Start(callingClassType, mockName)) - { - SetupManagementClients(context); - - var callingClassName = callingClassType?.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries).Last(); - _helper.SetupEnvironment(AzureModule.AzureResourceManager); - _helper.SetupModules(AzureModule.AzureResourceManager, - "ScenarioTests\\DeploymentManagerTestsCommon.ps1", - "ScenarioTests\\" + callingClassName + ".ps1", - _helper.RMProfileModule, - "AzureRM.Storage.ps1", - _helper.GetRMModulePath(@"Az.ManagedServiceIdentity.psd1"), - _helper.GetRMModulePath(@"Az.Storage.psd1"), - _helper.GetRMModulePath(@"Az.Resources.psd1"), - _helper.GetRMModulePath(@"Az.DeploymentManager.psd1")); - - if (scripts != null) - { - _helper.RunPowerShellTest(scripts); - } - } - } - - private static AuthorizationManagementClient GetAuthorizationManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static GraphRbacManagementClient GetGraphManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static ManagedServiceIdentityClient GetManagedServiceIdentityClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static StorageManagementClient GetStorageManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static AzureDeploymentManagerClient GetDeploymentManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static ResourceManagementClient GetResourceManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - } -} diff --git a/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTestRunner.cs b/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTestRunner.cs new file mode 100644 index 000000000000..8ba231f589d1 --- /dev/null +++ b/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTestRunner.cs @@ -0,0 +1,55 @@ +// ---------------------------------------------------------------------------------- +// +// 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 System.Collections.Generic; +using Xunit.Abstractions; +using Microsoft.Azure.Commands.TestFx; + +namespace Microsoft.Azure.Commands.DeploymentManager.Test.ScenarioTests +{ + public class DeploymentManagerTestRunner + { + protected readonly ITestRunner TestRunner; + + protected DeploymentManagerTestRunner(ITestOutputHelper output) + { + TestRunner = TestManager.CreateInstance(output) + .WithNewPsScriptFilename($"{GetType().Name}.ps1") + .WithProjectSubfolderForTests("ScenarioTests") + .WithCommonPsScripts(new[] + { + @"DeploymentManagerTestsCommon.ps1", + @"../AzureRM.Storage.ps1" + }) + .WithNewRmModules(helper => new[] + { + helper.RMProfileModule, + helper.GetRMModulePath(@"Az.ManagedServiceIdentity.psd1"), + helper.GetRMModulePath(@"Az.Storage.psd1"), + helper.GetRMModulePath(@"Az.Resources.psd1"), + helper.GetRMModulePath(@"Az.DeploymentManager.psd1") + }) + .WithNewRecordMatcherArguments( + userAgentsToIgnore: new Dictionary(), + resourceProviders: new Dictionary + { + {"Microsoft.Resources", null}, + {"Microsoft.Features", null}, + {"Microsoft.Authorization", null} + } + ) + .Build(); + } + } +} diff --git a/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTests.cs b/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTests.cs index c686812bfe0d..23ea7d62ffe9 100644 --- a/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTests.cs +++ b/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTests.cs @@ -14,27 +14,21 @@ namespace Microsoft.Azure.Commands.DeploymentManager.Test.ScenarioTests { - using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; - using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; using Xunit.Abstractions; - public class DeploymentManagerTests : RMTestBase + public class DeploymentManagerTests : DeploymentManagerTestRunner { - public XunitTracingInterceptor _logger; - - public DeploymentManagerTests(ITestOutputHelper output) + public DeploymentManagerTests(ITestOutputHelper output) : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void EndToEndFunctionalTests() { - DeploymentManagerController.NewInstance.RunPowerShellTest(_logger, "Test-EndToEndFunctionalTests"); + TestRunner.RunTestScript("Test-EndToEndFunctionalTests"); } } }