Add AdvisorTestRunner and replace TestController (#17961)

Ziyue Zheng · web-flow · commit bb4301a372cb · 2022-04-27T10:02:25.000+08:00
* Add AdvisorTestRunner and replace TestController

* Add AdvisorTestRunner.cs to replace TestController.cs

* Add license
diff --git a/src/Advisor/Advisor.Test/ScenarioTests/AdvisorTestRunner.cs b/src/Advisor/Advisor.Test/ScenarioTests/AdvisorTestRunner.cs
@@ -0,0 +1,54 @@
+﻿// ----------------------------------------------------------------------------------
+//
+// 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 Microsoft.Azure.Internal.Subscriptions;
+using Microsoft.Azure.Management.Advisor;
+using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
+using Xunit.Abstractions;
+
+namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests
+{
+    public class AdvisorTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected AdvisorTestRunner(ITestOutputHelper output)
+        {
+            TestRunner = TestManager.CreateInstance (output)
+                .WithNewPsScriptFilename ($"{GetType().Name}.ps1")
+                .WithProjectSubfolderForTests ("ScenarioTests")
+                .WithCommonPsScripts (new[]
+                {
+                    @"Common.ps1"
+                })
+                .WithNewRmModules (helper => new[]
+                {
+                    helper.RMProfileModule,
+                    helper.GetRMModulePath("Az.Advisor.psd1")
+                })
+                .WithNewRecordMatcherArguments (
+                    userAgentsToIgnore: new Dictionary<string, string>(),
+                    resourceProviders: new Dictionary<string, string>
+                    {
+                        {"Microsoft.Resources", null},
+                        {"Microsoft.Features", null},
+                        {"Microsoft.Authorization", null}
+                    }
+                )
+                .Build();
+        }
+    }
+}
diff --git a/src/Advisor/Advisor.Test/ScenarioTests/DisableAzAdvisorRecommendation.cs b/src/Advisor/Advisor.Test/ScenarioTests/DisableAzAdvisorRecommendation.cs
@@ -12,54 +12,44 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.ScenarioTest;
-using Microsoft.Azure.ServiceManagement.Common.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using Xunit;
-using Xunit.Abstractions;
 
 
 namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests
 {
-    public class DisableAzAdvisorRecommendation
+    public class DisableAzAdvisorRecommendation : AdvisorTestRunner
     {
-        private readonly XunitTracingInterceptor _logger;
-
-        public DisableAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output)
+        public DisableAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
-            TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
-
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void DisableAzAdvisorRecommendationBadUserInput()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Disable-AzAdvisorRecommendationBadUserInput-Negative");
+            TestRunner.RunTestScript("Disable-AzAdvisorRecommendationBadUserInput-Negative");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void DisableAzAdvisorRecommendationByNameParameter()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Disable-AzAdvisorRecommendationByNameParameter");
+            TestRunner.RunTestScript("Disable-AzAdvisorRecommendationByNameParameter");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void DisableAzAdvisorRecommendationByIdParameter()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Disable-AzAdvisorRecommendationByIdParameter");
+            TestRunner.RunTestScript("Disable-AzAdvisorRecommendationByIdParameter");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void DisableAzAdvisorRecommendationPipelineScenario()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Disable-AzAdvisorRecommendationPipelineScenario");
+            TestRunner.RunTestScript("Disable-AzAdvisorRecommendationPipelineScenario");
         }
     }
 }
