Skip to content

Commit 0441386

Browse files
author
Ziyue Zheng
authored
Add SqlTestRunner to replace SqlTestsBase (#18352)
* Add SqlTestRunner to replace SqlTestsBase * Add SqlTestRunner to replace SqlTestsBase * Add SqlTestRunner to replace SqlTestsBase * Update SqlTestRunner.cs
1 parent c834195 commit 0441386

29 files changed

+418
-447
lines changed

src/Sql/Sql.Test/ScenarioTests/AdvancedDataSecurityTests.cs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,20 @@
1616
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1717
using Xunit;
1818
using Xunit.Abstractions;
19-
using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework;
2019

2120
namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2221
{
23-
public class AdvancedDataSecurityTests : SqlTestsBase
22+
public class AdvancedDataSecurityTests : SqlTestRunner
2423
{
25-
protected override void SetupManagementClients(RestTestFramework.MockContext context)
26-
{
27-
var sqlClient = GetSqlClient(context);
28-
var storageV2Client = GetStorageManagementClient(context);
29-
var newResourcesClient = GetResourcesClient(context);
30-
Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient);
31-
}
32-
3324
public AdvancedDataSecurityTests(ITestOutputHelper output) : base(output)
3425
{
35-
base.resourceTypesToIgnoreApiVersion = new string[] {
36-
"Microsoft.Sql/servers"
37-
};
3826
}
3927

4028
[Fact]
4129
[Trait(Category.AcceptanceType, Category.CheckIn)]
4230
public void AdvancedDataSecurityPolicyTest()
4331
{
44-
RunPowerShellTest("Test-AdvancedDataSecurityPolicyTest");
32+
TestRunner.RunTestScript("Test-AdvancedDataSecurityPolicyTest");
4533
}
4634
}
4735
}

src/Sql/Sql.Test/ScenarioTests/AuditTests.cs

Lines changed: 42 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -16,321 +16,303 @@
1616
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1717
using Xunit;
1818
using Xunit.Abstractions;
19-
using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework;
2019

