Skip to content

Commit 5a315f9

Browse files
Add MaintenanceTestRunner and replace TestController (#18151)
1 parent 317efe4 commit 5a315f9

File tree

3 files changed

+63
-123
lines changed

3 files changed

+63
-123
lines changed
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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 Microsoft.Azure.Commands.TestFx;
17+
using Xunit.Abstractions;
18+
19+
namespace Microsoft.Azure.Commands.Maintenance.Test.ScenarioTests
20+
{
21+
public class MaintenanceTestRunner
22+
{
23+
protected readonly ITestRunner TestRunner;
24+
25+
protected MaintenanceTestRunner(ITestOutputHelper output)
26+
{
27+
TestRunner = TestManager.CreateInstance(output)
28+
.WithNewPsScriptFilename($"{GetType().Name}.ps1")
29+
.WithProjectSubfolderForTests("ScenarioTests")
30+
.WithCommonPsScripts(new[]
31+
{
32+
@"Common.ps1",
33+
@"../AzureRM.Resources.ps1"
34+
})
35+
.WithNewRmModules(helper => new[]
36+
{
37+
helper.RMProfileModule,
38+
helper.GetRMModulePath("Az.Maintenance.psd1")
39+
})
40+
.WithNewRecordMatcherArguments(
41+
userAgentsToIgnore: new Dictionary<string, string>
42+
{
43+
{"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"}
44+
},
45+
resourceProviders: new Dictionary<string, string>
46+
{
47+
{ "Microsoft.Resources", null },
48+
{ "Microsoft.Features", null },
49+
{ "Microsoft.Authorization", null },
50+
{ "Microsoft.Maintenance", null }
51+
}
52+
)
53+
.Build();
54+
}
55+
}
56+
}

src/Maintenance/Maintenance.Test/ScenarioTests/MaintenanceTests.cs

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,50 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using Microsoft.Azure.Commands.ScenarioTest;
16-
using Microsoft.Azure.ServiceManagement.Common.Models;
1715
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
1916
using Xunit;
20-
using Xunit.Abstractions;
2117

2218
namespace Microsoft.Azure.Commands.Maintenance.Test.ScenarioTests
2319
{
24-
public class MaintenanceTests : RMTestBase
20+
public class MaintenanceTests : MaintenanceTestRunner
2521
{
26-
public XunitTracingInterceptor _logger;
27-
28-
public MaintenanceTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public MaintenanceTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2923
{
30-
_logger = new XunitTracingInterceptor(output);
31-
XunitTracingInterceptor.AddToContext(_logger);
32-
TestExecutionHelpers.SetUpSessionAndProfile();
3324
}
3425

3526
[Fact]
3627
[Trait(Category.AcceptanceType, Category.CheckIn)]
3728
public void TestMaintenanceConfiguration()
3829
{
39-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzMaintenanceConfiguration");
30+
TestRunner.RunTestScript("Test-AzMaintenanceConfiguration");
4031
}
4132

4233
[Fact]
4334
[Trait(Category.AcceptanceType, Category.CheckIn)]
4435
public void TestMaintenanceConfigurationInGuestPatch()
4536
{
46-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzMaintenanceConfigurationInGuestPatch");
37+
TestRunner.RunTestScript("Test-AzMaintenanceConfigurationInGuestPatch");
4738
}
4839

4940
[Fact]
5041
[Trait(Category.AcceptanceType, Category.CheckIn)]
5142
public void TestConfigurationAssignment()
5243
{
53-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzConfigurationAssignment");
44+
TestRunner.RunTestScript("Test-AzConfigurationAssignment");
5445
}
5546

5647
[Fact]
5748
[Trait(Category.AcceptanceType, Category.CheckIn)]
5849
public void TestMaintenanceUpdate()
5950
{
60-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzMaintenanceUpdate");
51+
TestRunner.RunTestScript("Test-AzMaintenanceUpdate");
6152
}
6253

6354
[Fact]
6455
[Trait(Category.AcceptanceType, Category.CheckIn)]
6556
public void TestPublicMaintenanceConfiguration()
6657
{
67-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzMaintenancePublicConfiguration");
58+
TestRunner.RunTestScript("Test-AzMaintenancePublicConfiguration");
6859
}
6960
}
7061
}

src/Maintenance/Maintenance.Test/ScenarioTests/TestController.cs

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)