Skip to content

Commit dfd0739

Browse files
v-yuzhichenv-yuzhichen
authored
Add PeeringTestRunner to replace TestController (#18246)
1 parent c08b6c0 commit dfd0739

19 files changed

+152
-355
lines changed

‎src/Peering/Peering.Test/ScenarioTests/ConvertLegacyTests.cs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,16 @@ namespace Microsoft.Azure.Commands.Peering.Test.ScenarioTests
2121
/// <summary>
2222
/// The get legacy tests.
2323
/// </summary>
24-
public class ConvertLegacyTests
24+
public class ConvertLegacyTests : PeeringTestRunner
2525
{
26-
/// <summary>
27-
/// The logger.
28-
/// </summary>
29-
private ServiceManagement.Common.Models.XunitTracingInterceptor logger;
30-
3126
/// <summary>
3227
/// Initializes a new instance of the <see cref="GetLegacyTests"/> class.
3328
/// </summary>
3429
/// <param name="output">
3530
/// The output.
3631
/// </param>
37-
public ConvertLegacyTests(Xunit.Abstractions.ITestOutputHelper output)
32+
public ConvertLegacyTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
3833
{
39-
this.logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
40-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(this.logger);
4134
}
4235

4336
/// <summary>
@@ -47,7 +40,7 @@ public ConvertLegacyTests(Xunit.Abstractions.ITestOutputHelper output)
4740
[Trait(Category.AcceptanceType, Category.CheckIn)]
4841
public void TestConvertLegacyKindExchangeAshburn()
4942
{
50-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-ConvertLegacyKindExchangeAshburn");
43+
TestRunner.RunTestScript("Test-ConvertLegacyKindExchangeAshburn");
5144
}
5245

5346
/// <summary>
@@ -57,7 +50,7 @@ public void TestConvertLegacyKindExchangeAshburn()
5750
[Trait(Category.AcceptanceType, Category.CheckIn)]
5851
public void TestConvertLegacyKindExchangeAmsterdamWithNewConnection()
5952
{
60-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-ConvertLegacyKindExchangeAmsterdamWithNewConnection");
53+
TestRunner.RunTestScript("Test-ConvertLegacyKindExchangeAmsterdamWithNewConnection");
6154
}
6255
}
6356
}

