Skip to content

Commit 6c78b5c

Browse files
v-yuzhichenZiyue Zheng
andauthored
Add DeploymentManagerTestRunner to replace DeploymentManagerController (#18108)
* Add DeploymentManagerTestRunner to replace DeploymentManagerController * Add DeploymentManagerTestRunner to replace DeploymentManagerController Co-authored-by: Ziyue Zheng <[email protected]>
1 parent 9f76a2d commit 6c78b5c

File tree

3 files changed

+58
-156
lines changed

3 files changed

+58
-156
lines changed

src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerController.cs

Lines changed: 0 additions & 147 deletions
This file was deleted.
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System.Collections.Generic;
16+
using Xunit.Abstractions;
17+
using Microsoft.Azure.Commands.TestFx;
18+
19+
namespace Microsoft.Azure.Commands.DeploymentManager.Test.ScenarioTests
20+
{
21+
public class DeploymentManagerTestRunner
22+
{
23+
protected readonly ITestRunner TestRunner;
24+
25+
protected DeploymentManagerTestRunner(ITestOutputHelper output)
26+
{
27+
TestRunner = TestManager.CreateInstance(output)
28+
.WithNewPsScriptFilename($"{GetType().Name}.ps1")
29+
.WithProjectSubfolderForTests("ScenarioTests")
30+
.WithCommonPsScripts(new[]
31+
{
32+
@"DeploymentManagerTestsCommon.ps1",
33+
@"../AzureRM.Storage.ps1"
34+
})
35+
.WithNewRmModules(helper => new[]
36+
{
37+
helper.RMProfileModule,
38+
helper.GetRMModulePath(@"Az.ManagedServiceIdentity.psd1"),
39+
helper.GetRMModulePath(@"Az.Storage.psd1"),
40+
helper.GetRMModulePath(@"Az.Resources.psd1"),
41+
helper.GetRMModulePath(@"Az.DeploymentManager.psd1")
42+
})
43+
.WithNewRecordMatcherArguments(
44+
userAgentsToIgnore: new Dictionary<string, string>(),
45+
resourceProviders: new Dictionary<string, string>
46+
{
47+
{"Microsoft.Resources", null},
48+
{"Microsoft.Features", null},
49+
{"Microsoft.Authorization", null}
50+
}
51+
)
52+
.Build();
53+
}
54+
}
55+
}

src/DeploymentManager/DeploymentManager.Test/ScenarioTests/DeploymentManagerTests.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,21 @@
1414

1515
namespace Microsoft.Azure.Commands.DeploymentManager.Test.ScenarioTests
1616
{
17-
using Microsoft.Azure.ServiceManagement.Common.Models;
1817
using Microsoft.WindowsAzure.Commands.ScenarioTest;
19-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2018
using Xunit;
2119
using Xunit.Abstractions;
2220

23-
public class DeploymentManagerTests : RMTestBase
21+
public class DeploymentManagerTests : DeploymentManagerTestRunner
2422
{
25-
public XunitTracingInterceptor _logger;
26-
27-
public DeploymentManagerTests(ITestOutputHelper output)
23+
public DeploymentManagerTests(ITestOutputHelper output) : base(output)
2824
{
29-
_logger = new XunitTracingInterceptor(output);
30-
XunitTracingInterceptor.AddToContext(_logger);
3125
}
3226

3327
[Fact]
3428
[Trait(Category.AcceptanceType, Category.CheckIn)]
3529
public void EndToEndFunctionalTests()
3630
{
37-
DeploymentManagerController.NewInstance.RunPowerShellTest(_logger, "Test-EndToEndFunctionalTests");
31+
TestRunner.RunTestScript("Test-EndToEndFunctionalTests");
3832
}
3933
}
4034
}

0 commit comments

Comments
 (0)