Add ResourceGraphTestRunner to replace TestController

src/ResourceGraph/ResourceGraph.Test/ScenarioTests/ResourceGraphQueryTests.cs

@@ -12,71 +12,64 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.ScenarioTest;
-using Microsoft.Azure.ServiceManagement.Common.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
 
 namespace Microsoft.Azure.Commands.ResourceGraph.Test.ScenarioTests
 {
-    public class ResourceGraphQueryTests
+    public class ResourceGraphQueryTests : ResourceGraphTestRunner
     {
-        private readonly XunitTracingInterceptor _logger;
-
-        public ResourceGraphQueryTests(Xunit.Abstractions.ITestOutputHelper output)
+        public ResourceGraphQueryTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
-            TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void Query()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Search-AzureRmGraph-Query");
+            TestRunner.RunTestScript("Search-AzureRmGraph-Query");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void PagedQuery()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Search-AzureRmGraph-PagedQuery");
+            TestRunner.RunTestScript("Search-AzureRmGraph-PagedQuery");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void Subscriptions()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Search-AzureRmGraph-Subscriptions");
+            TestRunner.RunTestScript("Search-AzureRmGraph-Subscriptions");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ManagementGroups()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Search-AzureRmGraph-ManagementGroups");
+            TestRunner.RunTestScript("Search-AzureRmGraph-ManagementGroups");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SkipTokenQuery()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Search-AzureRmGraph-SkipTokenQuery");
+            TestRunner.RunTestScript("Search-AzureRmGraph-SkipTokenQuery");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void QueryError()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Search-AzureRmGraph-QueryError");
+            TestRunner.RunTestScript("Search-AzureRmGraph-QueryError");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SubscriptionAndManagementGroupQueryError()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Search-AzureRmGraph-SubscriptionAndManagementGroupQueryError");
+            TestRunner.RunTestScript("Search-AzureRmGraph-SubscriptionAndManagementGroupQueryError");
         }
     }
 }

src/ResourceGraph/ResourceGraph.Test/ScenarioTests/ResourceGraphTestRunner.cs

@@ -0,0 +1,52 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.ResourceGraph.Test.ScenarioTests
+{
+    public class ResourceGraphTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected ResourceGraphTestRunner(ITestOutputHelper output)
+        {
+            TestRunner = TestManager.CreateInstance(output)
+                .WithNewPsScriptFilename($"{GetType().Name}.ps1")
+                .WithProjectSubfolderForTests("ScenarioTests")
+                .WithCommonPsScripts(new[]
+                {
+                    @"Common.ps1",
+                })
+                .WithNewRmModules(helper => new[]
+                {
+                    helper.RMProfileModule,
+                    helper.GetRMModulePath(@"Az.ResourceGraph.psd1")
+                })
+                .WithNewRecordMatcherArguments(
+                    userAgentsToIgnore: new Dictionary<string, string>(),
+                    resourceProviders: new Dictionary<string, string>
+                    {
+                        { "Microsoft.Resources", null },
+                        { "Microsoft.Features", null },
+                        { "Microsoft.Authorization", null }
+                    }
+                )
+                .Build();
+        }
+    }
+}
+