Skip to content

Commit afd7508

Browse files
Add RedisCacheTestRunner and replace Controller (#18222)
1 parent fbaa9e8 commit afd7508

File tree

3 files changed

+65
-141
lines changed

3 files changed

+65
-141
lines changed

src/RedisCache/RedisCache.Test/ScenarioTests/RedisCacheController.cs

Lines changed: 0 additions & 122 deletions
This file was deleted.
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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.RedisCache.Test.ScenarioTests
20+
{
21+
public class RedisCacheTestRunner
22+
{
23+
protected readonly ITestRunner TestRunner;
24+
25+
protected RedisCacheTestRunner(ITestOutputHelper output)
26+
{
27+
TestRunner = TestManager.CreateInstance(output)
28+
.WithNewPsScriptFilename($"{GetType().Name}.ps1")
29+
.WithProjectSubfolderForTests("ScenarioTests")
30+
.WithCommonPsScripts(new[]
31+
{
32+
@"../AzureRM.Storage.ps1",
33+
@"../AzureRM.Resources.ps1"
34+
})
35+
.WithNewRmModules(helper => new[]
36+
{
37+
helper.RMProfileModule,
38+
helper.GetRMModulePath("Az.RedisCache.psd1")
39+
})
40+
.WithNewRecordMatcherArguments(
41+
userAgentsToIgnore: new Dictionary<string, string>(),
42+
resourceProviders: new Dictionary<string, string>
43+
{
44+
{"Microsoft.Resources", null},
45+
{"Microsoft.Features", null},
46+
{"Microsoft.Authorization", null}
47+
}
48+
)
49+
.Build();
50+
}
51+
}
52+
}

src/RedisCache/RedisCache.Test/ScenarioTests/RedisCacheTests.cs

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,61 +15,55 @@
1515
namespace Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
19-
using ServiceManagement.Common.Models;
2018
using Xunit;
2119
using Xunit.Abstractions;
2220

23-
public class RedisCacheTests : RMTestBase
21+
public class RedisCacheTests : RedisCacheTestRunner
2422
{
25-
public XunitTracingInterceptor _logger;
26-
27-
public RedisCacheTests(ITestOutputHelper output)
23+
public RedisCacheTests(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 TestRedisCache()
3630
{
37-
RedisCacheController.NewInstance.RunPowerShellTest(_logger, "Test-RedisCache");
31+
TestRunner.RunTestScript("Test-RedisCache");
3832
}
3933

4034
[Fact]
4135
[Trait(Category.AcceptanceType, Category.CheckIn)]
4236
public void TestSetNonExistingRedisCacheTest()
4337
{
44-
RedisCacheController.NewInstance.RunPowerShellTest(_logger, "Test-SetNonExistingRedisCacheTest");
38+
TestRunner.RunTestScript("Test-SetNonExistingRedisCacheTest");
4539
}
4640

4741
[Fact]
4842
[Trait(Category.AcceptanceType, Category.CheckIn)]
4943
public void TestRedisCachePipeline()
5044
{
51-
RedisCacheController.NewInstance.RunPowerShellTest(_logger, "Test-RedisCachePipeline");
45+
TestRunner.RunTestScript("Test-RedisCachePipeline");
5246
}
5347

5448
[Fact]
5549
[Trait(Category.AcceptanceType, Category.CheckIn)]
5650
public void TestRedisCacheClustering()
5751
{
58-
RedisCacheController.NewInstance.RunPowerShellTest(_logger, "Test-RedisCacheClustering");
52+
TestRunner.RunTestScript("Test-RedisCacheClustering");
5953
}
6054

6155
[Fact]
6256
[Trait(Category.AcceptanceType, Category.CheckIn)]
6357
public void TestRedisCachePatchSchedules()
6458
{
65-
RedisCacheController.NewInstance.RunPowerShellTest(_logger, "Test-RedisCachePatchSchedules");
59+
TestRunner.RunTestScript("Test-RedisCachePatchSchedules");
6660
}
6761

6862
[Fact]
6963
[Trait(Category.AcceptanceType, Category.CheckIn)]
7064
public void TestImportExportReboot()
7165
{
72-
RedisCacheController.NewInstance.RunPowerShellTest(_logger, "Test-ImportExportReboot");
66+
TestRunner.RunTestScript("Test-ImportExportReboot");
7367
}
7468

7569
#if NETSTANDARD
@@ -80,35 +74,35 @@ public void TestImportExportReboot()
8074
[Trait(Category.AcceptanceType, Category.CheckIn)]
8175
public void TestDiagnosticOperations()
8276
{
83-
RedisCacheController.NewInstance.RunPowerShellTest(_logger, "Test-DiagnosticOperations");
77+
TestRunner.RunTestScript("Test-DiagnosticOperations");
8478
}
8579

8680
[Fact]
8781
[Trait(Category.AcceptanceType, Category.CheckIn)]
8882
public void TestGeoReplication()
8983
{
90-
RedisCacheController.NewInstance.RunPowerShellTest(_logger, "Test-GeoReplication");
84+
TestRunner.RunTestScript("Test-GeoReplication");
9185
}
9286

9387
[Fact]
9488
[Trait(Category.AcceptanceType, Category.CheckIn)]
9589
public void TestFirewallRule()
9690
{
97-
RedisCacheController.NewInstance.RunPowerShellTest(_logger, "Test-FirewallRule");
91+
TestRunner.RunTestScript("Test-FirewallRule");
9892
}
9993

10094
[Fact]
10195
[Trait(Category.AcceptanceType, Category.CheckIn)]
10296
public void TestZones()
10397
{
104-
RedisCacheController.NewInstance.RunPowerShellTest(_logger, "Test-Zones");
98+
TestRunner.RunTestScript("Test-Zones");
10599
}
106100

107101
[Fact]
108102
[Trait(Category.AcceptanceType, Category.CheckIn)]
109103
public void TestManagedIdentity()
110104
{
111-
RedisCacheController.NewInstance.RunPowerShellTest(_logger, "Test-ManagedIdentity");
105+
TestRunner.RunTestScript("Test-ManagedIdentity");
112106
}
113107
}
114108
}

0 commit comments

Comments
 (0)