Skip to content

Commit 708cec1

Browse files
committed
Refactor error handling in Get-SqlDscRSPackage to simplify exception creation and update variable names in tests for consistency
1 parent b0e7941 commit 708cec1

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

source/Public/Get-SqlDscRSPackage.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ function Get-SqlDscRSPackage
105105

106106
$PSCmdlet.ThrowTerminatingError(
107107
[System.Management.Automation.ErrorRecord]::new(
108-
[System.InvalidOperationException]::new($errorMessage),
108+
$errorMessage,
109109
'GSDRSP0001',
110110
[System.Management.Automation.ErrorCategory]::ObjectNotFound,
111111
$Package
@@ -146,7 +146,7 @@ function Get-SqlDscRSPackage
146146

147147
$PSCmdlet.ThrowTerminatingError(
148148
[System.Management.Automation.ErrorRecord]::new(
149-
[System.InvalidOperationException]::new($errorMessage),
149+
$errorMessage,
150150
'GSDRSP0002',
151151
[System.Management.Automation.ErrorCategory]::InvalidArgument,
152152
$FilePath

tests/Unit/Public/Get-SqlDscRSPackage.Tests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ BeforeDiscovery {
2424
}
2525

2626
BeforeAll {
27-
$script:dscModuleName = 'SqlServerDsc'
27+
$script:moduleName = 'SqlServerDsc'
2828

2929
$env:SqlServerDscCI = $true
3030

31-
Import-Module -Name $script:dscModuleName -Force -ErrorAction 'Stop'
31+
Import-Module -Name $script:moduleName -Force -ErrorAction 'Stop'
3232

33-
$PSDefaultParameterValues['InModuleScope:ModuleName'] = $script:dscModuleName
34-
$PSDefaultParameterValues['Mock:ModuleName'] = $script:dscModuleName
35-
$PSDefaultParameterValues['Should:ModuleName'] = $script:dscModuleName
33+
$PSDefaultParameterValues['InModuleScope:ModuleName'] = $script:moduleName
34+
$PSDefaultParameterValues['Mock:ModuleName'] = $script:moduleName
35+
$PSDefaultParameterValues['Should:ModuleName'] = $script:moduleName
3636
}
3737

3838
AfterAll {
@@ -41,7 +41,7 @@ AfterAll {
4141
$PSDefaultParameterValues.Remove('Should:ModuleName')
4242

4343
# Unload the module being tested so that it doesn't impact any other tests.
44-
Get-Module -Name $script:dscModuleName -All | Remove-Module -Force
44+
Get-Module -Name $script:moduleName -All | Remove-Module -Force
4545

4646
Remove-Item -Path 'env:SqlServerDscCI'
4747
}

0 commit comments

Comments
 (0)