Add EventGridTestRunner and replace Controller

src/EventGrid/EventGrid.Test/ScenarioTests/DomainTests.cs

@@ -13,64 +13,58 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.EventGrid.Test.ScenarioTests;
-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.EventGrid.Tests.ScenarioTests
 {
-    public class DomainTests : RMTestBase
+    public class DomainTests : EventGridTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public DomainTests(ITestOutputHelper output)
+        public DomainTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void EventGrid_DomainsCreateGetAndDelete()
         {
-            EventGridController.NewInstance.RunPsTest(_logger, "DomainTests");
+            TestRunner.RunTestScript("DomainTests");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void EventGrid_DomainsidentityTests()
         {
-            EventGridController.NewInstance.RunPsTest(_logger, "DomainIdentityTests");
+            TestRunner.RunTestScript("DomainIdentityTests");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void EventGrid_DomainsGetKey()
         {
-            EventGridController.NewInstance.RunPsTest(_logger, "DomainGetKeyTests");
+            TestRunner.RunTestScript("DomainGetKeyTests");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void EventGrid_DomainsNewKey()
         {
-            EventGridController.NewInstance.RunPsTest(_logger, "DomainNewKeyTests");
+            TestRunner.RunTestScript("DomainNewKeyTests");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void EventGrid_DomainsInputMappingCreateGetAndDelete()
         {
-            EventGridController.NewInstance.RunPsTest(_logger, "DomainInputMappingTests");
+            TestRunner.RunTestScript("DomainInputMappingTests");
         }
 
         /*[Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void EventGrid_DomainTopics()
         {
-            EventGridController.NewInstance.RunPsTest(_logger, "DomainTopicTests");
+            TestRunner.RunTestScript("DomainTopicTests");
         }*/
     }
 }

src/EventGrid/EventGrid.Test/ScenarioTests/EventGridTestRunner.cs

@@ -0,0 +1,60 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.EventGrid.Test.ScenarioTests
+{
+    public class EventGridTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected EventGridTestRunner(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.EventHub.psd1"),
+                    helper.GetRMModulePath("Az.EventGrid.psd1"),
+                    helper.GetRMModulePath("Az.Relay.psd1"),
+                    helper.GetRMModulePath("Az.Storage.psd1"),
+                    helper.GetRMModulePath("Az.ServiceBus.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.EventHub", null}
+                    }
+                )
+                .Build();
+        }
+    }
+}