Skip to content

Commit 5d76626

Browse files
yaakoviyunyaakoviyun
committed
Adding tests records
Adding tests records
1 parent ce06038 commit 5d76626

File tree

7 files changed

+5067
-41
lines changed

7 files changed

+5067
-41
lines changed

‎src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -399,95 +399,98 @@
399399
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AdvisorTests\TestUpdateServerAdvisor.json">
400400
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
401401
</None>
402-
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseDisableEnableKeepProperties.json">
403-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
402+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingUpdatePolicyWithClassicStorage.json" >
403+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
404+
</None>
405+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseDisableEnableKeepProperties.json">
406+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
404407
</None>
405408
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseRetentionKeepProperties.json">
406-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
409+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
407410
</None>
408411
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseStorageKeyRotation.json">
409-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
412+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
410413
</None>
411414
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyKeepPreviousStorage.json">
412-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
415+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
413416
</None>
414417
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyWithEventTypes.json">
415-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
418+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
416419
</None>
417420
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyWithEventTypeShortcuts.json">
418-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
421+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
419422
</None>
420423
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyWithRetention.json">
421-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
424+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
422425
</None>
423426
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion.json">
424-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
427+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
425428
</None>
426429
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyWithStorage.json">
427-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
430+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
428431
</None>
429432
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDisableDatabaseAuditing.json">
430-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
433+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
431434
</None>
432435
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDisableServerAuditing.json">
433-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
436+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
434437
</None>
435438
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingFailedDatabaseUpdatePolicyWithNoStorage.json">
436-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
439+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
437440
</None>
438441
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingFailedServerUpdatePolicyWithNoStorage.json">
439-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
442+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
440443
</None>
441444
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingFailedUseServerDefault.json">
442-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
445+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
443446
</None>
444447
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingFailWithBadDatabaseIndentity.json">
445-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
448+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
446449
</None>
447450
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingFailWithBadServerIndentity.json">
448-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
451+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
449452
</None>
450453
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerDisableEnableKeepProperties.json">
451-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
454+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
452455
</None>
453456
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerRetentionKeepProperties.json">
454-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
457+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
455458
</None>
456459
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerStorageKeyRotation.json">
457-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
460+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
458461
</None>
459462
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerUpdatePolicyKeepPreviousStorage.json">
460-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
463+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
461464
</None>
462465
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerUpdatePolicyWithEventTypes.json">
463-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
466+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
464467
</None>
465468
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerUpdatePolicyWithEventTypeShortcuts.json">
466-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
469+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
467470
</None>
468471
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerUpdatePolicyWithRetention.json">
469-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
472+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
470473
</None>
471474
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerUpdatePolicyWithStorage.json">
472-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
475+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
473476
</None>
474477
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingUseServerDefault.json">
475-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
478+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
476479
</None>
477480
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestBlobAuditingOnDatabase.json">
478-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
481+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
479482
</None>
480483
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestBlobAuditingOnServer.json">
481-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
484+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
482485
</None>
483486
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestDatatabaseAuditingTypeMigration.json">
484-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
487+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
485488
</None>
486489
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestGetServerAndDatabaseAuditingInUkRegion.json">
487-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
490+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
488491
</None>
489492
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestServerAuditingTypeMigration.json">
490-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
493+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
491494
</None>
492495
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseActivationTests\TestDatabasePauseResume.json">
493496
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -694,19 +697,22 @@
694697
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
695698
</None>
696699
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\DisablingThreatDetection.json">
697-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
700+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
698701
</None>
699702
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\InvalidArgumentsThreatDetection.json">
700-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
703+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
701704
</None>
702705
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\ThreatDetectionDatabaseUpdatePolicy.json">
703-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
706+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
704707
</None>
705708
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\ThreatDetectionGetDefualtPolicy.json">
706-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
709+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
707710
</None>
708711
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\ThreatDetectionServerUpdatePolicy.json">
709-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
712+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
713+
</None>
714+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\ThreatDetectionUpdatePolicyWithClassicStorage.json" >
715+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
710716
</None>
711717
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TransparentDataEncryptionCrudTests\TestDatabaseTransparentDataEncryptionGet.json">
712718
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public AuditingTests(ITestOutputHelper output)
4040

4141
[Fact]
4242
[Trait(Category.AcceptanceType, Category.CheckIn)]
43-
public void AuditingUpdatePolicyWithClassicStorage()
43+
public void TestAuditingUpdatePolicyWithClassicStorage()
4444
{
4545
RunPowerShellTest("Test-AuditingUpdatePolicyWithClassicStorage");
4646
}

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ function Test-AuditingUpdatePolicyWithClassicStorage
3232
# Assert
3333
Assert-AreEqual $policy.StorageAccountName $params.storageAccount
3434
Assert-AreEqual $policy.AuditState "Enabled"
35-
Assert-AreEqual $policy.UseServerDefault "Disabled"
3635

3736
# Test - Table server Auditing
3837
Set-AzureRmSqlServerAuditingPolicy -AuditType Table -ResourceGroupName $params.rgname -ServerName $params.serverName -StorageAccountName $params.storageAccount
@@ -50,7 +49,6 @@ function Test-AuditingUpdatePolicyWithClassicStorage
5049
# Assert
5150
Assert-AreEqual $policy.StorageAccountName $params.storageAccount
5251
Assert-AreEqual $policy.AuditState "Enabled"
53-
Assert-AreEqual $policy.UseServerDefault "Disabled"
5452

5553
# Test - Blob server Auditing
5654
Set-AzureRmSqlServerAuditingPolicy -AuditType Blob -ResourceGroupName $params.rgname -ServerName $params.serverName -StorageAccountName $params.storageAccount

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/Common.ps1

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,14 @@ Creates the test environment needed to perform the Sql auditing tests
116116
function Create-ClassicTestEnvironmentWithParams ($params, $location, $serverVersion)
117117
{
118118
Create-BasicTestEnvironmentWithParams $params $location $serverVersion
119-
New-AzureRmResource -ResourceName $params.storageAccount -ResourceGroupName $params.rgname -ResourceType "Microsoft.ClassicStorage/StorageAccounts" -Location $location -Properties @{ AccountType = "Standard_GRS" } -ApiVersion "2014-06-01" -Force
119+
try
120+
{
121+
New-AzureRmResource -ResourceName $params.storageAccount -ResourceGroupName $params.rgname -ResourceType "Microsoft.ClassicStorage/StorageAccounts" -Location $location -Properties @{ AccountType = "Standard_GRS" } -ApiVersion "2014-06-01" -Force
122+
}
123+
catch
124+
{
125+
# We catch the exceptions not to fail the tests in playback mode
126+
}
120127
}
121128

122129
<#

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ThreatDetectionTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function Test-ThreatDetectionUpdatePolicyWithClassicStorage
2121
# Setup
2222
$testSuffix = 4996
2323
Create-ThreatDetectionClassicTestEnvironment $testSuffix
24-
$params = Get-SqlAuditingTestEnvironmentParameters $testSuffix
24+
$params = Get-SqlThreatDetectionTestEnvironmentParameters $testSuffix
2525

2626
try
2727
{

0 commit comments

Comments
 (0)