diff --git a/src/MarketplaceOrdering/MarketplaceOrdering.Test/ScenarioTests/AgreementsTests.cs b/src/MarketplaceOrdering/MarketplaceOrdering.Test/ScenarioTests/AgreementsTests.cs index b7caf10ec3eb..c4a92894a6af 100644 --- a/src/MarketplaceOrdering/MarketplaceOrdering.Test/ScenarioTests/AgreementsTests.cs +++ b/src/MarketplaceOrdering/MarketplaceOrdering.Test/ScenarioTests/AgreementsTests.cs @@ -12,56 +12,50 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.ScenarioTest; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; namespace Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests { - public class AgreementsTests + public class AgreementsTests : MarketplaceOrderingTestRunner { - private ServiceManagement.Common.Models.XunitTracingInterceptor _logger; - - public AgreementsTests(Xunit.Abstractions.ITestOutputHelper output) + public AgreementsTests(Xunit.Abstractions.ITestOutputHelper output) : base(output) { - _logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output); - ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger); - TestExecutionHelpers.SetUpSessionAndProfile(); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetAgreement() { - TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetAgreementTerms"); + TestRunner.RunTestScript("Test-GetAgreementTerms"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetAgreementNotAccepted() { - TestController.NewInstance.RunPowerShellTest(_logger, "Test-SetAgreementTermsNotAccepted"); + TestRunner.RunTestScript("Test-SetAgreementTermsNotAccepted"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetAgreementAccepted() { - TestController.NewInstance.RunPowerShellTest(_logger, "Test-SetAgreementTermsAccepted"); + TestRunner.RunTestScript("Test-SetAgreementTermsAccepted"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetAgreementAcceptedPipeline() { - TestController.NewInstance.RunPowerShellTest(_logger, "Test-SetAgreementTermsAcceptedPipelineGet"); + TestRunner.RunTestScript("Test-SetAgreementTermsAcceptedPipelineGet"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestSetAgreementRejectPipeline() { - TestController.NewInstance.RunPowerShellTest(_logger, "Test-SetAgreementTermsRejectedPipelineGet"); + TestRunner.RunTestScript("Test-SetAgreementTermsRejectedPipelineGet"); } } } diff --git a/src/MarketplaceOrdering/MarketplaceOrdering.Test/ScenarioTests/MarketplaceOrderingTestRunner.cs b/src/MarketplaceOrdering/MarketplaceOrdering.Test/ScenarioTests/MarketplaceOrderingTestRunner.cs new file mode 100644 index 000000000000..fd51f82630e1 --- /dev/null +++ b/src/MarketplaceOrdering/MarketplaceOrdering.Test/ScenarioTests/MarketplaceOrderingTestRunner.cs @@ -0,0 +1,51 @@ +// ---------------------------------------------------------------------------------- +// +// 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 Microsoft.Azure.Commands.TestFx; +using Xunit.Abstractions; + +namespace Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests +{ + public class MarketplaceOrderingTestRunner + { + protected readonly ITestRunner TestRunner; + + protected MarketplaceOrderingTestRunner(ITestOutputHelper output) + { + TestRunner = TestManager.CreateInstance(output) + .WithNewPsScriptFilename($"{GetType().Name}.ps1") + .WithProjectSubfolderForTests("ScenarioTests") + .WithNewRmModules(helper => new[] + { + helper.RMProfileModule, + helper.GetRMModulePath(@"Az.MarketplaceOrdering.psd1") + }) + .WithNewRecordMatcherArguments( + userAgentsToIgnore: new Dictionary + { + {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"} + }, + resourceProviders: new Dictionary + { + {"Microsoft.Resources", null}, + {"Microsoft.Features", null}, + {"Microsoft.Authorization", null}, + {"Microsoft.Compute", null} + } + ) + .Build(); + } + } +} \ No newline at end of file diff --git a/src/MarketplaceOrdering/MarketplaceOrdering.Test/ScenarioTests/TestController.cs b/src/MarketplaceOrdering/MarketplaceOrdering.Test/ScenarioTests/TestController.cs deleted file mode 100644 index a3a99afde98e..000000000000 --- a/src/MarketplaceOrdering/MarketplaceOrdering.Test/ScenarioTests/TestController.cs +++ /dev/null @@ -1,125 +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 System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using Microsoft.Azure.Commands.Common.Authentication; -using Microsoft.Azure.Management.Internal.Resources; -using Microsoft.Azure.Management.MarketplaceOrdering; -using Microsoft.Azure.Test.HttpRecorder; -using Microsoft.Rest.ClientRuntime.Azure.TestFramework; -using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; -using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory; - -namespace Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests -{ - public class TestController : RMTestBase - { - private readonly EnvironmentSetupHelper _helper; - - public ResourceManagementClient ResourceManagementClient { get; private set; } - - public MarketplaceOrderingAgreementsClient MarketplaceOrderingManagementClient { get; private set; } - - public static TestController NewInstance => new TestController(); - - protected TestController() - { - _helper = new EnvironmentSetupHelper(); - } - - protected void SetupManagementClients(MockContext context) - { - ResourceManagementClient = GetResourceManagementClient(context); - MarketplaceOrderingManagementClient = GetMarketplaceOrderingManagementClient(context); - _helper.SetupManagementClients(ResourceManagementClient, MarketplaceOrderingManagementClient); - } - - public void RunPowerShellTest(ServiceManagement.Common.Models.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; - RunPsTestWorkflow( - () => scripts, - // no custom cleanup - null, - callingClassType, - mockName); - } - - public void RunPsTestWorkflow( - Func scriptBuilder, - Action cleanup, - string callingClassType, - string mockName) - { - - var providers = new Dictionary - { - {"Microsoft.Resources", null}, - {"Microsoft.Features", null}, - {"Microsoft.Authorization", null}, - {"Microsoft.Compute", null} - }; - var providersToIgnore = new Dictionary - { - {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"} - }; - HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, providers, providersToIgnore); - HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords"); - - using (var context = MockContext.Start(callingClassType, mockName)) - { - SetupManagementClients(context); - - _helper.SetupEnvironment(AzureModule.AzureResourceManager); - - var callingClassName = callingClassType.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries).Last(); - _helper.SetupModules(AzureModule.AzureResourceManager, - _helper.RMProfileModule, - _helper.GetRMModulePath(@"AzureRM.MarketplaceOrdering.psd1"), - "ScenarioTests\\" + callingClassName + ".ps1"); - try - { - var psScripts = scriptBuilder?.Invoke(); - if (psScripts != null) - { - _helper.RunPowerShellTest(psScripts); - } - } - finally - { - cleanup?.Invoke(); - } - } - } - - protected ResourceManagementClient GetResourceManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static MarketplaceOrderingAgreementsClient GetMarketplaceOrderingManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - } -}