Skip to content

Commit f6b28b8

Browse files
CaptainFanZzzCaptainFanZzz
authored
Add CdnTestRunner and replace TestController (#18066)
* Add CdnTestRunner and replace TestController * Add CdnTestRunner and replace TestController
1 parent 45cc564 commit f6b28b8

18 files changed

+144
-290
lines changed

‎src/Cdn/Cdn.Test/ScenarioTests/AfdCustomDomainTests.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,24 @@
1717

1818
namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class AfdCustomDomainTests
20+
public class AfdCustomDomainTests : CdnTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public AfdCustomDomainTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public AfdCustomDomainTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact(Skip = "Test is flaky due to creation of custom domain issue which prolongs response time. Will enable once RP issue is resolved.")]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestCreateAfdCustomDomain()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateAfdCustomDomain");
30+
TestRunner.RunTestScript("Test-CreateAfdCustomDomain");
3531
}
3632

3733
[Fact(Skip = "Test is flaky due to RP issue which prolongs response time. Will enable once RP issue is resolved.")]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestGetAfdCustomDomain()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetAfdCustomDomain");
37+
TestRunner.RunTestScript("Test-GetAfdCustomDomain");
4238
}
4339
}
4440
}

‎src/Cdn/Cdn.Test/ScenarioTests/AfdEndpointTests.cs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,38 @@
1717

1818
namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class AfdEndpointTests
20+
public class AfdEndpointTests : CdnTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public AfdEndpointTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public AfdEndpointTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestCreateAfdEndpoint()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateAfdEndpoint");
30+
TestRunner.RunTestScript("Test-CreateAfdEndpoint");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestGetAfdEndpoint()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetAfdEndpoint");
37+
TestRunner.RunTestScript("Test-GetAfdEndpoint");
4238
}
4339

4440
[Fact]
4541
[Trait(Category.AcceptanceType, Category.CheckIn)]
4642
public void TestRemoveAfdEndpoint()
4743
{
48-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveAfdEndpoint");
44+
TestRunner.RunTestScript("Test-RemoveAfdEndpoint");
4945
}
5046

5147
[Fact]
5248
[Trait(Category.AcceptanceType, Category.CheckIn)]
5349
public void TestSetAfdEndpoint()
5450
{
55-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-SetAfdEndpoint");
51+
TestRunner.RunTestScript("Test-SetAfdEndpoint");
5652
}
5753
}
5854
}

‎src/Cdn/Cdn.Test/ScenarioTests/AfdOriginGroupTests.cs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,38 @@
1717

1818
namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class AfdOriginGroupTests
20+
public class AfdOriginGroupTests : CdnTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public AfdOriginGroupTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public AfdOriginGroupTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestCreateAfdOriginGroup()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateAfdOriginGroup");
30+
TestRunner.RunTestScript("Test-CreateAfdOriginGroup");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestGetAfdOriginGroup()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetAfdOriginGroup");
37+
TestRunner.RunTestScript("Test-GetAfdOriginGroup");
4238
}
4339

4440
[Fact]
4541
[Trait(Category.AcceptanceType, Category.CheckIn)]
4642
public void TestSetAfdOriginGroup()
4743
{
48-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-SetAfdOriginGroup");
44+
TestRunner.RunTestScript("Test-SetAfdOriginGroup");
4945
}
5046

5147
[Fact]
5248
[Trait(Category.AcceptanceType, Category.CheckIn)]
5349
public void TestRemoveAfdOriginGroup()
5450
{
55-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveAfdOriginGroup");
51+
TestRunner.RunTestScript("Test-RemoveAfdOriginGroup");
5652
}
5753
}
5854
}

‎src/Cdn/Cdn.Test/ScenarioTests/AfdOriginTests.cs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,31 @@
1717

1818
namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class AfdOriginTests
20+
public class AfdOriginTests : CdnTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public AfdOriginTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public AfdOriginTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestCreateAfdOrigin()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateAfdOrigin");
30+
TestRunner.RunTestScript("Test-CreateAfdOrigin");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestGetAfdOrigin()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetAfdOrigin");
37+
TestRunner.RunTestScript("Test-GetAfdOrigin");
4238
}
4339

4440
[Fact]
4541
[Trait(Category.AcceptanceType, Category.CheckIn)]
4642
public void TestSetAfdOrigin()
4743
{
48-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-SetAfdOrigin");
44+
TestRunner.RunTestScript("Test-SetAfdOrigin");
4945
}
5046
}
5147
}