diff --git a/src/Advisor/Advisor.Test/ScenarioTests/EnableAzAdvisorRecommendation.cs b/src/Advisor/Advisor.Test/ScenarioTests/EnableAzAdvisorRecommendation.cs
@@ -12,46 +12,37 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.ScenarioTest;
-using Microsoft.Azure.ServiceManagement.Common.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using Xunit;
-using Xunit.Abstractions;
 
 
 namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests
 {
-    public class EnableAzAdvisorRecommendation
+    public class EnableAzAdvisorRecommendation : AdvisorTestRunner
     {
-        private readonly XunitTracingInterceptor _logger;
-
-        public EnableAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output)
+        public EnableAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
-            TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void EnableAzAdvisorRecommendationByNameParameterSet()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Enable-AzAdvisorRecommendationByNameParameterSet");
+            TestRunner.RunTestScript("Enable-AzAdvisorRecommendationByNameParameterSet");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void EnableAzAdvisorRecommendationByIdParameterSet()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Enable-AzAdvisorRecommendationByIdParameterSet");
+            TestRunner.RunTestScript("Enable-AzAdvisorRecommendationByIdParameterSet");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void EnableAzAdvisorRecommendationPipeline()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Enable-AzAdvisorRecommendationPipeline");
+            TestRunner.RunTestScript("Enable-AzAdvisorRecommendationPipeline");
         }
     }
 }
diff --git a/src/Advisor/Advisor.Test/ScenarioTests/GetAzAdvisorConfiguration.cs b/src/Advisor/Advisor.Test/ScenarioTests/GetAzAdvisorConfiguration.cs
@@ -12,32 +12,23 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.ScenarioTest;
-using Microsoft.Azure.ServiceManagement.Common.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using Xunit;
-using Xunit.Abstractions;
 
 
 namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests
 {
-    public class GetAzAdvisorConfiguration
+    public class GetAzAdvisorConfiguration : AdvisorTestRunner
     {
-        private readonly XunitTracingInterceptor _logger;
-
-        public GetAzAdvisorConfiguration(Xunit.Abstractions.ITestOutputHelper output)
+        public GetAzAdvisorConfiguration(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
-            TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void GetConfigurationQuery()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzAdvisorConfigurationNoParameter");
+            TestRunner.RunTestScript("Get-AzAdvisorConfigurationNoParameter");
         }
     }
 }
diff --git a/src/Advisor/Advisor.Test/ScenarioTests/GetAzAdvisorRecommendation.cs b/src/Advisor/Advisor.Test/ScenarioTests/GetAzAdvisorRecommendation.cs
@@ -12,52 +12,43 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.ScenarioTest;
-using Microsoft.Azure.ServiceManagement.Common.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests
 {
-    public class GetAzAdvisorRecommendation
+    public class GetAzAdvisorRecommendation : AdvisorTestRunner
     {
-        private readonly XunitTracingInterceptor _logger;
-
-        public GetAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output)
+        public GetAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
-            TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void GetAzAdvisorRecommendationNoParameter()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzAdvisorRecommendationNoParameter");
+            TestRunner.RunTestScript("Get-AzAdvisorRecommendationNoParameter");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void GetAzAdvisorRecommendationByCategory()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzAdvisorRecommendationByCategory");
+            TestRunner.RunTestScript("Get-AzAdvisorRecommendationByCategory");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void GetAzAdvisorRecommendationByNameParameterSet()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzAdvisorRecommendationByNameParameterSet");
+            TestRunner.RunTestScript("Get-AzAdvisorRecommendationByNameParameterSet");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void GetAzAdvisorRecommendationByIdParameterSet()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzAdvisorRecommendationByIdParameterSet");
+            TestRunner.RunTestScript("Get-AzAdvisorRecommendationByIdParameterSet");
         }
     }
 }
