diff --git a/src/DevSpaces/DevSpaces.Test/ScenarioTests/DevSpacesTestRunner.cs b/src/DevSpaces/DevSpaces.Test/ScenarioTests/DevSpacesTestRunner.cs new file mode 100644 index 000000000000..e78ed3e50ec7 --- /dev/null +++ b/src/DevSpaces/DevSpaces.Test/ScenarioTests/DevSpacesTestRunner.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 Microsoft.Azure.Commands.TestFx; +using Xunit.Abstractions; + +namespace Microsoft.Azure.Commands.DevSpaces.Test.ScenarioTests +{ + public class DevSpacesTestRunner + { + protected readonly ITestRunner TestRunner; + + protected DevSpacesTestRunner(ITestOutputHelper output) + { + TestRunner = TestManager.CreateInstance(output) + .WithNewPsScriptFilename($"{GetType().Name}.ps1") + .WithProjectSubfolderForTests("ScenarioTests") + .WithCommonPsScripts(new[] + { + @"Common.ps1", + }) + .WithNewRmModules(helper => new[] + { + helper.RMProfileModule, + helper.RMResourceModule, + helper.GetRMModulePath(@"Az.DevSpaces.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} + } + ) + .Build(); + } + } +} diff --git a/src/DevSpaces/DevSpaces.Test/ScenarioTests/DevSpacesTests.cs b/src/DevSpaces/DevSpaces.Test/ScenarioTests/DevSpacesTests.cs index 1d9d653c0dd9..17a461ba6002 100644 --- a/src/DevSpaces/DevSpaces.Test/ScenarioTests/DevSpacesTests.cs +++ b/src/DevSpaces/DevSpaces.Test/ScenarioTests/DevSpacesTests.cs @@ -1,35 +1,40 @@ -using Microsoft.Azure.Commands.ScenarioTest; -using Microsoft.Azure.ServiceManagement.Common.Models; +// ---------------------------------------------------------------------------------- +// +// 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.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Azure.Commands.DevSpaces.Test.ScenarioTests { - public class DevSpacesTests : RMTestBase + public class DevSpacesTests : DevSpacesTestRunner { - public XunitTracingInterceptor _logger; - - public DevSpacesTests(Xunit.Abstractions.ITestOutputHelper output) + public DevSpacesTests(Xunit.Abstractions.ITestOutputHelper output) : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); - TestExecutionHelpers.SetUpSessionAndProfile(); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAzureDevSpaces() { - TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzureRmDevSpacesController"); + TestRunner.RunTestScript("Test-AzureRmDevSpacesController"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestAzureDevSpacesAsJobParameter() { - TestController.NewInstance.RunPowerShellTest(_logger, "Test-TestAzureDevSpacesAsJobParameter"); + TestRunner.RunTestScript("Test-TestAzureDevSpacesAsJobParameter"); } } } diff --git a/src/DevSpaces/DevSpaces.Test/ScenarioTests/TestController.cs b/src/DevSpaces/DevSpaces.Test/ScenarioTests/TestController.cs deleted file mode 100644 index f31eef83e104..000000000000 --- a/src/DevSpaces/DevSpaces.Test/ScenarioTests/TestController.cs +++ /dev/null @@ -1,95 +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.Aks.Generated.Version2017_08_31; -using Microsoft.Azure.Commands.Common.Authentication; -using Microsoft.Azure.Management.DevSpaces; -using Microsoft.Azure.ServiceManagement.Common.Models; -using Microsoft.Azure.Test.HttpRecorder; -using Microsoft.Rest.ClientRuntime.Azure.TestFramework; -using Microsoft.WindowsAzure.Commands.ScenarioTest; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using InternalResourceManagementClient = Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient; -using ResourceManagementClient = Microsoft.Azure.Management.ResourceManager.ResourceManagementClient; -using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory; - -namespace Microsoft.Azure.Commands.DevSpaces.Test.ScenarioTests -{ - public class TestController - { - private readonly EnvironmentSetupHelper _helper; - - public TestController() - { - _helper = new EnvironmentSetupHelper(); - } - - public static TestController NewInstance => new TestController(); - - private void SetupManagementClients(MockContext context) - { - _helper.SetupManagementClients( - context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()), - context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()), - context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()), - context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment())); - } - - 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 - { - {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"} - }; - 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\\" + callingClassName + ".ps1", - "ScenarioTests\\Common.ps1", - _helper.RMProfileModule, - _helper.RMResourceModule, - _helper.GetRMModulePath(@"AzureRM.DevSpaces.psd1")); - - if (scripts != null) - { - _helper.RunPowerShellTest(scripts); - } - } - } - - } -}