Skip to content

Commit e3d6563

Browse files
Add MediaTestRunner and replace TestController (#18170)
1 parent a88dbd3 commit e3d6563

File tree

3 files changed

+61
-143
lines changed

3 files changed

+61
-143
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
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.Media.Test.ScenarioTests
20+
{
21+
public class MediaTestRunner
22+
{
23+
protected readonly ITestRunner TestRunner;
24+
25+
protected MediaTestRunner(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+
@"../AzureRM.Storage.ps1"
35+
})
36+
.WithNewRmModules(helper => new[]
37+
{
38+
helper.RMProfileModule,
39+
helper.GetRMModulePath("Az.Media.psd1")
40+
})
41+
.WithNewRecordMatcherArguments(
42+
userAgentsToIgnore: new Dictionary<string, string>
43+
{
44+
{"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"}
45+
},
46+
resourceProviders: new Dictionary<string, string>
47+
{
48+
{"Microsoft.Resources", null},
49+
{"Microsoft.Features", null},
50+
{"Microsoft.Authorization", null},
51+
{"Microsoft.Compute", null}
52+
}
53+
)
54+
.Build();
55+
}
56+
}
57+
}

src/Media/Media.Test/ScenarioTests/MediaTests.cs

+4-8
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,24 @@ namespace Microsoft.Azure.Commands.Media.Test.ScenarioTests
2020
/// <summary>
2121
/// Test for all media related cmdlets
2222
/// </summary>
23-
public class MediaTests
23+
public class MediaTests : MediaTestRunner
2424
{
25-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
26-
27-
public MediaTests(Xunit.Abstractions.ITestOutputHelper output)
25+
public MediaTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2826
{
29-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
30-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
3127
}
3228

3329
[Fact(Skip = "Old ResourceManager version in test controller. Udpate and re-record.")]
3430
[Trait(Category.AcceptanceType, Category.CheckIn)]
3531
public void TestMedia()
3632
{
37-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-Media");
33+
TestRunner.RunTestScript("Test-Media");
3834
}
3935

4036
[Fact(Skip = "Old ResourceManager version in test controller. Udpate and re-record.")]
4137
[Trait(Category.AcceptanceType, Category.CheckIn)]
4238
public void TestMediaWithPiping()
4339
{
44-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-MediaWithPiping");
40+
TestRunner.RunTestScript("Test-MediaWithPiping");
4541
}
4642
}
4743
}

src/Media/Media.Test/ScenarioTests/TestController.cs

-135
This file was deleted.

0 commit comments

Comments
 (0)