Skip to content

Commit 613efe0

Browse files
authored
Add TrafficManagerTestRunner to replace TestController (#18243)
1 parent a60a431 commit 613efe0

File tree

5 files changed

+106
-197
lines changed

5 files changed

+106
-197
lines changed

src/TrafficManager/TrafficManager.Test/ScenarioTests/EndpointTests.cs

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,164 +15,159 @@
1515
namespace Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using ServiceManagement.Common.Models;
1918
using Xunit;
2019
using Xunit.Abstractions;
21-
public class EndpointTests
20+
public class EndpointTests : TrafficManagerTestRunner
2221
{
23-
public XunitTracingInterceptor _logger;
24-
25-
public EndpointTests(ITestOutputHelper output)
22+
public EndpointTests(ITestOutputHelper output) : base(output)
2623
{
27-
_logger = new XunitTracingInterceptor(output);
28-
XunitTracingInterceptor.AddToContext(_logger);
2924
}
3025

3126
[Fact]
3227
[Trait(Category.AcceptanceType, Category.CheckIn)]
3328
public void TestAddEndpoint()
3429
{
35-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AddEndpoint");
30+
TestRunner.RunTestScript("Test-AddEndpoint");
3631
}
3732

3833
[Fact]
3934
[Trait(Category.AcceptanceType, Category.CheckIn)]
4035
public void TestDeleteEndpoint()
4136
{
42-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-DeleteEndpoint");
37+
TestRunner.RunTestScript("Test-DeleteEndpoint");
4338
}
4439

4540
[Fact]
4641
[Trait(Category.AcceptanceType, Category.CheckIn)]
4742
public void TestEndpointCrud()
4843
{
49-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrud");
44+
TestRunner.RunTestScript("Test-EndpointCrud");
5045
}
5146

5247
[Fact]
5348
[Trait(Category.AcceptanceType, Category.CheckIn)]
5449
public void TestEndpointCrudGeo()
5550
{
56-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrudGeo");
51+
TestRunner.RunTestScript("Test-EndpointCrudGeo");
5752
}
5853

5954
[Fact]
6055
[Trait(Category.AcceptanceType, Category.CheckIn)]
6156
public void TestEndpointCrudPiping()
6257
{
63-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrudPiping");
58+
TestRunner.RunTestScript("Test-EndpointCrudPiping");
6459
}
6560

6661
[Fact]
6762
[Trait(Category.AcceptanceType, Category.CheckIn)]
6863
public void TestCreateExistingEndpoint()
6964
{
70-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateExistingEndpoint");
65+
TestRunner.RunTestScript("Test-CreateExistingEndpoint");
7166
}
7267

7368
[Fact]
7469
[Trait(Category.AcceptanceType, Category.CheckIn)]
7570
public void TestCreateExistingEndpointFromNonExistingProfile()
7671
{
77-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CreateExistingEndpointFromNonExistingProfile");
72+
TestRunner.RunTestScript("Test-CreateExistingEndpointFromNonExistingProfile");
7873
}
7974

8075
[Fact]
8176
[Trait(Category.AcceptanceType, Category.CheckIn)]
8277
public void TestRemoveExistingEndpointFromNonExistingProfile()
8378
{
84-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveExistingEndpointFromNonExistingProfile");
79+
TestRunner.RunTestScript("Test-RemoveExistingEndpointFromNonExistingProfile");
8580
}
8681

8782
[Fact]
8883
[Trait(Category.AcceptanceType, Category.CheckIn)]
8984
public void TestGetExistingEndpointFromNonExistingProfile()
9085
{
91-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetExistingEndpointFromNonExistingProfile");
86+
TestRunner.RunTestScript("Test-GetExistingEndpointFromNonExistingProfile");
9287
}
9388

9489
[Fact]
9590
[Trait(Category.AcceptanceType, Category.CheckIn)]
9691
public void TestRemoveNonExistingEndpointFromProfile()
9792
{
98-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-RemoveNonExistingEndpointFromProfile");
93+
TestRunner.RunTestScript("Test-RemoveNonExistingEndpointFromProfile");
9994
}
10095

10196
[Fact]
10297
[Trait(Category.AcceptanceType, Category.CheckIn)]
10398
public void TestEnableEndpoint()
10499
{
105-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-EnableEndpoint");
100+
TestRunner.RunTestScript("Test-EnableEndpoint");
106101
}
107102

108103
[Fact]
109104
[Trait(Category.AcceptanceType, Category.CheckIn)]
110105
public void TestDisableEndpoint()
111106
{
112-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-DisableEndpoint");
107+
TestRunner.RunTestScript("Test-DisableEndpoint");
113108
}
114109

115110
[Fact]
116111
[Trait(Category.AcceptanceType, Category.CheckIn)]
117112
public void TestEnableEndpointUsingPiping()
118113
{
119-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-EnableEndpointUsingPiping");
114+
TestRunner.RunTestScript("Test-EnableEndpointUsingPiping");
120115
}
121116

122117
[Fact]
123118
[Trait(Category.AcceptanceType, Category.CheckIn)]
124119
public void TestEnableEndpointUsingPipingFromGetProfile()
125120
{
126-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-EnableEndpointUsingPipingFromGetProfile");
121+
TestRunner.RunTestScript("Test-EnableEndpointUsingPipingFromGetProfile");
127122
}
128123

129124
[Fact]
130125
[Trait(Category.AcceptanceType, Category.CheckIn)]
131126
public void TestDisableEndpointUsingPiping()
132127
{
133-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-DisableEndpointUsingPiping");
128+
TestRunner.RunTestScript("Test-DisableEndpointUsingPiping");
134129
}
135130

136131
[Fact]
137132
[Trait(Category.AcceptanceType, Category.CheckIn)]
138133
public void TestEnableNonExistingEndpoint()
139134
{
140-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-EnableNonExistingEndpoint");
135+
TestRunner.RunTestScript("Test-EnableNonExistingEndpoint");
141136
}
142137

143138
[Fact]
144139
[Trait(Category.AcceptanceType, Category.CheckIn)]
145140
public void TestDisableNonExistingEndpoint()
146141
{
147-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-DisableNonExistingEndpoint");
142+
TestRunner.RunTestScript("Test-DisableNonExistingEndpoint");
148143
}
149144

150145
[Fact]
151146
[Trait(Category.AcceptanceType, Category.CheckIn)]
152147
public void TestEndpointTypeCaseInsensitive()
153148
{
154-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointTypeCaseInsensitive");
149+
TestRunner.RunTestScript("Test-EndpointTypeCaseInsensitive");
155150
}
156151

157152
[Fact]
158153
[Trait(Category.AcceptanceType, Category.CheckIn)]
159154
public void TestPipeEndpointFromGetEndpoint()
160155
{
161-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-PipeEndpointFromGetEndpoint");
156+
TestRunner.RunTestScript("Test-PipeEndpointFromGetEndpoint");
162157
}
163158

164159
[Fact]
165160
[Trait(Category.AcceptanceType, Category.CheckIn)]
166161
public void TestPipeEndpointFromGetProfile()
167162
{
168-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-PipeEndpointFromGetProfile");
163+
TestRunner.RunTestScript("Test-PipeEndpointFromGetProfile");
169164
}
170165

171166
[Fact]
172167
[Trait(Category.AcceptanceType, Category.CheckIn)]
173168
public void TestAddAndRemoveCustomHeadersFromEndpoint()
174169
{
175-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AddAndRemoveCustomHeadersFromEndpoint");
170+
TestRunner.RunTestScript("Test-AddAndRemoveCustomHeadersFromEndpoint");
176171
}
177172

178173
// This scenario is not supported with current API specs. Commenting this test.

src/TrafficManager/TrafficManager.Test/ScenarioTests/NestedEndpointsTests.cs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,26 @@
1515
namespace Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using ServiceManagement.Common.Models;
1918
using Xunit;
2019
using Xunit.Abstractions;
21-
public class NestedEndpointsTests
20+
public class NestedEndpointsTests : TrafficManagerTestRunner
2221
{
23-
public XunitTracingInterceptor _logger;
24-
25-
public NestedEndpointsTests(ITestOutputHelper output)
22+
public NestedEndpointsTests(ITestOutputHelper output) : base(output)
2623
{
27-
_logger = new XunitTracingInterceptor(output);
28-
XunitTracingInterceptor.AddToContext(_logger);
2924
}
3025

3126
[Fact]
3227
[Trait(Category.AcceptanceType, Category.CheckIn)]
3328
public void TestNestedEndpointsCreateUpdate()
3429
{
35-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-NestedEndpointsCreateUpdate");
30+
TestRunner.RunTestScript("Test-NestedEndpointsCreateUpdate");
3631
}
3732

3833
[Fact]
3934
[Trait(Category.AcceptanceType, Category.CheckIn)]
4035
public void TestProfileWithNestedEndpointsGetPut()
4136
{
42-
TestController.NewInstance.RunPowerShellTest(_logger, "Test-ProfileWithNestedEndpointsGetPut");
37+
TestRunner.RunTestScript("Test-ProfileWithNestedEndpointsGetPut");
4338
}
4439
}
4540
}

0 commit comments

Comments
 (0)