diff --git a/src/Advisor/Advisor.Test/ScenarioTests/SetAzAdvisorConfiguration.cs b/src/Advisor/Advisor.Test/ScenarioTests/SetAzAdvisorConfiguration.cs
@@ -12,68 +12,59 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.ScenarioTest;
-using Microsoft.Azure.ServiceManagement.Common.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using Xunit;
-using Xunit.Abstractions;
 
 
 namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests
 {
-    public class SetAzAdvisorConfiguration
+    public class SetAzAdvisorConfiguration : AdvisorTestRunner
     {
-        private readonly XunitTracingInterceptor _logger;
-
-        public SetAzAdvisorConfiguration(Xunit.Abstractions.ITestOutputHelper output)
+        public SetAzAdvisorConfiguration(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
-            TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SetAzAdvisorConfigurationBadUserInputLowCpu()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationBadUserInputLowCpu-Negative");
+            TestRunner.RunTestScript("Set-AzAdvisorConfigurationBadUserInputLowCpu-Negative");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SetAzAdvisorConfigurationByLowCpu()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationWithLowCpu");
+            TestRunner.RunTestScript("Set-AzAdvisorConfigurationWithLowCpu");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SetAzAdvisorConfigurationByLowCpuExclude()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationByLowCpuExclude");
+            TestRunner.RunTestScript("Set-AzAdvisorConfigurationByLowCpuExclude");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SetAzAdvisorConfigurationPipelineByLowCpuExclude()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationPipelineByLowCpuExclude");
+            TestRunner.RunTestScript("Set-AzAdvisorConfigurationPipelineByLowCpuExclude");
         }
 
         // ResourceGroupParameterSets
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SetAzAdvisorConfigurationByRg()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationWithRg");
+            TestRunner.RunTestScript("Set-AzAdvisorConfigurationWithRg");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SetAzAdvisorConfigurationByRgExclude()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationByRgExclude");
+            TestRunner.RunTestScript("Set-AzAdvisorConfigurationByRgExclude");
         }
 
     }
diff --git a/src/Advisor/Advisor.Test/ScenarioTests/TestController.cs b/src/Advisor/Advisor.Test/ScenarioTests/TestController.cs

Original file line number	Diff line number	Diff line change
`@@ -12,54 +12,44 @@`
`12`	`12`	`// limitations under the License.`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
`15`		`-using Microsoft.Azure.Commands.ScenarioTest;`
`16`		`-using Microsoft.Azure.ServiceManagement.Common.Models;`
`17`	`15`	`using Microsoft.WindowsAzure.Commands.ScenarioTest;`
`18`		`-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;`
`19`	`16`	`using Xunit;`
`20`		`-using Xunit.Abstractions;`
`21`	`17`
`22`	`18`
`23`	`19`	`namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests`
`24`	`20`	`{`
`25`		`- public class DisableAzAdvisorRecommendation`
	`21`	`+ public class DisableAzAdvisorRecommendation : AdvisorTestRunner`
`26`	`22`	`{`
`27`		`- private readonly XunitTracingInterceptor _logger;`
`28`		`-`
`29`		`- public DisableAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output)`
	`23`	`+ public DisableAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output) : base(output)`
`30`	`24`	`{`
`31`		`- _logger = new XunitTracingInterceptor(output);`
`32`		`- XunitTracingInterceptor.AddToContext(_logger);`
`33`		`- TestExecutionHelpers.SetUpSessionAndProfile();`
`34`	`25`	`}`
`35`	`26`
`36`		`-`
`37`	`27`	`[Fact]`
`38`	`28`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`39`	`29`	`public void DisableAzAdvisorRecommendationBadUserInput()`
`40`	`30`	`{`
`41`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Disable-AzAdvisorRecommendationBadUserInput-Negative");`
	`31`	`+ TestRunner.RunTestScript("Disable-AzAdvisorRecommendationBadUserInput-Negative");`
`42`	`32`	`}`
`43`	`33`
`44`	`34`	`[Fact]`
`45`	`35`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`46`	`36`	`public void DisableAzAdvisorRecommendationByNameParameter()`
`47`	`37`	`{`
`48`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Disable-AzAdvisorRecommendationByNameParameter");`
	`38`	`+ TestRunner.RunTestScript("Disable-AzAdvisorRecommendationByNameParameter");`
`49`	`39`	`}`
`50`	`40`
`51`	`41`	`[Fact]`
`52`	`42`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`53`	`43`	`public void DisableAzAdvisorRecommendationByIdParameter()`
`54`	`44`	`{`
`55`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Disable-AzAdvisorRecommendationByIdParameter");`
	`45`	`+ TestRunner.RunTestScript("Disable-AzAdvisorRecommendationByIdParameter");`
