Add DeploymentManagerTestRunner to replace DeploymentManagerController (

#18108) * Add DeploymentManagerTestRunner to replace DeploymentManagerController * Add DeploymentManagerTestRunner to replace DeploymentManagerController Co-authored-by: Ziyue Zheng <[email protected]>
Azure · May 12, 2022 · 6c78b5c · 6c78b5c
1 parent 9f76a2d
commit 6c78b5c
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 156 deletions.
diff --git a/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerController.cs b/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerController.cs
diff --git a/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTestRunner.cs b/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTestRunner.cs
@@ -0,0 +1,55 @@
+// ----------------------------------------------------------------------------------
+//
+// 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 Xunit.Abstractions;
+using Microsoft.Azure.Commands.TestFx;
+
+namespace Microsoft.Azure.Commands.DeploymentManager.Test.ScenarioTests
+{
+    public class DeploymentManagerTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected DeploymentManagerTestRunner(ITestOutputHelper output)
+        {
+            TestRunner = TestManager.CreateInstance(output)
+                .WithNewPsScriptFilename($"{GetType().Name}.ps1")
+                .WithProjectSubfolderForTests("ScenarioTests")
+                .WithCommonPsScripts(new[]
+                {
+                    @"DeploymentManagerTestsCommon.ps1",
+                    @"../AzureRM.Storage.ps1"
+                })
+                .WithNewRmModules(helper => new[]
+                {
+                    helper.RMProfileModule,
+                    helper.GetRMModulePath(@"Az.ManagedServiceIdentity.psd1"),
+                    helper.GetRMModulePath(@"Az.Storage.psd1"),
+                    helper.GetRMModulePath(@"Az.Resources.psd1"),
+                    helper.GetRMModulePath(@"Az.DeploymentManager.psd1")
+                })
+                .WithNewRecordMatcherArguments(
+                    userAgentsToIgnore: new Dictionary<string, string>(),
+                    resourceProviders: new Dictionary<string, string>
+                    {
+                        {"Microsoft.Resources", null},
+                        {"Microsoft.Features", null},
+                        {"Microsoft.Authorization", null}
+                    }
+                )
+                .Build();
+        }
+    }
+}
diff --git a/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTests.cs b/src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTests.cs
@@ -14,27 +14,21 @@
 
 namespace Microsoft.Azure.Commands.DeploymentManager.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;
 
-    public class DeploymentManagerTests : RMTestBase
+    public class DeploymentManagerTests : DeploymentManagerTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public DeploymentManagerTests(ITestOutputHelper output)
+        public DeploymentManagerTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void EndToEndFunctionalTests()
         {
-            DeploymentManagerController.NewInstance.RunPowerShellTest(_logger, "Test-EndToEndFunctionalTests");
+            TestRunner.RunTestScript("Test-EndToEndFunctionalTests");
         }
     }
 }