From f03530ca949f53366ec31b22ec590d78ef28f106 Mon Sep 17 00:00:00 2001 From: Yufan Yang <95342181+CaptainFanZzz@users.noreply.github.com> Date: Wed, 18 May 2022 13:36:26 +0800 Subject: [PATCH] Add PrivateDnsTestRunner and replace TestBase (#18202) --- .../ScenarioTests/LinkTests.cs | 47 +++--- .../ScenarioTests/PrivateDnsTestRunner.cs | 57 +++++++ .../ScenarioTests/PrivateDnsTestsBase.cs | 142 ------------------ .../ScenarioTests/RecordsTests.cs | 71 ++++----- .../ScenarioTests/ZoneTests.cs | 37 ++--- 5 files changed, 127 insertions(+), 227 deletions(-) create mode 100644 src/PrivateDns/PrivateDns.Test/ScenarioTests/PrivateDnsTestRunner.cs delete mode 100644 src/PrivateDns/PrivateDns.Test/ScenarioTests/PrivateDnsTestsBase.cs diff --git a/src/PrivateDns/PrivateDns.Test/ScenarioTests/LinkTests.cs b/src/PrivateDns/PrivateDns.Test/ScenarioTests/LinkTests.cs index ee745ec5a276..adefbc982986 100644 --- a/src/PrivateDns/PrivateDns.Test/ScenarioTests/LinkTests.cs +++ b/src/PrivateDns/PrivateDns.Test/ScenarioTests/LinkTests.cs @@ -12,151 +12,146 @@ namespace Microsoft.Azure.Commands.PrivateDns.Test.ScenarioTests { - using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; - public class LinkTests : PrivateDnsTestsBase + public class LinkTests : PrivateDnsTestRunner { - public XunitTracingInterceptor Logger; - - public LinkTests(Xunit.Abstractions.ITestOutputHelper output) + public LinkTests(Xunit.Abstractions.ITestOutputHelper output) : base(output) { - Logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(Logger); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestLinkCrud() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-LinkCrud"); + TestRunner.RunTestScript("Test-LinkCrud"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestLinkCrudWithPiping() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-LinkCrudWithPiping"); + TestRunner.RunTestScript("Test-LinkCrudWithPiping"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRegistrationLinkCreate() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-RegistrationLinkCreate"); + TestRunner.RunTestScript("Test-RegistrationLinkCreate"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestLinkAlreadyExistsCreateThrow() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-LinkAlreadyExistsCreateThrow"); + TestRunner.RunTestScript("Test-LinkAlreadyExistsCreateThrow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateLinkWithVirtualNetworkObject() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-CreateLinkWithVirtualNetworkObject"); + TestRunner.RunTestScript("Test-CreateLinkWithVirtualNetworkObject"); } [Fact(Skip = "Test framework doesn't support using tokens for multiple tenants at the moment.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestCreateLinkWithRemoteVirtualId() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-CreateLinkWithRemoteVirtualId"); + TestRunner.RunTestScript("Test-CreateLinkWithRemoteVirtualId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateLinkRegistrationStatusWithPiping() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-UpdateLinkRegistrationStatusWithPiping"); + TestRunner.RunTestScript("Test-UpdateLinkRegistrationStatusWithPiping"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateLinkRegistrationStatusWithPipingResourceId() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-UpdateLinkRegistrationStatusWithResourceId"); + TestRunner.RunTestScript("Test-UpdateLinkRegistrationStatusWithResourceId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateLinkWithEtagMismatchThrow() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-UpdateLinkWithEtagMismatchThrow"); + TestRunner.RunTestScript("Test-UpdateLinkWithEtagMismatchThrow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDeleteLinkWithResourceId() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-DeleteLinkWithResourceId"); + TestRunner.RunTestScript("Test-DeleteLinkWithResourceId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateLinkWithEtagMismatchOverwrite() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-UpdateLinkWithEtagMismatchOverwrite"); + TestRunner.RunTestScript("Test-UpdateLinkWithEtagMismatchOverwrite"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateLinkZoneNotExistsThrow() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-UpdateLinkZoneNotExistsThrow"); + TestRunner.RunTestScript("Test-UpdateLinkZoneNotExistsThrow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateLinkLinkNotExistsThrow() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-UpdateLinkLinkNotExistsThrow"); + TestRunner.RunTestScript("Test-UpdateLinkLinkNotExistsThrow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestUpdateLinkWithNoChangesShouldNotThrow() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-UpdateLinkWithNoChangesShouldNotThrow"); + TestRunner.RunTestScript("Test-UpdateLinkWithNoChangesShouldNotThrow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetLinkZoneNotExistsThrow() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-GetLinkZoneNotExistsThrow"); + TestRunner.RunTestScript("Test-GetLinkZoneNotExistsThrow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestGetLinkLinkNotExistsThrow() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-GetLinkLinkNotExistsThrow"); + TestRunner.RunTestScript("Test-GetLinkLinkNotExistsThrow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveLinkZoneNotExistsShouldNotThrow() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-RemoveLinkZoneNotExistsShouldNotThrow"); + TestRunner.RunTestScript("Test-RemoveLinkZoneNotExistsShouldNotThrow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRemoveLinkLinkNotExistsShouldNotThrow() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-RemoveLinkLinkNotExistsShouldNotThrow"); + TestRunner.RunTestScript("Test-RemoveLinkLinkNotExistsShouldNotThrow"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestListLinks() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(Logger, "Test-ListLinks"); + TestRunner.RunTestScript("Test-ListLinks"); } } } diff --git a/src/PrivateDns/PrivateDns.Test/ScenarioTests/PrivateDnsTestRunner.cs b/src/PrivateDns/PrivateDns.Test/ScenarioTests/PrivateDnsTestRunner.cs new file mode 100644 index 000000000000..1df27ec0d9cb --- /dev/null +++ b/src/PrivateDns/PrivateDns.Test/ScenarioTests/PrivateDnsTestRunner.cs @@ -0,0 +1,57 @@ +// ---------------------------------------------------------------------------------- +// +// 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.PrivateDns.Test.ScenarioTests +{ + public class PrivateDnsTestRunner + { + protected readonly ITestRunner TestRunner; + + protected PrivateDnsTestRunner(ITestOutputHelper output) + { + TestRunner = TestManager.CreateInstance(output) + .WithNewPsScriptFilename($"{GetType().Name}.ps1") + .WithProjectSubfolderForTests("ScenarioTests") + .WithCommonPsScripts(new[] + { + @"Common.ps1", + @"../AzureRM.Resources.ps1" + }) + .WithNewRmModules(helper => new[] + { + helper.RMProfileModule, + helper.GetRMModulePath("Az.PrivateDns.psd1"), + helper.GetRMModulePath("Az.Network.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.Network", null} + } + ) + .Build(); + } + } +} \ No newline at end of file diff --git a/src/PrivateDns/PrivateDns.Test/ScenarioTests/PrivateDnsTestsBase.cs b/src/PrivateDns/PrivateDns.Test/ScenarioTests/PrivateDnsTestsBase.cs deleted file mode 100644 index 0f98e842111b..000000000000 --- a/src/PrivateDns/PrivateDns.Test/ScenarioTests/PrivateDnsTestsBase.cs +++ /dev/null @@ -1,142 +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. -// ---------------------------------------------------------------------------------- - -namespace Microsoft.Azure.Commands.PrivateDns.Test.ScenarioTests -{ - 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.PrivateDns; - using Microsoft.Azure.Management.Internal.Resources; - using Microsoft.Azure.Management.Network; - using Microsoft.Azure.ServiceManagement.Common.Models; - 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; - - public class PrivateDnsTestsBase : RMTestBase - { - private readonly EnvironmentSetupHelper _helper; - - public ResourceManagementClient ResourceManagementClient { get; private set; } - - public PrivateDnsManagementClient PrivateDnsClient { get; private set; } - - public NetworkManagementClient NetworkManagementClient { get; private set; } - - public static PrivateDnsTestsBase NewInstance => new PrivateDnsTestsBase(); - - protected PrivateDnsTestsBase() - { - _helper = new EnvironmentSetupHelper(); - } - - protected void SetupManagementClients(MockContext context) - { - ResourceManagementClient = GetResourceManagementClient(context); - PrivateDnsClient = GetFeatureClient(context); - NetworkManagementClient = GetNetworkManagementClient(context); - - _helper.SetupManagementClients( - ResourceManagementClient, - PrivateDnsClient, - NetworkManagementClient); - } - - - 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; - - RunPsTestWorkflow( - () => scripts, - // no custom cleanup - null, - callingClassType, - mockName); - } - - - public void RunPsTestWorkflow( - Func scriptBuilder, - Action cleanup, - string callingClassType, - string mockName) - { - var d = new Dictionary - { - {"Microsoft.Resources", null}, {"Microsoft.Features", null}, {"Microsoft.Authorization", null}, {"Microsoft.Network", 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); - - _helper.SetupEnvironment(AzureModule.AzureResourceManager); - - var callingClassName = callingClassType.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries).Last(); - - _helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\Common.ps1", "ScenarioTests\\" + callingClassName + ".ps1", - _helper.RMProfileModule, - _helper.GetRMModulePath("AzureRM.PrivateDns.psd1"), - _helper.GetRMModulePath("AzureRM.Network.psd1"), - "AzureRM.Resources.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()); - } - - protected NetworkManagementClient GetNetworkManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static PrivateDnsManagementClient GetFeatureClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - } -} diff --git a/src/PrivateDns/PrivateDns.Test/ScenarioTests/RecordsTests.cs b/src/PrivateDns/PrivateDns.Test/ScenarioTests/RecordsTests.cs index a5e5a5cbb94b..eaec47c8a8fe 100644 --- a/src/PrivateDns/PrivateDns.Test/ScenarioTests/RecordsTests.cs +++ b/src/PrivateDns/PrivateDns.Test/ScenarioTests/RecordsTests.cs @@ -14,137 +14,132 @@ namespace Microsoft.Azure.Commands.PrivateDns.Test.ScenarioTests { - using ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; - public class RecordsTests : PrivateDnsTestsBase + public class RecordsTests : PrivateDnsTestRunner { - public XunitTracingInterceptor _logger; - - public RecordsTests(Xunit.Abstractions.ITestOutputHelper output) + public RecordsTests(Xunit.Abstractions.ITestOutputHelper output) : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetCrud() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetCrud"); + TestRunner.RunTestScript("Test-RecordSetCrud"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetCrudTrimsDotFromZoneName() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetCrudTrimsDotFromZoneName"); + TestRunner.RunTestScript("Test-RecordSetCrudTrimsDotFromZoneName"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetCrudWithZoneResourceId() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetCrudWithZoneResourceId"); + TestRunner.RunTestScript("Test-RecordSetCrudWithZoneResourceId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetCrudWithPiping() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetCrudWithPiping"); + TestRunner.RunTestScript("Test-RecordSetCrudWithPiping"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetCrudWithPipingTrimsDotFromZoneName() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetCrudWithPipingTrimsDotFromZoneName"); + TestRunner.RunTestScript("Test-RecordSetCrudWithPipingTrimsDotFromZoneName"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetA() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetA"); + TestRunner.RunTestScript("Test-RecordSetA"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetANonEmpty() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetANonEmpty"); + TestRunner.RunTestScript("Test-RecordSetANonEmpty"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetAAAA() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetAAAA"); + TestRunner.RunTestScript("Test-RecordSetAAAA"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetAAAANonEmpty() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetAAAANonEmpty"); + TestRunner.RunTestScript("Test-RecordSetAAAANonEmpty"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetCNAME() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetCNAME"); + TestRunner.RunTestScript("Test-RecordSetCNAME"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetCNAMENonEmpty() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetCNAMENonEmpty"); + TestRunner.RunTestScript("Test-RecordSetCNAMENonEmpty"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetMX() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetMX"); + TestRunner.RunTestScript("Test-RecordSetMX"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetMXNonEmpty() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetMXNonEmpty"); + TestRunner.RunTestScript("Test-RecordSetMXNonEmpty"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetTXT() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetTXT"); + TestRunner.RunTestScript("Test-RecordSetTXT"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetTXTNonEmpty() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetTXTNonEmpty"); + TestRunner.RunTestScript("Test-RecordSetTXTNonEmpty"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetTXTLengthValidation() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetTXTLengthValidation"); + TestRunner.RunTestScript("Test-RecordSetTXTLengthValidation"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetTXTLegacyLengthValidation() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetTXTLegacyLengthValidation"); + TestRunner.RunTestScript("Test-RecordSetTXTLegacyLengthValidation"); } @@ -152,97 +147,97 @@ public void TestRecordSetTXTLegacyLengthValidation() [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetSRV() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetSRV"); + TestRunner.RunTestScript("Test-RecordSetSRV"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetSRVNonEmpty() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetSRVNonEmpty"); + TestRunner.RunTestScript("Test-RecordSetSRVNonEmpty"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetSOA() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetSOA"); + TestRunner.RunTestScript("Test-RecordSetSOA"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetPTR() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetPTR"); + TestRunner.RunTestScript("Test-RecordSetPTR"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetPTRNonEmpty() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetPTRNonEmpty"); + TestRunner.RunTestScript("Test-RecordSetPTRNonEmpty"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetNewAlreadyExists() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetNewAlreadyExists"); + TestRunner.RunTestScript("Test-RecordSetNewAlreadyExists"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetAddRecordTypeMismatch() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetAddRecordTypeMismatch"); + TestRunner.RunTestScript("Test-RecordSetAddRecordTypeMismatch"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetAddTwoCnames() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetAddTwoCnames"); + TestRunner.RunTestScript("Test-RecordSetAddTwoCnames"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetRemoveRecordTypeMismatch() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetRemoveRecordTypeMismatch"); + TestRunner.RunTestScript("Test-RecordSetRemoveRecordTypeMismatch"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetRemoveUsingResourceId() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetRemoveUsingResourceId"); + TestRunner.RunTestScript("Test-RecordSetRemoveUsingResourceId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetEtagMismatch() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetEtagMismatch"); + TestRunner.RunTestScript("Test-RecordSetEtagMismatch"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetGet() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetGet"); + TestRunner.RunTestScript("Test-RecordSetGet"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetEndsWithZoneName() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetEndsWithZoneName"); + TestRunner.RunTestScript("Test-RecordSetEndsWithZoneName"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRecordSetNewRecordNoName() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-RecordSetNewRecordNoName"); + TestRunner.RunTestScript("Test-RecordSetNewRecordNoName"); } } } diff --git a/src/PrivateDns/PrivateDns.Test/ScenarioTests/ZoneTests.cs b/src/PrivateDns/PrivateDns.Test/ScenarioTests/ZoneTests.cs index f4a9dad6cc71..4492bfadbe4b 100644 --- a/src/PrivateDns/PrivateDns.Test/ScenarioTests/ZoneTests.cs +++ b/src/PrivateDns/PrivateDns.Test/ScenarioTests/ZoneTests.cs @@ -14,116 +14,111 @@ namespace Microsoft.Azure.Commands.PrivateDns.Test.ScenarioTests { - using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; - public class ZoneTests : PrivateDnsTestsBase + public class ZoneTests : PrivateDnsTestRunner { - public XunitTracingInterceptor _logger; - - public ZoneTests(Xunit.Abstractions.ITestOutputHelper output) + public ZoneTests(Xunit.Abstractions.ITestOutputHelper output) : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneCrud() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneCrud"); + TestRunner.RunTestScript("Test-ZoneCrud"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneCrudTrimsDot() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneCrudTrimsDot"); + TestRunner.RunTestScript("Test-ZoneCrudTrimsDot"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneCrudWithPiping() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneCrudWithPiping"); + TestRunner.RunTestScript("Test-ZoneCrudWithPiping"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneSetUsingResourceId() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneSetUsingResourceId"); + TestRunner.RunTestScript("Test-ZoneSetUsingResourceId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneRemoveUsingResourceId() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneRemoveUsingResourceId"); + TestRunner.RunTestScript("Test-ZoneRemoveUsingResourceId"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneCrudWithPipingTrimsDot() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneCrudWithPipingTrimsDot"); + TestRunner.RunTestScript("Test-ZoneCrudWithPipingTrimsDot"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneList() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneList"); + TestRunner.RunTestScript("Test-ZoneList"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneListSubscription() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneListSubscription"); + TestRunner.RunTestScript("Test-ZoneListSubscription"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneNewAlreadyExists() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneNewAlreadyExists"); + TestRunner.RunTestScript("Test-ZoneNewAlreadyExists"); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneNewWithLocalSuffix() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneNewWithLocalSuffix"); + TestRunner.RunTestScript("Test-ZoneNewWithLocalSuffix"); } [Fact()] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneSetEtagMismatch() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneSetEtagMismatch"); + TestRunner.RunTestScript("Test-ZoneSetEtagMismatch"); } [Fact()] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneSetNotFound() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneSetNotFound"); + TestRunner.RunTestScript("Test-ZoneSetNotFound"); } [Fact()] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneRemoveEtagMismatch() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneRemoveEtagMismatch"); + TestRunner.RunTestScript("Test-ZoneRemoveEtagMismatch"); } [Fact()] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestZoneRemoveNotFound() { - PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneRemoveNonExisting"); + TestRunner.RunTestScript("Test-ZoneRemoveNonExisting"); } } }