`56`	`46`	`}`
`57`	`47`
`58`	`48`	`[Fact]`
`59`	`49`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`60`	`50`	`public void DisableAzAdvisorRecommendationPipelineScenario()`
`61`	`51`	`{`
`62`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Disable-AzAdvisorRecommendationPipelineScenario");`
	`52`	`+ TestRunner.RunTestScript("Disable-AzAdvisorRecommendationPipelineScenario");`
`63`	`53`	`}`
`64`	`54`	`}`
`65`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,46 +12,37 @@`
`12`	`12`	`// limitations under the License.`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
`15`		`-using Microsoft.Azure.Commands.ScenarioTest;`
`16`		`-using Microsoft.Azure.ServiceManagement.Common.Models;`
`17`	`15`	`using Microsoft.WindowsAzure.Commands.ScenarioTest;`
`18`		`-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;`
`19`	`16`	`using Xunit;`
`20`		`-using Xunit.Abstractions;`
`21`	`17`
`22`	`18`
`23`	`19`	`namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests`
`24`	`20`	`{`
`25`		`- public class EnableAzAdvisorRecommendation`
	`21`	`+ public class EnableAzAdvisorRecommendation : AdvisorTestRunner`
`26`	`22`	`{`
`27`		`- private readonly XunitTracingInterceptor _logger;`
`28`		`-`
`29`		`- public EnableAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output)`
	`23`	`+ public EnableAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output) : base(output)`
`30`	`24`	`{`
`31`		`- _logger = new XunitTracingInterceptor(output);`
`32`		`- XunitTracingInterceptor.AddToContext(_logger);`
`33`		`- TestExecutionHelpers.SetUpSessionAndProfile();`
`34`	`25`	`}`
`35`	`26`
`36`	`27`	`[Fact]`
`37`	`28`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`38`	`29`	`public void EnableAzAdvisorRecommendationByNameParameterSet()`
`39`	`30`	`{`
`40`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Enable-AzAdvisorRecommendationByNameParameterSet");`
	`31`	`+ TestRunner.RunTestScript("Enable-AzAdvisorRecommendationByNameParameterSet");`
`41`	`32`	`}`
`42`	`33`
`43`	`34`	`[Fact]`
`44`	`35`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`45`	`36`	`public void EnableAzAdvisorRecommendationByIdParameterSet()`
`46`	`37`	`{`
`47`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Enable-AzAdvisorRecommendationByIdParameterSet");`
	`38`	`+ TestRunner.RunTestScript("Enable-AzAdvisorRecommendationByIdParameterSet");`
`48`	`39`	`}`
`49`	`40`
`50`	`41`	`[Fact]`
`51`	`42`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`52`	`43`	`public void EnableAzAdvisorRecommendationPipeline()`
`53`	`44`	`{`
`54`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Enable-AzAdvisorRecommendationPipeline");`
	`45`	`+ TestRunner.RunTestScript("Enable-AzAdvisorRecommendationPipeline");`
`55`	`46`	`}`
`56`	`47`	`}`
`57`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,32 +12,23 @@`
`12`	`12`	`// limitations under the License.`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
`15`		`-using Microsoft.Azure.Commands.ScenarioTest;`
`16`		`-using Microsoft.Azure.ServiceManagement.Common.Models;`
`17`	`15`	`using Microsoft.WindowsAzure.Commands.ScenarioTest;`
`18`		`-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;`
`19`	`16`	`using Xunit;`
`20`		`-using Xunit.Abstractions;`
`21`	`17`
`22`	`18`
`23`	`19`	`namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests`
`24`	`20`	`{`
`25`		`- public class GetAzAdvisorConfiguration`
	`21`	`+ public class GetAzAdvisorConfiguration : AdvisorTestRunner`