‎src/Cdn/Cdn.Test/ScenarioTests/AfdProfileTests.cs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,38 @@
1717

1818
namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class AfdProfileTests
20+
public class AfdProfileTests : CdnTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public AfdProfileTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public AfdProfileTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestCreateStandardAfdProfile()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateStandardAfdProfile");
30+
TestRunner.RunTestScript("Test-CreateStandardAfdProfile");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestCreatePremiumAfdProfile()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreatePremiumAfdProfile");
37+
TestRunner.RunTestScript("Test-CreatePremiumAfdProfile");
4238
}
4339

4440
[Fact]
4541
[Trait(Category.AcceptanceType, Category.CheckIn)]
4642
public void TestGetStandardAfdProfile()
4743
{
48-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetStandardAfdProfile");
44+
TestRunner.RunTestScript("Test-GetStandardAfdProfile");
4945
}
5046

5147
[Fact]
5248
[Trait(Category.AcceptanceType, Category.CheckIn)]
5349
public void TestRemovePremiumAfdProfile()
5450
{
55-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-RemovePremiumAfdProfile");
51+
TestRunner.RunTestScript("Test-RemovePremiumAfdProfile");
5652
}
5753
}
5854
}

‎src/Cdn/Cdn.Test/ScenarioTests/AfdRouteTests.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,24 @@
1717

1818
namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class AfdRouteTests
20+
public class AfdRouteTests : CdnTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public AfdRouteTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public AfdRouteTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact(Skip = "Test is flaky due to creation of custom domain issue which prolongs response time. Will enable once RP issue is resolved.")]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestCreateAfdRoute()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateAfdRoute");
30+
TestRunner.RunTestScript("Test-CreateAfdRoute");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestGetAfdRoute()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetAfdRoute");
37+
TestRunner.RunTestScript("Test-GetAfdRoute");
4238
}
4339
}
4440
}

‎src/Cdn/Cdn.Test/ScenarioTests/AfdRuleSetTests.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,24 @@
1717

1818
namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class AfdRuleSetTests
20+
public class AfdRuleSetTests : CdnTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public AfdRuleSetTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public AfdRuleSetTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestCreateAfdRuleSet()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateAfdRuleSet");
30+
TestRunner.RunTestScript("Test-CreateAfdRuleSet");
3531
}
3632

3733
[Fact]
3834
[Trait(Category.AcceptanceType, Category.CheckIn)]
3935
public void TestRemoveAfdRuleSet()
4036
{
41-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveAfdRuleSet");
37+
TestRunner.RunTestScript("Test-RemoveAfdRuleSet");
4238
}
4339
}
4440
}

‎src/Cdn/Cdn.Test/ScenarioTests/AfdRuleTests.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,17 @@
1717

1818
namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class AfdRuleTests
20+
public class AfdRuleTests : CdnTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public AfdRuleTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public AfdRuleTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestCreateAfdRule()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateAfdRule");
30+
TestRunner.RunTestScript("Test-CreateAfdRule");
3531
}
3632
}
3733
}

‎src/Cdn/Cdn.Test/ScenarioTests/AfdSecurityPolicyTests.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,17 @@
1717

1818
namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
1919
{
20-
public class AfdSecurityPolicyTests
20+
public class AfdSecurityPolicyTests : CdnTestRunner
2121
{
22-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
23-
24-
public AfdSecurityPolicyTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public AfdSecurityPolicyTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2523
{
26-
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
27-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2824
}
2925

3026
[Fact]
3127
[Trait(Category.AcceptanceType, Category.CheckIn)]
3228
public void TestGetAfdSecurityPolicy()
3329
{
34-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetAfdSecurityPolicy");
30+
TestRunner.RunTestScript("Test-GetAfdSecurityPolicy");
3531
}
3632
}
3733
}

‎src/Cdn/Cdn.Test/ScenarioTests/CdnTestRunner.cs

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.Cdn.Test.ScenarioTests
20+
{
21+
public class CdnTestRunner
22+
{
23+
protected readonly ITestRunner TestRunner;
24+
25+
protected CdnTestRunner(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.Cdn.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.Compute", null}
51+
}
52+
)
53+
.Build();
54+
}
55+
}
56+
}

0 commit comments

Comments
 (0)