Add BlueprintTestRunner and replace TestController

src/Blueprint/Blueprint.Test/ScenarioTests/BlueprintAssignmentTests.cs

@@ -1,58 +1,61 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Azure.Commands.ScenarioTest;
+// ----------------------------------------------------------------------------------
+//
+// 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.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
 
 namespace Microsoft.Azure.Commands.Blueprint.Test.ScenarioTests
 {
-    public class BlueprintAssignmentTests
+    public class BlueprintAssignmentTests : BlueprintTestRunner
     {
-        private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
-
-        public BlueprintAssignmentTests(Xunit.Abstractions.ITestOutputHelper output)
+        public BlueprintAssignmentTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
-            ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
-            TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetBlueprintAssignment()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetBlueprintAssignment");
+            TestRunner.RunTestScript("Test-GetBlueprintAssignment");
         }
 
         [Fact(Skip = "Investigate auto-registration for RP")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewBlueprintAssignmentWithSystemAssignedIdentity()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-NewBlueprintAssignmentWithSystemAssignedIdentity");
+            TestRunner.RunTestScript("Test-NewBlueprintAssignmentWithSystemAssignedIdentity");
         }
 
         [Fact(Skip="Investigate auto-registration for RP")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewBlueprintAssignment()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-NewBlueprintAssignment");
+            TestRunner.RunTestScript("Test-NewBlueprintAssignment");
         }
 
         [Fact(Skip = "Investigate auto-registration for RP")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSetBlueprintAssignment()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-SetBlueprintAssignment");
+            TestRunner.RunTestScript("Test-SetBlueprintAssignment");
         }
 
         [Fact(Skip = "Investigate auto-registration for RP")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveBlueprintAssignment()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveBlueprintAssignment");
+            TestRunner.RunTestScript("Test-RemoveBlueprintAssignment");
         }
 
     }

src/Blueprint/Blueprint.Test/ScenarioTests/BlueprintTestRunner.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.Blueprint.Test.ScenarioTests
+{
+    public class BlueprintTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected BlueprintTestRunner(ITestOutputHelper output)
+        {
+            TestRunner = TestManager.CreateInstance(output)
+                .WithNewPsScriptFilename($"{GetType().Name}.ps1")
+                .WithProjectSubfolderForTests("ScenarioTests")
+                .WithNewRmModules(helper => new[]
+               {
+                    helper.RMProfileModule,
+                    helper.GetRMModulePath("Az.Blueprint.psd1"),
+                    helper.GetRMModulePath("Az.Resources.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.Compute", null}
+                    }
+                )
+                .Build();
+        }
+    }
+}

src/Blueprint/Blueprint.Test/ScenarioTests/BlueprintTests.cs

@@ -1,46 +1,47 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Azure.Commands.Blueprint.Test.ScenarioTests;
-using Microsoft.Azure.Commands.ScenarioTest;
+// ----------------------------------------------------------------------------------
+//
+// 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.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
 
 namespace Microsoft.Azure.Commands.Blueprint.Test.ScenarioTests
 {
-    public class BlueprintTests
+    public class BlueprintTests : BlueprintTestRunner
     {
-        private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
-
-
-        public BlueprintTests(Xunit.Abstractions.ITestOutputHelper output)
+        public BlueprintTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
-            _logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
-            ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
-            TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
         [Fact(Skip = "There is a framework issue where HttpClient calls are not recorded in session records causing tests to fail in playback mode")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetBlueprint()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetBlueprint");
+            TestRunner.RunTestScript("Test-GetBlueprint");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetBlueprintWithDefinitionLocationNameAndVersion()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetBlueprintWithDefinitionLocationNameAndVersion");
+            TestRunner.RunTestScript("Test-GetBlueprintWithDefinitionLocationNameAndVersion");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetBlueprintWithDefinitionLocationNameAndLatestPublished()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetBlueprintWithDefinitionLocationNameAndLatestPublished");
+            TestRunner.RunTestScript("Test-GetBlueprintWithDefinitionLocationNameAndLatestPublished");
         }
     }
 }

src/Blueprint/Blueprint.Test/ScenarioTests/ManagementGroupAssignmentTests.cs

@@ -1,56 +1,62 @@
-namespace Microsoft.Azure.Commands.Blueprint.Test.ScenarioTests
+// ----------------------------------------------------------------------------------
+//
+// 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.Blueprint.Test.ScenarioTests
 {
-    using Microsoft.Azure.Commands.ScenarioTest;
-    using Microsoft.Azure.ServiceManagement.Common.Models;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
     using Xunit;
     using Xunit.Abstractions;
 
-    public class ManagementGroupAssignmentTests
+    public class ManagementGroupAssignmentTests : BlueprintTestRunner
     {
-        private XunitTracingInterceptor logger;
-
-        public ManagementGroupAssignmentTests(ITestOutputHelper output)
+        public ManagementGroupAssignmentTests(ITestOutputHelper output) :   base(output)
         {
-
-            this.logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(this.logger);
-            TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAssignmentsInManagementGroup()
         {
-            TestController.NewInstance.RunPowerShellTest(this.logger, "Test-GetAssignmentsInManagementGroup");
+            TestRunner.RunTestScript("Test-GetAssignmentsInManagementGroup");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetSingleAssignmentInManagementGroup()
         {
-            TestController.NewInstance.RunPowerShellTest(this.logger, "Test-GetSingleAssignmentInManagementGroup");
+            TestRunner.RunTestScript("Test-GetSingleAssignmentInManagementGroup");
         }
 
         [Fact(Skip = "Investigate auto-registration for RP")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateAssignmentInManagementGroup()
         {
-            TestController.NewInstance.RunPowerShellTest(this.logger, "Test-CreateAssignmentInManagementGroup");
+            TestRunner.RunTestScript("Test-CreateAssignmentInManagementGroup");
         }
 
         [Fact(Skip = "Investigate auto-registration for RP")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateAssignmentInManagementGroup()
         {
-            TestController.NewInstance.RunPowerShellTest(this.logger, "Test-UpdateAssignmentInManagementGroup");
+            TestRunner.RunTestScript("Test-UpdateAssignmentInManagementGroup");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveAssignmentInManagementGroup()
         {
-            TestController.NewInstance.RunPowerShellTest(this.logger, "Test-RemoveAssignmentInManagementGroup");
+            TestRunner.RunTestScript("Test-RemoveAssignmentInManagementGroup");
         }
     }
 }