Add ServiceFabricTestRunner and replace TestController

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/ServiceFabricApplicationTests.cs

@@ -13,53 +13,46 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.ServiceFabric.Commands;
-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.ServiceFabric.Test.ScenarioTests
 {
-    public class ServiceFabricApplicationTests : RMTestBase
+    public class ServiceFabricApplicationTests : ServiceFabricTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public ServiceFabricApplicationTests(ITestOutputHelper output)
+        public ServiceFabricApplicationTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
-
-            ServiceFabricManagedCmdletBase.WriteVerboseIntervalInSec = 0;
+            ServiceFabricCommonCmdletBase.WriteVerboseIntervalInSec = 0;
             ServiceFabricCmdletBase.RunningTest = true;
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAppType()
         {
-            TestController.NewInstance.RunPsTest(_logger, "Test-AppType");
+            TestRunner.RunTestScript("Test-AppType");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAppTypeVersion()
         {
-            TestController.NewInstance.RunPsTest(_logger, "Test-AppTypeVersion");
+            TestRunner.RunTestScript("Test-AppTypeVersion");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestApp()
         {
-            TestController.NewInstance.RunPsTest(_logger, "Test-App");
+            TestRunner.RunTestScript("Test-App");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestService()
         {
-            TestController.NewInstance.RunPsTest(_logger, "Test-Service");
+            TestRunner.RunTestScript("Test-Service");
         }
     }
 }

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/ServiceFabricManagedClustersApplicationTests.cs

@@ -13,23 +13,16 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.ServiceFabric.Commands;
-using Microsoft.Azure.ServiceManagement.Common.Models;
-using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
+using Microsoft.WindowsAzure.Commands.ScenarioTest; 
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Test.ScenarioTests
 {
-    public class ServiceFabricManagedClustersApplicationTests : RMTestBase
+    public class ServiceFabricManagedClustersApplicationTests : ServiceFabricTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public ServiceFabricManagedClustersApplicationTests(ITestOutputHelper output)
+        public ServiceFabricManagedClustersApplicationTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
-
             ServiceFabricCommonCmdletBase.WriteVerboseIntervalInSec = 0;
             ServiceFabricCmdletBase.RunningTest = true;
         }
@@ -38,28 +31,28 @@ public ServiceFabricManagedClustersApplicationTests(ITestOutputHelper output)
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestManagedAppType()
         {
-            TestController.NewInstance.RunPsTest(_logger, "Test-ManagedAppType");
+            TestRunner.RunTestScript("Test-ManagedAppType");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestManagedAppTypeVersion()
         {
-            TestController.NewInstance.RunPsTest(_logger, "Test-ManagedAppTypeVersion");
+            TestRunner.RunTestScript("Test-ManagedAppTypeVersion");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestManagedApp()
         {
-            TestController.NewInstance.RunPsTest(_logger, "Test-ManagedApp");
+            TestRunner.RunTestScript("Test-ManagedApp");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestManagedService()
         {
-            TestController.NewInstance.RunPsTest(_logger, "Test-ManagedService");
+            TestRunner.RunTestScript("Test-ManagedService");
         }
     }
 }

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/ServiceFabricManagedClustersTests.cs

@@ -13,23 +13,16 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.ServiceFabric.Commands;
-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.ServiceFabric.Test.ScenarioTests
 {
-    public class ServiceFabricManagedClustersTests : RMTestBase
+    public class ServiceFabricManagedClustersTests : ServiceFabricTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public ServiceFabricManagedClustersTests(ITestOutputHelper output)
+        public ServiceFabricManagedClustersTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
-
             ServiceFabricCommonCmdletBase.WriteVerboseIntervalInSec = 0;
             ServiceFabricCmdletBase.RunningTest = true;
         }
@@ -38,21 +31,21 @@ public ServiceFabricManagedClustersTests(ITestOutputHelper output)
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateBasicCluster()
         {
-            TestController.NewInstance.RunPsTest(_logger, "Test-CreateBasicCluster");
+            TestRunner.RunTestScript("Test-CreateBasicCluster");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNodeTypeOperations()
         {
-            TestController.NewInstance.RunPsTest(_logger, "Test-NodeTypeOperations");
+            TestRunner.RunTestScript("Test-NodeTypeOperations");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCertAndExtension()
         {
-            TestController.NewInstance.RunPsTest(_logger, "Test-CertAndExtension");
+            TestRunner.RunTestScript("Test-CertAndExtension");
         }
     }
 }

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/ServiceFabricTestRunner.cs

@@ -0,0 +1,56 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.ServiceFabric.Test.ScenarioTests
+{
+    public class ServiceFabricTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected ServiceFabricTestRunner(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.ServiceFabric.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.KeyVault", null}
+                    }
+                )
+                .Build();
+        }
+    }
+}