‎src/Peering/Peering.Test/ScenarioTests/CreateNewDirectConnectionTests.cs

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
namespace Microsoft.Azure.Commands.Peering.Test.ScenarioTests
1616
{
17-
using Microsoft.Azure.ServiceManagement.Common.Models;
1817
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1918

2019
using Xunit;
@@ -23,23 +22,16 @@ namespace Microsoft.Azure.Commands.Peering.Test.ScenarioTests
2322
/// <summary>
2423
/// The create new direct connection tests.
2524
/// </summary>
26-
public class CreateNewDirectConnectionTests
25+
public class CreateNewDirectConnectionTests : PeeringTestRunner
2726
{
28-
/// <summary>
29-
/// The logger.
30-
/// </summary>
31-
private XunitTracingInterceptor logger;
32-
3327
/// <summary>
3428
/// Initializes a new instance of the <see cref="CreateNewDirectConnectionTests"/> class.
3529
/// </summary>
3630
/// <param name="output">
3731
/// The output.
3832
/// </param>
39-
public CreateNewDirectConnectionTests(ITestOutputHelper output)
33+
public CreateNewDirectConnectionTests(ITestOutputHelper output) : base(output)
4034
{
41-
this.logger = new XunitTracingInterceptor(output);
42-
XunitTracingInterceptor.AddToContext(this.logger);
4335
}
4436

4537
/// <summary>
@@ -49,7 +41,7 @@ public CreateNewDirectConnectionTests(ITestOutputHelper output)
4941
[Trait(Category.AcceptanceType, Category.CheckIn)]
5042
public void TestNewDirectConnectionHighBandwidth()
5143
{
52-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionHighBandwidth");
44+
TestRunner.RunTestScript("Test-NewDirectConnectionHighBandwidth");
5345
}
5446

5547
/// <summary>
@@ -59,7 +51,7 @@ public void TestNewDirectConnectionHighBandwidth()
5951
[Trait(Category.AcceptanceType, Category.CheckIn)]
6052
public void TestNewDirectConnectionLowBandwidth()
6153
{
62-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionLowBandwidth");
54+
TestRunner.RunTestScript("Test-NewDirectConnectionLowBandwidth");
6355
}
6456

6557
/// <summary>
@@ -69,7 +61,7 @@ public void TestNewDirectConnectionLowBandwidth()
6961
[Trait(Category.AcceptanceType, Category.CheckIn)]
7062
public void TestNewDirectConnectionNoSession()
7163
{
72-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionNoSession");
64+
TestRunner.RunTestScript("Test-NewDirectConnectionNoSession");
7365
}
7466

7567
/// <summary>
@@ -79,7 +71,7 @@ public void TestNewDirectConnectionNoSession()
7971
[Trait(Category.AcceptanceType, Category.CheckIn)]
8072
public void TestNewDirectConnectionWithV4()
8173
{
82-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWithV4");
74+
TestRunner.RunTestScript("Test-NewDirectConnectionWithV4");
8375
}
8476

8577
/// <summary>
@@ -89,7 +81,7 @@ public void TestNewDirectConnectionWithV4()
8981
[Trait(Category.AcceptanceType, Category.CheckIn)]
9082
public void TestNewDirectConnectionWithV4V6()
9183
{
92-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWithV4V6");
84+
TestRunner.RunTestScript("Test-NewDirectConnectionWithV4V6");
9385
}
9486

9587
/// <summary>
@@ -99,7 +91,7 @@ public void TestNewDirectConnectionWithV4V6()
9991
[Trait(Category.AcceptanceType, Category.CheckIn)]
10092
public void TestNewDirectConnectionWithV6()
10193
{
102-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWithV6");
94+
TestRunner.RunTestScript("Test-NewDirectConnectionWithV6");
10395
}
10496

10597
/// <summary>
@@ -109,7 +101,7 @@ public void TestNewDirectConnectionWithV6()
109101
[Trait(Category.AcceptanceType, Category.CheckIn)]
110102
public void TestNewDirectConnectionWrongV4()
111103
{
112-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWrongV4");
104+
TestRunner.RunTestScript("Test-NewDirectConnectionWrongV4");
113105
}
114106

115107
/// <summary>
@@ -119,7 +111,7 @@ public void TestNewDirectConnectionWrongV4()
119111
[Trait(Category.AcceptanceType, Category.CheckIn)]
120112
public void TestNewDirectConnectionWrongV6()
121113
{
122-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWrongV6");
114+
TestRunner.RunTestScript("Test-NewDirectConnectionWrongV6");
123115
}
124116

125117
/// <summary>
@@ -129,7 +121,7 @@ public void TestNewDirectConnectionWrongV6()
129121
[Trait(Category.AcceptanceType, Category.CheckIn)]
130122
public void TestNewDirectConnectionWithMicrosoftSession()
131123
{
132-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWithMicrosoftSession");
124+
TestRunner.RunTestScript("Test-NewDirectConnectionWithMicrosoftSession");
133125
}
134126

135127
/// <summary>
@@ -139,7 +131,7 @@ public void TestNewDirectConnectionWithMicrosoftSession()
139131
[Trait(Category.AcceptanceType, Category.CheckIn)]
140132
public void TestNewDirectConnectionWithMicrosoftSessionWithPeeringService()
141133
{
142-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWithMicrosoftSessionWithPeeringService");
134+
TestRunner.RunTestScript("Test-NewDirectConnectionWithMicrosoftSessionWithPeeringService");
143135
}
144136

145137
/// <summary>
@@ -149,7 +141,7 @@ public void TestNewDirectConnectionWithMicrosoftSessionWithPeeringService()
149141
[Trait(Category.AcceptanceType, Category.CheckIn)]
150142
public void TestNewDirectConnectionWithMicrosoftSessionInvalidV4()
151143
{
152-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWithMicrosoftSessionInvalidV4");
144+
TestRunner.RunTestScript("Test-NewDirectConnectionWithMicrosoftSessionInvalidV4");
153145
}
154146

155147
/// <summary>
@@ -159,7 +151,7 @@ public void TestNewDirectConnectionWithMicrosoftSessionInvalidV4()
159151
[Trait(Category.AcceptanceType, Category.CheckIn)]
160152
public void TestNewDirectConnectionWithMicrosoftSessionInvalidV6()
161153
{
162-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWithMicrosoftSessionInvalidV6");
154+
TestRunner.RunTestScript("Test-NewDirectConnectionWithMicrosoftSessionInvalidV6");
163155
}
164156

165157
/// <summary>
@@ -169,7 +161,7 @@ public void TestNewDirectConnectionWithMicrosoftSessionInvalidV6()
169161
[Trait(Category.AcceptanceType, Category.CheckIn)]
170162
public void TestNewDirectConnectionWithNoPeeringFacility()
171163
{
172-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWithNoPeeringFacility");
164+
TestRunner.RunTestScript("Test-NewDirectConnectionWithNoPeeringFacility");
173165
}
174166

175167
/// <summary>
@@ -179,7 +171,7 @@ public void TestNewDirectConnectionWithNoPeeringFacility()
179171
[Trait(Category.AcceptanceType, Category.CheckIn)]
180172
public void TestNewDirectConnectionWithNoBgpSession()
181173
{
182-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWithNoBgpSession");
174+
TestRunner.RunTestScript("Test-NewDirectConnectionWithNoBgpSession");
183175
}
184176

185177
/// <summary>
@@ -189,7 +181,7 @@ public void TestNewDirectConnectionWithNoBgpSession()
189181
[Trait(Category.AcceptanceType, Category.CheckIn)]
190182
public void TestNewDirectConnectionWithMicrosoftIpProvidedAddress()
191183
{
192-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectConnectionWithMicrosoftIpProvidedAddress");
184+
TestRunner.RunTestScript("Test-NewDirectConnectionWithMicrosoftIpProvidedAddress");
193185
}
194186
}
195187
}