`26`	`22`	`{`
`27`		`- private readonly XunitTracingInterceptor _logger;`
`28`		`-`
`29`		`- public GetAzAdvisorConfiguration(Xunit.Abstractions.ITestOutputHelper output)`
	`23`	`+ public GetAzAdvisorConfiguration(Xunit.Abstractions.ITestOutputHelper output) : base(output)`
`30`	`24`	`{`
`31`		`- _logger = new XunitTracingInterceptor(output);`
`32`		`- XunitTracingInterceptor.AddToContext(_logger);`
`33`		`- TestExecutionHelpers.SetUpSessionAndProfile();`
`34`	`25`	`}`
`35`	`26`
`36`	`27`	`[Fact]`
`37`	`28`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`38`	`29`	`public void GetConfigurationQuery()`
`39`	`30`	`{`
`40`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzAdvisorConfigurationNoParameter");`
	`31`	`+ TestRunner.RunTestScript("Get-AzAdvisorConfigurationNoParameter");`
`41`	`32`	`}`
`42`	`33`	`}`
`43`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,52 +12,43 @@`
`12`	`12`	`// limitations under the License.`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
`15`		`-using Microsoft.Azure.Commands.ScenarioTest;`
`16`		`-using Microsoft.Azure.ServiceManagement.Common.Models;`
`17`	`15`	`using Microsoft.WindowsAzure.Commands.ScenarioTest;`
`18`		`-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;`
`19`	`16`	`using Xunit;`
`20`		`-using Xunit.Abstractions;`
`21`	`17`
`22`	`18`	`namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests`
`23`	`19`	`{`
`24`		`- public class GetAzAdvisorRecommendation`
	`20`	`+ public class GetAzAdvisorRecommendation : AdvisorTestRunner`
`25`	`21`	`{`
`26`		`- private readonly XunitTracingInterceptor _logger;`
`27`		`-`
`28`		`- public GetAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output)`
	`22`	`+ public GetAzAdvisorRecommendation(Xunit.Abstractions.ITestOutputHelper output) : base(output)`
`29`	`23`	`{`
`30`		`- _logger = new XunitTracingInterceptor(output);`
`31`		`- XunitTracingInterceptor.AddToContext(_logger);`
`32`		`- TestExecutionHelpers.SetUpSessionAndProfile();`
`33`	`24`	`}`
`34`	`25`
`35`	`26`	`[Fact]`
`36`	`27`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`37`	`28`	`public void GetAzAdvisorRecommendationNoParameter()`
`38`	`29`	`{`
`39`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzAdvisorRecommendationNoParameter");`
	`30`	`+ TestRunner.RunTestScript("Get-AzAdvisorRecommendationNoParameter");`
`40`	`31`	`}`
`41`	`32`
`42`	`33`	`[Fact]`
`43`	`34`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`44`	`35`	`public void GetAzAdvisorRecommendationByCategory()`
`45`	`36`	`{`
`46`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzAdvisorRecommendationByCategory");`
	`37`	`+ TestRunner.RunTestScript("Get-AzAdvisorRecommendationByCategory");`
`47`	`38`	`}`
`48`	`39`
`49`	`40`	`[Fact]`
`50`	`41`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`51`	`42`	`public void GetAzAdvisorRecommendationByNameParameterSet()`
`52`	`43`	`{`
`53`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzAdvisorRecommendationByNameParameterSet");`
	`44`	`+ TestRunner.RunTestScript("Get-AzAdvisorRecommendationByNameParameterSet");`
`54`	`45`	`}`
`55`	`46`
`56`	`47`	`[Fact]`
`57`	`48`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`58`	`49`	`public void GetAzAdvisorRecommendationByIdParameterSet()`
`59`	`50`	`{`
`60`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzAdvisorRecommendationByIdParameterSet");`
	`51`	`+ TestRunner.RunTestScript("Get-AzAdvisorRecommendationByIdParameterSet");`
