Add SubscriptionTestRunner and replace TestController

src/Subscription/Subscription.Test/ScenarioTests/SubscriptionTestRunner.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.Subscription.Test.ScenarioTests
+{
+    public class SubscriptionTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected SubscriptionTestRunner(ITestOutputHelper output)
+        {
+            TestRunner = TestManager.CreateInstance(output)
+                .WithNewPsScriptFilename($"{GetType().Name}.ps1")
+                .WithProjectSubfolderForTests("ScenarioTests")
+                .WithNewRmModules(helper => new[]
+                {
+                    helper.RMProfileModule,
+                    helper.GetRMModulePath("Az.Subscription.psd1")
+                })
+                .WithNewRecordMatcherArguments(
+                    userAgentsToIgnore: new Dictionary<string, string>
+                    {
+                        {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"}
+                    },
+                    resourceProviders: new Dictionary<string, string>
+                    {
+                        {"Microsoft.Resources", null},
+                        {"Microsoft.Features", null},
+                        {"Microsoft.Authorization", null},
+                        {"Microsoft.Compute", null}
+                    }
+                )
+                .Build();
+        }
+    }
+}

src/Subscription/Subscription.Test/ScenarioTests/SubscriptionTests.cs

@@ -12,9 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.ScenarioTest;
-using Microsoft.Azure.Commands.Subscription.Test.ScenarioTests.ScenarioTest;
-using Microsoft.Azure.ServiceManagement.Common.Models;
+using Microsoft.Azure.Commands.Subscription.Test.ScenarioTests;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
 
@@ -24,50 +22,45 @@ namespace Subscription.Test.ScenarioTests
     /// The following tests require four subscriptions to be created manually. This can be done by 
     /// calling New-AzureRmSubscription. At this time, this can only be done by EA customers.
     /// </summary>
-    public class SubscriptionTests
+    public class SubscriptionTests : SubscriptionTestRunner
     {
-        private XunitTracingInterceptor _logger;
-
-        public SubscriptionTests(Xunit.Abstractions.ITestOutputHelper output)
+        public SubscriptionTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
-            TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateRenameSubscription()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateRenameSubscription");
+            TestRunner.RunTestScript("Test-UpdateRenameSubscription");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateCancelSubscription()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateCancelSubscription");
+            TestRunner.RunTestScript("Test-UpdateCancelSubscription");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewSubscriptionAlias()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-NewSubscriptionAlias");
+            TestRunner.RunTestScript("Test-NewSubscriptionAlias");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetSubscriptionAlias()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetSubscriptionAlias");
+            TestRunner.RunTestScript("Test-GetSubscriptionAlias");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveSubscriptionAlias()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveSubscriptionAlias");
+            TestRunner.RunTestScript("Test-RemoveSubscriptionAlias");
         }
     }
 }