Add CognitiveServicesTestRunner and replace TestController

src/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.cs

@@ -14,259 +14,250 @@
 
 
 using Microsoft.Azure.Commands.Management.CognitiveServices.Test.ScenarioTests;
-using Microsoft.Azure.Commands.ScenarioTest;
-using Microsoft.Azure.ServiceManagement.Common.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-using System;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace CognitiveServices.Test.ScenarioTests
 {
-    public class CognitiveServicesAccountTests : RMTestBase
+    public class CognitiveServicesAccountTests : CognitiveServicesTestRunner
     {
-        XunitTracingInterceptor traceInterceptor;
-
-        public CognitiveServicesAccountTests(ITestOutputHelper output)
+        public CognitiveServicesAccountTests(ITestOutputHelper output) : base(output)
         {
-            this.traceInterceptor = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(this.traceInterceptor);
-            TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewAccount()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmCognitiveServicesAccount");
+            TestRunner.RunTestScript("Test-NewAzureRmCognitiveServicesAccount");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewAccountWithCustomDomain()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmCognitiveServicesAccountWithCustomDomain");
+            TestRunner.RunTestScript("Test-NewAzureRmCognitiveServicesAccountWithCustomDomain");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewAccountWithVnet()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmCognitiveServicesAccountWithVnet");
+            TestRunner.RunTestScript("Test-NewAzureRmCognitiveServicesAccountWithVnet");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveAccount()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-RemoveAzureRmCognitiveServicesAccount");
+            TestRunner.RunTestScript("Test-RemoveAzureRmCognitiveServicesAccount");
         }
 
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAccounts()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-GetAzureCognitiveServiceAccount");
+            TestRunner.RunTestScript("Test-GetAzureCognitiveServiceAccount");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAsyncAccountOperations()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-AsyncAccountOperations");
+            TestRunner.RunTestScript("Test-AsyncAccountOperations");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSetAccount()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-SetAzureRmCognitiveServicesAccount");
+            TestRunner.RunTestScript("Test-SetAzureRmCognitiveServicesAccount");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSetAccountWithCustomDomain()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-SetAzureRmCognitiveServicesAccountWithCustomDomain");
+            TestRunner.RunTestScript("Test-SetAzureRmCognitiveServicesAccountWithCustomDomain");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSetAccountWithVnet()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-SetAzureRmCognitiveServicesAccountWithVnet");
+            TestRunner.RunTestScript("Test-SetAzureRmCognitiveServicesAccountWithVnet");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNetworkRuleSet()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NetworkRuleSet");
+            TestRunner.RunTestScript("Test-NetworkRuleSet");
         }
 
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNetworkRuleSetDefaultActions()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NetworkRuleSetDefaultActions");
+            TestRunner.RunTestScript("Test-NetworkRuleSetDefaultActions");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAccountKeys()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-GetAzureRmCognitiveServicesAccountKey");
+            TestRunner.RunTestScript("Test-GetAzureRmCognitiveServicesAccountKey");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewAccountKey()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmCognitiveServicesAccountKey");
+            TestRunner.RunTestScript("Test-NewAzureRmCognitiveServicesAccountKey");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAccountSkus()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-GetAzureRmCognitiveServicesAccountSkus");
+            TestRunner.RunTestScript("Test-GetAzureRmCognitiveServicesAccountSkus");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAccountType()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-GetAzureRmCognitiveServicesAccountType");
+            TestRunner.RunTestScript("Test-GetAzureRmCognitiveServicesAccountType");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPipingToGetKey()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-PipingGetAccountToGetKey");
+            TestRunner.RunTestScript("Test-PipingGetAccountToGetKey");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPipingToSetAccount()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-PipingToSetAzureAccount");
+            TestRunner.RunTestScript("Test-PipingToSetAzureAccount");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestMinMaxAccountNames()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-MinMaxAccountName");
+            TestRunner.RunTestScript("Test-MinMaxAccountName");
         }
 
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetUsages()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-GetUsages");
+            TestRunner.RunTestScript("Test-GetUsages");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestManagedIdentity()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-ManagedIdentity");
+            TestRunner.RunTestScript("Test-ManagedIdentity");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUserAssignedIdentity()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-UserAssignedIdentity");
+            TestRunner.RunTestScript("Test-UserAssignedIdentity");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEncryption()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-Encryption");
+            TestRunner.RunTestScript("Test-Encryption");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUserOwnedStorage()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-UserOwnedStorage");
+            TestRunner.RunTestScript("Test-UserOwnedStorage");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateEndpoint()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-PrivateEndpoint");
+            TestRunner.RunTestScript("Test-PrivateEndpoint");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPublicNetworkAccess()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-PublicNetworkAccess");
+            TestRunner.RunTestScript("Test-PublicNetworkAccess");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRestrictOutboundNetworkAccess()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-RestrictOutboundNetworkAccess");
+            TestRunner.RunTestScript("Test-RestrictOutboundNetworkAccess");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDisableLocalAuth()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-DisableLocalAuth");
+            TestRunner.RunTestScript("Test-DisableLocalAuth");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCapabilities()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-Capabilities");
+            TestRunner.RunTestScript("Test-Capabilities");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestApiProperties()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-ApiProperties");
+            TestRunner.RunTestScript("Test-ApiProperties");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSoftDelete()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-SoftDelete");
+            TestRunner.RunTestScript("Test-SoftDelete");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCommitmentPlan()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-CommitmentPlan");
+            TestRunner.RunTestScript("Test-CommitmentPlan");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDeployment()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-Deployment");
+            TestRunner.RunTestScript("Test-Deployment");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListModels()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-ListModels");
+            TestRunner.RunTestScript("Test-ListModels");
         }
     }
 }

src/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesTestRunner.cs

@@ -0,0 +1,83 @@
+// ----------------------------------------------------------------------------------
+//
+// 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 Microsoft.Azure.Management.CognitiveServices;
+using System.Collections.Generic;
+using Microsoft.Azure.Management.Internal.Resources;
+using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework;
+using Microsoft.Azure.Management.Network;
+using Microsoft.Azure.Commands.TestFx;
+using Xunit.Abstractions;
+
+namespace Microsoft.Azure.Commands.Management.CognitiveServices.Test.ScenarioTests
+{
+    public class CognitiveServicesTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected CognitiveServicesTestRunner(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.RMNetworkModule,
+                    helper.GetRMModulePath("Az.CognitiveServices.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.Network", null}
+                    }
+                ).WithManagementClients(
+                    GetResourceManagementClient,
+                    GetCognitiveServicesManagementClient,
+                    GetNetworkClient
+                )
+                .Build();
+        }
+
+        private static ResourceManagementClient GetResourceManagementClient(RestTestFramework.MockContext context)
+        {
+            return context.GetServiceClient<ResourceManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
+        }
+
+        private static CognitiveServicesManagementClient GetCognitiveServicesManagementClient(RestTestFramework.MockContext context)
+        {
+            return context.GetServiceClient<CognitiveServicesManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
+        }
+
+        protected NetworkManagementClient GetNetworkClient(RestTestFramework.MockContext context)
+        {
+            NetworkManagementClient client =
+                context.GetServiceClient<NetworkManagementClient>(
+                    RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
+            return client;
+        }
+    }
+}