`61`	`52`	`}`
`62`	`53`	`}`
`63`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,68 +12,59 @@`
`12`	`12`	`// limitations under the License.`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
`15`		`-using Microsoft.Azure.Commands.ScenarioTest;`
`16`		`-using Microsoft.Azure.ServiceManagement.Common.Models;`
`17`	`15`	`using Microsoft.WindowsAzure.Commands.ScenarioTest;`
`18`		`-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;`
`19`	`16`	`using Xunit;`
`20`		`-using Xunit.Abstractions;`
`21`	`17`
`22`	`18`
`23`	`19`	`namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests`
`24`	`20`	`{`
`25`		`- public class SetAzAdvisorConfiguration`
	`21`	`+ public class SetAzAdvisorConfiguration : AdvisorTestRunner`
`26`	`22`	`{`
`27`		`- private readonly XunitTracingInterceptor _logger;`
`28`		`-`
`29`		`- public SetAzAdvisorConfiguration(Xunit.Abstractions.ITestOutputHelper output)`
	`23`	`+ public SetAzAdvisorConfiguration(Xunit.Abstractions.ITestOutputHelper output) : base(output)`
`30`	`24`	`{`
`31`		`- _logger = new XunitTracingInterceptor(output);`
`32`		`- XunitTracingInterceptor.AddToContext(_logger);`
`33`		`- TestExecutionHelpers.SetUpSessionAndProfile();`
`34`	`25`	`}`
`35`	`26`
`36`	`27`	`[Fact]`
`37`	`28`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`38`	`29`	`public void SetAzAdvisorConfigurationBadUserInputLowCpu()`
`39`	`30`	`{`
`40`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationBadUserInputLowCpu-Negative");`
	`31`	`+ TestRunner.RunTestScript("Set-AzAdvisorConfigurationBadUserInputLowCpu-Negative");`
`41`	`32`	`}`
`42`	`33`
`43`	`34`	`[Fact]`
`44`	`35`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`45`	`36`	`public void SetAzAdvisorConfigurationByLowCpu()`
`46`	`37`	`{`
`47`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationWithLowCpu");`
	`38`	`+ TestRunner.RunTestScript("Set-AzAdvisorConfigurationWithLowCpu");`
`48`	`39`	`}`
`49`	`40`
`50`	`41`	`[Fact]`
`51`	`42`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`52`	`43`	`public void SetAzAdvisorConfigurationByLowCpuExclude()`
`53`	`44`	`{`
`54`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationByLowCpuExclude");`
	`45`	`+ TestRunner.RunTestScript("Set-AzAdvisorConfigurationByLowCpuExclude");`
`55`	`46`	`}`
`56`	`47`
`57`	`48`	`[Fact]`
`58`	`49`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`59`	`50`	`public void SetAzAdvisorConfigurationPipelineByLowCpuExclude()`
`60`	`51`	`{`
`61`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationPipelineByLowCpuExclude");`
	`52`	`+ TestRunner.RunTestScript("Set-AzAdvisorConfigurationPipelineByLowCpuExclude");`
`62`	`53`	`}`
`63`	`54`
`64`	`55`	`// ResourceGroupParameterSets`
`65`	`56`	`[Fact]`
`66`	`57`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`67`	`58`	`public void SetAzAdvisorConfigurationByRg()`
`68`	`59`	`{`
`69`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationWithRg");`
	`60`	`+ TestRunner.RunTestScript("Set-AzAdvisorConfigurationWithRg");`
`70`	`61`	`}`
`71`	`62`
`72`	`63`	`[Fact]`
`73`	`64`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`74`	`65`	`public void SetAzAdvisorConfigurationByRgExclude()`
`75`	`66`	`{`
`76`		`- TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzAdvisorConfigurationByRgExclude");`
	`67`	`+ TestRunner.RunTestScript("Set-AzAdvisorConfigurationByRgExclude");`
`77`	`68`	`}`
`78`	`69`
`79`	`70`	`}`