‎src/Peering/Peering.Test/ScenarioTests/CreateNewDirectPeeringTests.cs

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,23 @@
1414

1515
namespace Microsoft.Azure.Commands.Peering.Test.ScenarioTests
1616
{
17-
using System;
1817
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1918

2019
using Xunit;
2120

2221
/// <summary>
2322
/// The create new peering tests.
2423
/// </summary>
25-
public class CreateNewDirectPeeringTests
24+
public class CreateNewDirectPeeringTests : PeeringTestRunner
2625
{
27-
/// <summary>
28-
/// The _logger.
29-
/// </summary>
30-
private ServiceManagement.Common.Models.XunitTracingInterceptor logger;
31-
3226
/// <summary>
3327
/// Initializes a new instance of the <see cref="CreateNewDirectPeeringTests"/> class.
3428
/// </summary>
3529
/// <param name="output">
3630
/// The output.
3731
/// </param>
38-
public CreateNewDirectPeeringTests(Xunit.Abstractions.ITestOutputHelper output)
32+
public CreateNewDirectPeeringTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
3933
{
40-
this.logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
41-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(this.logger);
42-
4334
}
4435

4536
/// <summary>
@@ -49,7 +40,7 @@ public CreateNewDirectPeeringTests(Xunit.Abstractions.ITestOutputHelper output)
4940
[Trait(Category.AcceptanceType, Category.CheckIn)]
5041
public void TestNewDirectPeering()
5142
{
52-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectPeering");
43+
TestRunner.RunTestScript("Test-NewDirectPeering");
5344
}
5445

5546
/// <summary>
@@ -59,7 +50,7 @@ public void TestNewDirectPeering()
5950
[Trait(Category.AcceptanceType, Category.CheckIn)]
6051
public void TestNewDirectPeeringWithPipe()
6152
{
62-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectPeeringWithPipe");
53+
TestRunner.RunTestScript("Test-NewDirectPeeringWithPipe");
6354
}
6455

6556
/// <summary>
@@ -69,7 +60,7 @@ public void TestNewDirectPeeringWithPipe()
6960
[Trait(Category.AcceptanceType, Category.CheckIn)]
7061
public void TestNewDirectPeeringPipeTwoConnections()
7162
{
72-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectPeeringPipeTwoConnections");
63+
TestRunner.RunTestScript("Test-NewDirectPeeringPipeTwoConnections");
7364
}
7465

7566
/// <summary>
@@ -79,7 +70,7 @@ public void TestNewDirectPeeringPipeTwoConnections()
7970
[Trait(Category.AcceptanceType, Category.CheckIn)]
8071
public void TestNewDirectPeeringPremiumDirectFree()
8172
{
82-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectPeeringPremiumDirectFree");
73+
TestRunner.RunTestScript("Test-NewDirectPeeringPremiumDirectFree");
8374
}
8475

8576
/// <summary>
@@ -89,7 +80,7 @@ public void TestNewDirectPeeringPremiumDirectFree()
8980
[Trait(Category.AcceptanceType, Category.CheckIn)]
9081
public void TestNewDirectPeeringPremiumDirectUnlimited()
9182
{
92-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewDirectPeeringPremiumDirectUnlimited");
83+
TestRunner.RunTestScript("Test-NewDirectPeeringPremiumDirectUnlimited");
9384
}
9485
}
9586
}

