Add MarketplaceTestRunner to replace TestController (Azure#18190)

src/Marketplace/Marketplace.Test/ScenarioTests/MarketplaceTestRunner.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.
+// ----------------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Commands.Marketplace.Test.ScenarioTests
+{
+    using System.Collections.Generic;
+    using Microsoft.Azure.Commands.TestFx;
+    using Xunit.Abstractions;
+
+    public class MarketplaceTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected MarketplaceTestRunner(ITestOutputHelper output)
+        {
+            TestRunner = TestManager.CreateInstance(output)
+                .WithNewPsScriptFilename($"{GetType().Name}.ps1")
+                .WithProjectSubfolderForTests("ScenarioTests")
+                .WithCommonPsScripts(new[]
+                {
+                    @"Common.ps1"
+                })
+                .WithNewRmModules(helper => new[]
+                {
+                    helper.RMProfileModule,
+                    helper.GetRMModulePath("Az.Marketplace.psd1")
+                })
+                .WithNewRecordMatcherArguments(
+                    userAgentsToIgnore: new Dictionary<string, string>(),
+                    resourceProviders: new Dictionary<string, string>
+                    {
+                        {"Microsoft.Resources", null},
+                        {"Microsoft.Features", null},
+                        {"Microsoft.Authorization", null}
+                    }
+                )
+                .Build();
+        }
+    }
+}

src/Marketplace/Marketplace.Test/ScenarioTests/PrivateStoreTests.cs

@@ -14,74 +14,69 @@
 
 namespace Microsoft.Azure.Commands.Marketplace.Test.ScenarioTests
 {
-    using Microsoft.Azure.ServiceManagement.Common.Models;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
     using Xunit;
 
-    public class PrivateStoreTests
+    public class PrivateStoreTests : MarketplaceTestRunner
     {
-        private readonly XunitTracingInterceptor _logger;
-
-        public PrivateStoreTests(Xunit.Abstractions.ITestOutputHelper output)
+        public PrivateStoreTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetPrivateStores()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetAzMarketplacePrivateStore");
+            TestRunner.RunTestScript("Test-GetAzMarketplacePrivateStore");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetPrivateStoreOffers()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetAzMarketplacePrivateStoreOffers");
+            TestRunner.RunTestScript("Test-GetAzMarketplacePrivateStoreOffers");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetPrivateStoreOffer()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetAzMarketplacePrivateStoreOffer");
+            TestRunner.RunTestScript("Test-GetAzMarketplacePrivateStoreOffer");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemovePrivateStoreOffer()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveAzMarketplacePrivateStoreOffer");
+            TestRunner.RunTestScript("Test-RemoveAzMarketplacePrivateStoreOffer");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreatePrivateStoreOffer()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateAzMarketplacePrivateStoreOffer");
+            TestRunner.RunTestScript("Test-CreateAzMarketplacePrivateStoreOffer");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdatePrivateStoreOffer()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateAzMarketplacePrivateStoreOffer");
+            TestRunner.RunTestScript("Test-UpdateAzMarketplacePrivateStoreOffer");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdatePrivateStorePrivateOffer()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-UpdateAzMarketplacePrivateStorePrivateOffer");
+            TestRunner.RunTestScript("Test-UpdateAzMarketplacePrivateStorePrivateOffer");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetPrivateStorePrivateOffer()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetAzMarketplacePrivateStorePrivateOffers");
+            TestRunner.RunTestScript("Test-GetAzMarketplacePrivateStorePrivateOffers");
         }
     }
 }