2120
namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2221
{
23-
public class AuditTests : SqlTestsBase
22+
public class AuditTests : SqlTestRunner
2423
{
25-
protected override void SetupManagementClients(RestTestFramework.MockContext context)
26-
{
27-
var sqlClient = GetSqlClient(context);
28-
var storageV2Client = GetStorageManagementClient(context);
29-
var newResourcesClient = GetResourcesClient(context);
30-
var monitorManagementClient = GetMonitorManagementClient(context);
31-
var commonMonitorManagementClient = GetCommonMonitorManagementClient(context);
32-
var eventHubManagementClient = GetEventHubManagementClient(context);
33-
var operationalInsightsManagementClient = GetOperationalInsightsManagementClient(context);
34-
Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, storageV2Client,
35-
newResourcesClient, monitorManagementClient, commonMonitorManagementClient,
36-
eventHubManagementClient, operationalInsightsManagementClient);
37-
}
38-
3924
public AuditTests(ITestOutputHelper output) : base(output)
4025
{
41-
base.resourceTypesToIgnoreApiVersion = new string[] {
42-
"Microsoft.Sql/servers"
43-
};
4426
}
4527

4628
[Fact]
4729
[Trait(Category.AcceptanceType, Category.CheckIn)]
4830
public void TestBlobAuditDatabaseUpdatePolicyWithStorage()
4931
{
50-
RunPowerShellTest("Test-BlobAuditDatabaseUpdatePolicyWithStorage");
32+
TestRunner.RunTestScript("Test-BlobAuditDatabaseUpdatePolicyWithStorage");
5133
}
5234

5335
[Fact]
5436
[Trait(Category.AcceptanceType, Category.CheckIn)]
5537
public void TestBlobAuditServerUpdatePolicyWithStorage()
5638
{
57-
RunPowerShellTest("Test-BlobAuditServerUpdatePolicyWithStorage");
39+
TestRunner.RunTestScript("Test-BlobAuditServerUpdatePolicyWithStorage");
5840
}
5941

6042
[Fact]
6143
[Trait(Category.AcceptanceType, Category.CheckIn)]
6244
public void TestMSSupportBlobAuditServerUpdatePolicyWithStorage()
6345
{
64-
RunPowerShellTest("Test-MSSupportBlobAuditServerUpdatePolicyWithStorage");
46+
TestRunner.RunTestScript("Test-MSSupportBlobAuditServerUpdatePolicyWithStorage");
6547
}
6648

6749
[Fact]
6850
[Trait(Category.AcceptanceType, Category.CheckIn)]
6951
public void TestBlobAuditDisableDatabaseAudit()
7052
{
71-
RunPowerShellTest("Test-BlobAuditDisableDatabaseAudit");
53+
TestRunner.RunTestScript("Test-BlobAuditDisableDatabaseAudit");
7254
}
7355

7456
[Fact]
7557
[Trait(Category.AcceptanceType, Category.CheckIn)]
7658
public void TestBlobAuditDisableServerAudit()
7759
{
78-
RunPowerShellTest("Test-BlobAuditDisableServerAudit");
60+
TestRunner.RunTestScript("Test-BlobAuditDisableServerAudit");
7961
}
8062

8163
[Fact]
8264
[Trait(Category.AcceptanceType, Category.CheckIn)]
8365
public void TestMSSupportBlobAuditDisableServerAudit()
8466
{
85-
RunPowerShellTest("Test-MSSupportBlobAuditDisableServerAudit");
67+
TestRunner.RunTestScript("Test-MSSupportBlobAuditDisableServerAudit");
8668
}
8769

8870
[Fact]
8971
[Trait(Category.AcceptanceType, Category.CheckIn)]
9072
public void TestBlobAuditFailedDatabaseUpdatePolicyWithNoStorage()
9173
{
92-
RunPowerShellTest("Test-BlobAuditFailedDatabaseUpdatePolicyWithNoStorage");
74+
TestRunner.RunTestScript("Test-BlobAuditFailedDatabaseUpdatePolicyWithNoStorage");
9375
}
9476

9577
[Fact]
9678
[Trait(Category.AcceptanceType, Category.CheckIn)]
9779
public void TestBlobAuditFailedServerUpdatePolicyWithNoStorage()
9880
{
99-
RunPowerShellTest("Test-BlobAuditFailedServerUpdatePolicyWithNoStorage");
81+
TestRunner.RunTestScript("Test-BlobAuditFailedServerUpdatePolicyWithNoStorage");
10082
}
10183

10284
[Fact]
10385
[Trait(Category.AcceptanceType, Category.CheckIn)]
10486
public void TestMSSupportBlobAuditFailedServerUpdatePolicyWithNoStorage()
10587
{
106-
RunPowerShellTest("Test-MSSupportBlobAuditFailedServerUpdatePolicyWithNoStorage");
88+
TestRunner.RunTestScript("Test-MSSupportBlobAuditFailedServerUpdatePolicyWithNoStorage");
10789
}
10890

10991
[Fact]
11092
[Trait(Category.AcceptanceType, Category.CheckIn)]
11193
public void TestBlobAuditDatabaseUpdatePolicyKeepPreviousStorage()
11294
{
113-
RunPowerShellTest("Test-BlobAuditDatabaseUpdatePolicyKeepPreviousStorage");
95+
TestRunner.RunTestScript("Test-BlobAuditDatabaseUpdatePolicyKeepPreviousStorage");
11496
}
11597

11698
[Fact]
11799
[Trait(Category.AcceptanceType, Category.CheckIn)]
118100
public void TestBlobAuditServerUpdatePolicyKeepPreviousStorage()
119101
{
120-
RunPowerShellTest("Test-BlobAuditServerUpdatePolicyKeepPreviousStorage");
102+
TestRunner.RunTestScript("Test-BlobAuditServerUpdatePolicyKeepPreviousStorage");
121103
}
122104

123105
[Fact]
124106
[Trait(Category.AcceptanceType, Category.CheckIn)]
125107
public void TestMSSupportBlobAuditServerUpdatePolicyKeepPreviousStorage()
126108
{
127-
RunPowerShellTest("Test-MSSupportBlobAuditServerUpdatePolicyKeepPreviousStorage");
109+
TestRunner.RunTestScript("Test-MSSupportBlobAuditServerUpdatePolicyKeepPreviousStorage");
128110
}
129111

130112
[Fact]
131113
[Trait(Category.AcceptanceType, Category.CheckIn)]
132114
public void TestBlobAuditFailWithBadDatabaseIndentity()
133115
{
134-
RunPowerShellTest("Test-BlobAuditFailWithBadDatabaseIndentity");
116+
TestRunner.RunTestScript("Test-BlobAuditFailWithBadDatabaseIndentity");
135117
}
136118

137119
[Fact]
138120
[Trait(Category.AcceptanceType, Category.CheckIn)]
139121
public void TestBlobAuditFailWithBadServerIndentity()
140122
{
141-
RunPowerShellTest("Test-BlobAuditFailWithBadServerIndentity");
123+
TestRunner.RunTestScript("Test-BlobAuditFailWithBadServerIndentity");
142124
}
143125

144126
[Fact]
145127
[Trait(Category.AcceptanceType, Category.CheckIn)]
146128
public void TestMSSupportBlobAuditFailWithBadServerIndentity()
147129
{
148-
RunPowerShellTest("Test-MSSupportBlobAuditFailWithBadServerIndentity");
130+
TestRunner.RunTestScript("Test-MSSupportBlobAuditFailWithBadServerIndentity");
149131
}
150132

151133
[Fact]
152134
[Trait(Category.AcceptanceType, Category.CheckIn)]
153135
public void TestBlobAuditDatabaseStorageKeyRotation()
154136
{
155-
RunPowerShellTest("Test-BlobAuditDatabaseStorageKeyRotation");
137+
TestRunner.RunTestScript("Test-BlobAuditDatabaseStorageKeyRotation");
156138
}
157139

158140
[Fact]
159141
[Trait(Category.AcceptanceType, Category.CheckIn)]
160142
public void TestBlobAuditServerStorageKeyRotation()
161143
{
162-
RunPowerShellTest("Test-BlobAuditServerStorageKeyRotation");
144+
TestRunner.RunTestScript("Test-BlobAuditServerStorageKeyRotation");
163145
}
164146

165147
[Fact]
166148
[Trait(Category.AcceptanceType, Category.CheckIn)]
167149
public void TestBlobAuditServerRetentionKeepProperties()
168150
{
169-
RunPowerShellTest("Test-BlobAuditServerRetentionKeepProperties");
151+
TestRunner.RunTestScript("Test-BlobAuditServerRetentionKeepProperties");
170152
}
171153

172154
[Fact]
173155
[Trait(Category.AcceptanceType, Category.CheckIn)]
174156
public void TestBlobAuditDatabaseRetentionKeepProperties()
175157
{
176-
RunPowerShellTest("Test-BlobAuditDatabaseRetentionKeepProperties");
158+
TestRunner.RunTestScript("Test-BlobAuditDatabaseRetentionKeepProperties");
177159
}
178160

179161
[Fact]
180162
[Trait(Category.AcceptanceType, Category.CheckIn)]
181163
public void TestBlobAuditOnDatabase()
182164
{
183-
RunPowerShellTest("Test-BlobAuditOnDatabase");
165+
TestRunner.RunTestScript("Test-BlobAuditOnDatabase");
184166
}
185167

186168
[Fact]
187169
[Trait(Category.AcceptanceType, Category.CheckIn)]
188170
public void TestBlobAuditOnServer()
189171
{
190-
RunPowerShellTest("Test-BlobAuditOnServer");
172+
TestRunner.RunTestScript("Test-BlobAuditOnServer");
191173
}
192174

193175
[Fact]
194176
[Trait(Category.AcceptanceType, Category.CheckIn)]
195177
public void TestMSSupportBlobAuditOnServer()
196178
{
197-
RunPowerShellTest("Test-MSSupportBlobAuditOnServer");
179+
TestRunner.RunTestScript("Test-MSSupportBlobAuditOnServer");
198180
}
199181

200182
[Fact]
201183
[Trait(Category.AcceptanceType, Category.CheckIn)]
202184
public void TestBlobAuditDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion()
203185
{
204-
RunPowerShellTest("Test-BlobAuditDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion");
186+
TestRunner.RunTestScript("Test-BlobAuditDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion");
205187
}
206188

207189
[Fact]
208190
[Trait(Category.AcceptanceType, Category.CheckIn)]
209191
public void TestBlobAuditWithAuditActionGroups()
210192
{
211-
RunPowerShellTest("Test-BlobAuditWithAuditActionGroups");
193+
TestRunner.RunTestScript("Test-BlobAuditWithAuditActionGroups");
212194
}
213195

214196
[Fact]
215197
[Trait(Category.AcceptanceType, Category.CheckIn)]
216198
public void TestExtendedAuditOnDatabase()
217199
{
218-
RunPowerShellTest("Test-ExtendedAuditOnDatabase");
200+
TestRunner.RunTestScript("Test-ExtendedAuditOnDatabase");
219201
}
220202

221203
[Fact]
222204
[Trait(Category.AcceptanceType, Category.CheckIn)]
223205
public void TestExtendedAuditOnServer()
224206
{
225-
RunPowerShellTest("Test-ExtendedAuditOnServer");
207+
TestRunner.RunTestScript("Test-ExtendedAuditOnServer");
226208
}
227209

228210
[Fact]
229211
[Trait(Category.AcceptanceType, Category.CheckIn)]
230212
[Trait(Category.RunType, Category.LiveOnly)]
231213
public void TestAuditOnDatabase()
232214
{
233-
RunPowerShellTest("Test-AuditOnDatabase");
215+
TestRunner.RunTestScript("Test-AuditOnDatabase");
234216
}
235217

236218
[Fact]
237219
[Trait(Category.AcceptanceType, Category.CheckIn)]
238220
[Trait(Category.RunType, Category.LiveOnly)]
239221
public void TestAuditOnServer()
240222
{
241-
RunPowerShellTest("Test-AuditOnServer");
223+
TestRunner.RunTestScript("Test-AuditOnServer");
242224
}
243225

244226
[Fact]
245227
[Trait(Category.AcceptanceType, Category.CheckIn)]
246228
[Trait(Category.RunType, Category.LiveOnly)]
247229
public void TestMSSupportAuditOnServer()
248230
{
249-
RunPowerShellTest("Test-MSSupportAuditOnServer");
231+
TestRunner.RunTestScript("Test-MSSupportAuditOnServer");
250232
}
251233

252234
[Fact]
253235
[Trait(Category.AcceptanceType, Category.CheckIn)]
254236
public void TestNewDatabaseAuditDiagnosticsAreCreatedOnNeed()
255237
{
256-
RunPowerShellTest("Test-NewDatabaseAuditDiagnosticsAreCreatedOnNeed");
238+
TestRunner.RunTestScript("Test-NewDatabaseAuditDiagnosticsAreCreatedOnNeed");
257239
}
258240

259241
[Fact]
260242
[Trait(Category.AcceptanceType, Category.CheckIn)]
261243
public void TestNewServerAuditDiagnosticsAreCreatedOnNeed()
262244
{
263-
RunPowerShellTest("Test-NewServerAuditDiagnosticsAreCreatedOnNeed");
245+
TestRunner.RunTestScript("Test-NewServerAuditDiagnosticsAreCreatedOnNeed");
264246
}
265247

266248
[Fact]
267249
[Trait(Category.AcceptanceType, Category.CheckIn)]
268250
public void TestMSSupportNewServerAuditDiagnosticsAreCreatedOnNeed()
269251
{
270-
RunPowerShellTest("Test-MSSupportNewServerAuditDiagnosticsAreCreatedOnNeed");
252+
TestRunner.RunTestScript("Test-MSSupportNewServerAuditDiagnosticsAreCreatedOnNeed");
271253
}
272254

273255
[Fact]
274256
[Trait(Category.AcceptanceType, Category.CheckIn)]
275257
public void TestRemoveAuditOnServer()
276258
{
277-
RunPowerShellTest("Test-RemoveAuditOnServer");
259+
TestRunner.RunTestScript("Test-RemoveAuditOnServer");
278260
}
279261

280262
[Fact]
281263
[Trait(Category.AcceptanceType, Category.CheckIn)]
282264
public void TestMSSupportRemoveAuditOnServer()
283265
{
284-
RunPowerShellTest("Test-MSSupportRemoveAuditOnServer");
266+
TestRunner.RunTestScript("Test-MSSupportRemoveAuditOnServer");
285267
}
286268

287269
[Fact]
288270
[Trait(Category.AcceptanceType, Category.CheckIn)]
289271
public void TestRemoveAuditOnDatabase()
290272
{
291-
RunPowerShellTest("Test-RemoveAuditOnDatabase");
273+
TestRunner.RunTestScript("Test-RemoveAuditOnDatabase");
292274
}
293275

294276
[Fact]
295277
[Trait(Category.AcceptanceType, Category.CheckIn)]
296278
public void TestRemoveDatabaseAuditingSettingsMultipleDiagnosticSettings()
297279
{
298-
RunPowerShellTest("Test-RemoveDatabaseAuditingSettingsMultipleDiagnosticSettings");
280+
TestRunner.RunTestScript("Test-RemoveDatabaseAuditingSettingsMultipleDiagnosticSettings");
299281
}
300282

301283
[Fact]
302284
[Trait(Category.AcceptanceType, Category.CheckIn)]
303285
public void TestRemoveServerAuditingSettingsMultipleDiagnosticSettings()
304286
{
305-
RunPowerShellTest("Test-RemoveServerAuditingSettingsMultipleDiagnosticSettings");
287+
TestRunner.RunTestScript("Test-RemoveServerAuditingSettingsMultipleDiagnosticSettings");
306288
}
307289

308290
[Fact]
309291
[Trait(Category.AcceptanceType, Category.CheckIn)]
310292
public void TestMSSupportRemoveServerAuditingSettingsMultipleDiagnosticSettings()
311293
{
312-
RunPowerShellTest("Test-MSSupportRemoveServerAuditingSettingsMultipleDiagnosticSettings");
294+
TestRunner.RunTestScript("Test-MSSupportRemoveServerAuditingSettingsMultipleDiagnosticSettings");
313295
}
314296

315297
[Fact]
316298
[Trait(Category.AcceptanceType, Category.CheckIn)]
317299
public void TestServerAuditingToStorageInVNet()
318300
{
319-
RunPowerShellTest("Test-ServerAuditingToStorageInVNet");
301+
TestRunner.RunTestScript("Test-ServerAuditingToStorageInVNet");
320302
}
321303

322304
[Fact]
323305
[Trait(Category.AcceptanceType, Category.CheckIn)]
324306
public void TestMSSupportServerAuditingToStorageInVNet()
325307
{
326-
RunPowerShellTest("Test-MSSupportServerAuditingToStorageInVNet");
308+
TestRunner.RunTestScript("Test-MSSupportServerAuditingToStorageInVNet");
327309
}
328310

329311
[Fact]
330312
[Trait(Category.AcceptanceType, Category.CheckIn)]
331313
public void TestDatabaseAuditingToStorageInVNet()
332314
{
333-
RunPowerShellTest("Test-DatabaseAuditingToStorageInVNet");
315+
TestRunner.RunTestScript("Test-DatabaseAuditingToStorageInVNet");
334316
}
335317
}
336318
}

0 commit comments

Comments
 (0)