Skip to content

Commit bceea2f

Browse files
johljujohlju
authored
Fix review comments
1 parent 4982d91 commit bceea2f

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ stages:
304304
'tests/Integration/Commands/Get-SqlDscDatabase.Integration.Tests.ps1'
305305
'tests/Integration/Commands/New-SqlDscDatabase.Integration.Tests.ps1'
306306
'tests/Integration/Commands/Set-SqlDscDatabase.Integration.Tests.ps1'
307-
#'tests/Integration/Commands/Test-SqlDscDatabase.Integration.Tests.ps1'
308-
#'tests/Integration/Commands/Remove-SqlDscDatabase.Integration.Tests.ps1'
307+
'tests/Integration/Commands/Test-SqlDscDatabase.Integration.Tests.ps1'
308+
'tests/Integration/Commands/Remove-SqlDscDatabase.Integration.Tests.ps1'
309309
'tests/Integration/Commands/Get-SqlDscAgentAlert.Integration.Tests.ps1'
310310
'tests/Integration/Commands/New-SqlDscAgentAlert.Integration.Tests.ps1'
311311
'tests/Integration/Commands/Set-SqlDscAgentAlert.Integration.Tests.ps1'

‎tests/Integration/Commands/New-SqlDscDatabase.Integration.Tests.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ BeforeDiscovery {
2626
BeforeAll {
2727
$script:dscModuleName = 'SqlServerDsc'
2828

29-
Import-Module -Name $script:dscModuleName
29+
Import-Module -Name $script:dscModuleName -Force -ErrorAction 'Stop'
3030
}
3131

3232
Describe 'New-SqlDscDatabase' -Tag @('Integration_SQL2017', 'Integration_SQL2019', 'Integration_SQL2022') {
@@ -59,7 +59,7 @@ Describe 'New-SqlDscDatabase' -Tag @('Integration_SQL2017', 'Integration_SQL2019
5959

6060
if ($existingDb)
6161
{
62-
Remove-SqlDscDatabase -DatabaseObject $existingDb -Force
62+
$null = Remove-SqlDscDatabase -DatabaseObject $existingDb -Force -ErrorAction 'Stop'
6363
}
6464
}
6565

@@ -118,7 +118,7 @@ Describe 'New-SqlDscDatabase' -Tag @('Integration_SQL2017', 'Integration_SQL2019
118118
$dbToRemove = Get-SqlDscDatabase -ServerObject $script:serverObject -Name $uniqueName -ErrorAction 'SilentlyContinue'
119119
if ($dbToRemove)
120120
{
121-
Remove-SqlDscDatabase -DatabaseObject $dbToRemove -Force
121+
$null = Remove-SqlDscDatabase -DatabaseObject $dbToRemove -Force
122122
}
123123
}
124124
}

‎tests/Integration/Commands/Remove-SqlDscDatabase.Integration.Tests.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Describe 'Remove-SqlDscDatabase' -Tag @('Integration_SQL2017', 'Integration_SQL2
5656
BeforeEach {
5757
# Create a test database for each test
5858
$script:testDatabaseName = 'SqlDscTestRemoveDatabase_' + (Get-Random)
59-
New-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseName -Force -ErrorAction Stop
59+
$null = New-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseName -Force -ErrorAction Stop
6060
}
6161

6262
It 'Should remove a database successfully' {
@@ -65,7 +65,7 @@ Describe 'Remove-SqlDscDatabase' -Tag @('Integration_SQL2017', 'Integration_SQL2
6565
$existingDb | Should -Not -BeNullOrEmpty
6666

6767
# Remove the database
68-
Remove-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseName -Force -ErrorAction Stop
68+
$null = Remove-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseName -Force -ErrorAction Stop
6969

7070
# Verify database no longer exists
7171
$removedDb = Get-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseName -ErrorAction 'SilentlyContinue'
@@ -82,15 +82,15 @@ Describe 'Remove-SqlDscDatabase' -Tag @('Integration_SQL2017', 'Integration_SQL2
8282
BeforeEach {
8383
# Create a test database for each test
8484
$script:testDatabaseNameForObject = 'SqlDscTestRemoveDatabaseObj_' + (Get-Random)
85-
New-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseNameForObject -Force -ErrorAction Stop
85+
$null = New-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseNameForObject -Force -ErrorAction Stop
8686
}
8787

8888
It 'Should remove a database using database object' {
8989
$databaseObject = Get-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseNameForObject -ErrorAction Stop
9090
$databaseObject | Should -Not -BeNullOrEmpty
9191

9292
# Remove the database using database object
93-
Remove-SqlDscDatabase -DatabaseObject $databaseObject -Force -ErrorAction Stop
93+
$null = Remove-SqlDscDatabase -DatabaseObject $databaseObject -Force -ErrorAction Stop
9494

9595
# Verify database no longer exists
9696
$removedDb = Get-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseNameForObject -ErrorAction 'SilentlyContinue'
@@ -136,12 +136,12 @@ Describe 'Remove-SqlDscDatabase' -Tag @('Integration_SQL2017', 'Integration_SQL2
136136
BeforeEach {
137137
# Create a test database for each test
138138
$script:testDatabaseNameRefresh = 'SqlDscTestRemoveDatabaseRefresh_' + (Get-Random)
139-
New-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseNameRefresh -Force -ErrorAction Stop
139+
$null = New-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseNameRefresh -Force -ErrorAction Stop
140140
}
141141

142142
It 'Should refresh the database collection before removing' {
143143
# Remove the database with refresh
144-
Remove-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseNameRefresh -Refresh -Force -ErrorAction Stop
144+
$null = Remove-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseNameRefresh -Refresh -Force -ErrorAction Stop
145145

146146
# Verify database no longer exists
147147
$removedDb = Get-SqlDscDatabase -ServerObject $script:serverObject -Name $script:testDatabaseNameRefresh -ErrorAction 'SilentlyContinue'

‎tests/Integration/Commands/Set-SqlDscDatabase.Integration.Tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Describe 'Set-SqlDscDatabase' -Tag @('Integration_SQL2017', 'Integration_SQL2019
6363

6464
if ($existingDb)
6565
{
66-
Remove-SqlDscDatabase -DatabaseObject $existingDb -Force -ErrorAction 'Stop'
66+
$null = Remove-SqlDscDatabase -DatabaseObject $existingDb -Force -ErrorAction 'Stop'
6767
}
6868
}
6969

‎tests/Integration/Commands/Test-SqlDscDatabase.Integration.Tests.ps1‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,37 +42,37 @@ Describe 'Test-SqlDscDatabase' -Tag @('Integration_SQL2016', 'Integration_SQL201
4242

4343
$script:mockSqlAdminCredential = [System.Management.Automation.PSCredential]::new($mockSqlAdministratorUserName, $mockSqlAdministratorPassword)
4444

45-
$script:serverObject = Connect-SqlDscDatabaseEngine -InstanceName $script:mockInstanceName -Credential $script:mockSqlAdminCredential
45+
$script:serverObject = Connect-SqlDscDatabaseEngine -InstanceName $script:mockInstanceName -Credential $script:mockSqlAdminCredential -ErrorAction 'Stop'
4646
}
4747

4848
AfterAll {
49-
Disconnect-SqlDscDatabaseEngine -ServerObject $script:serverObject
49+
Disconnect-SqlDscDatabaseEngine -ServerObject $script:serverObject -ErrorAction 'Stop'
5050

5151
# Stop the named instance SQL Server service to save memory on the build worker.
5252
Stop-Service -Name 'MSSQL$DSCSQLTEST' -Verbose -ErrorAction 'Stop'
5353
}
5454

5555
Context 'When testing database presence' {
5656
It 'Should return true when system database exists and Ensure is Present' {
57-
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'master' -Ensure 'Present'
57+
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'master' -Ensure 'Present' -ErrorAction 'Stop'
5858

5959
$result | Should -BeTrue
6060
}
6161

6262
It 'Should return false when non-existent database is tested with Ensure Present' {
63-
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'NonExistentDatabase' -Ensure 'Present'
63+
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'NonExistentDatabase' -Ensure 'Present' -ErrorAction 'Stop'
6464

6565
$result | Should -BeFalse
6666
}
6767

6868
It 'Should return false when system database exists and Ensure is Absent' {
69-
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'master' -Ensure 'Absent'
69+
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'master' -Ensure 'Absent' -ErrorAction 'Stop'
7070

7171
$result | Should -BeFalse
7272
}
7373

7474
It 'Should return true when non-existent database is tested with Ensure Absent' {
75-
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'NonExistentDatabase' -Ensure 'Absent'
75+
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'NonExistentDatabase' -Ensure 'Absent' -ErrorAction 'Stop'
7676

7777
$result | Should -BeTrue
7878
}
@@ -81,22 +81,22 @@ Describe 'Test-SqlDscDatabase' -Tag @('Integration_SQL2016', 'Integration_SQL201
8181
Context 'When testing database properties' {
8282
It 'Should return true when testing master database with correct recovery model' {
8383
# Master database typically has Simple recovery model
84-
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'master' -Ensure 'Present' -RecoveryModel 'Simple'
84+
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'master' -Ensure 'Present' -RecoveryModel 'Simple' -ErrorAction 'Stop'
8585

8686
$result | Should -BeTrue
8787
}
8888

8989
It 'Should return false when testing master database with incorrect recovery model' {
9090
# Master database typically has Simple recovery model, so Full should return false
91-
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'master' -Ensure 'Present' -RecoveryModel 'Full'
91+
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'master' -Ensure 'Present' -RecoveryModel 'Full' -ErrorAction 'Stop'
9292

9393
$result | Should -BeFalse
9494
}
9595
}
9696

9797
Context 'When using the Refresh parameter' {
9898
It 'Should refresh the database collection and test database presence' {
99-
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'master' -Ensure 'Present' -Refresh
99+
$result = Test-SqlDscDatabase -ServerObject $script:serverObject -Name 'master' -Ensure 'Present' -Refresh -ErrorAction 'Stop'
100100

101101
$result | Should -BeTrue
102102
}

0 commit comments

Comments
 (0)