‎src/Peering/Peering.Test/ScenarioTests/CreateNewExchangeConnectionTests.cs

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,18 @@
1515
namespace Microsoft.Azure.Commands.Peering.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
1918
using Xunit;
2019

21-
/// <summary>
22-
/// The create new exchange connection tests.
23-
/// </summary>
24-
public class CreateNewExchangeConnectionTests
20+
public class CreateNewExchangeConnectionTests : PeeringTestRunner
2521
{
26-
/// <summary>
27-
/// The _logger.
28-
/// </summary>
29-
private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
30-
3122
/// <summary>
3223
/// Initializes a new instance of the <see cref="CreateNewExchangeConnectionTests"/> class.
3324
/// </summary>
3425
/// <param name="output">
3526
/// The output.
3627
/// </param>
37-
public CreateNewExchangeConnectionTests(Xunit.Abstractions.ITestOutputHelper output)
28+
public CreateNewExchangeConnectionTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
3829
{
39-
this._logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
40-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(this._logger);
4130
}
4231

4332
/// <summary>
@@ -47,7 +36,7 @@ public CreateNewExchangeConnectionTests(Xunit.Abstractions.ITestOutputHelper out
4736
[Trait(Category.AcceptanceType, Category.CheckIn)]
4837
public void TestNewExchangeConnectionV4V6()
4938
{
50-
TestController.NewInstance.RunPowerShellTest(this._logger, "Test-NewExchangeConnectionV4V6");
39+
TestRunner.RunTestScript("Test-NewExchangeConnectionV4V6");
5140
}
5241

5342
/// <summary>
@@ -57,7 +46,7 @@ public void TestNewExchangeConnectionV4V6()
5746
[Trait(Category.AcceptanceType, Category.CheckIn)]
5847
public void TestNewExchangeConnectionV4()
5948
{
60-
TestController.NewInstance.RunPowerShellTest(this._logger, "Test-NewExchangeConnectionV4");
49+
TestRunner.RunTestScript("Test-NewExchangeConnectionV4");
6150
}
6251

6352
/// <summary>
@@ -67,7 +56,7 @@ public void TestNewExchangeConnectionV4()
6756
[Trait(Category.AcceptanceType, Category.CheckIn)]
6857
public void TestNewExchangeConnectionV6()
6958
{
70-
TestController.NewInstance.RunPowerShellTest(this._logger, "Test-NewExchangeConnectionV6");
59+
TestRunner.RunTestScript("Test-NewExchangeConnectionV6");
7160
}
7261
}
7362
}

‎src/Peering/Peering.Test/ScenarioTests/CreateNewExchangePeeringTests.cs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,16 @@ namespace Microsoft.Azure.Commands.Peering.Test.ScenarioTests
2121
/// <summary>
2222
/// The create new peering tests.
2323
/// </summary>
24-
public class CreateNewExchangePeeringTests
24+
public class CreateNewExchangePeeringTests : PeeringTestRunner
2525
{
26-
/// <summary>
27-
/// The _logger.
28-
/// </summary>
29-
private ServiceManagement.Common.Models.XunitTracingInterceptor logger;
30-
3126
/// <summary>
3227
/// Initializes a new instance of the <see cref="CreateNewExchangePeeringTests"/> class.
3328
/// </summary>
3429
/// <param name="output">
3530
/// The output.
3631
/// </param>
37-
public CreateNewExchangePeeringTests(Xunit.Abstractions.ITestOutputHelper output)
32+
public CreateNewExchangePeeringTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
3833
{
39-
this.logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
40-
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(this.logger);
4134
}
4235

4336
/// <summary>
@@ -47,7 +40,7 @@ public CreateNewExchangePeeringTests(Xunit.Abstractions.ITestOutputHelper output
4740
[Trait(Category.AcceptanceType, Category.CheckIn)]
4841
public void TestNewExchangePeering()
4942
{
50-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewExchangePeering");
43+
TestRunner.RunTestScript("Test-NewExchangePeering");
5144
}
5245

5346
/// <summary>
@@ -57,7 +50,7 @@ public void TestNewExchangePeering()
5750
[Trait(Category.AcceptanceType, Category.CheckIn)]
5851
public void TestNewExchangePeeringPipe()
5952
{
60-
TestController.NewInstance.RunPowerShellTest(this.logger, "Test-NewExchangePeeringPipe");
53+
TestRunner.RunTestScript("Test-NewExchangePeeringPipe");
6154
}
6255
}
6356
}

0 commit comments

Comments
 (0)