Skip to content

Commit 8a5ce80

Browse files
author
Kapil Borle
committed
Update dsc test data path in tests
1 parent 7531055 commit 8a5ce80

14 files changed

+58
-54
lines changed

‎Tests/DisabledRules/ProvideVerboseMessage.tests.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $violationMessage = [regex]::Escape("There is no call to Write-Verbose in the fu
33
$violationName = "PSProvideVerboseMessage"
44
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
55
$violations = Invoke-ScriptAnalyzer $directory\BadCmdlet.ps1 | Where-Object {$_.RuleName -eq $violationName}
6-
$dscViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
6+
$dscViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResourceModule\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
77
$noViolations = Invoke-ScriptAnalyzer $directory\GoodCmdlet.ps1 | Where-Object {$_.RuleName -eq $violationName}
88

99
Describe "ProvideVerboseMessage" {
@@ -26,4 +26,4 @@ Describe "ProvideVerboseMessage" {
2626
$noViolations.Count | Should Be 0
2727
}
2828
}
29-
}
29+
}

‎Tests/Engine/InvokeScriptAnalyzer.tests.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ Describe "Test Severity" {
321321
It "works for dsc rules" {
322322
$testDataPath = [System.IO.Path]::Combine($(Split-Path $directory -Parent), `
323323
'Rules', `
324+
'DSCResourceModule', `
324325
'DSCResources', `
325326
'MSFT_WaitForAll', `
326327
'MSFT_WaitForAll.psm1')
@@ -398,4 +399,4 @@ Describe "Test CustomizedRulePath" {
398399
}
399400
}
400401
}
401-
}
402+
}

‎Tests/Engine/ModuleDependencyHandler.tests.ps1‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@ Describe "Resolve DSC Resource Dependency" {
139139
Context "Invoke-ScriptAnalyzer without switch but with module in temp path" {
140140
$oldEnvVars = Get-Item Env:\* | Sort-Object -Property Key
141141
$moduleName = "MyDscResource"
142-
$modulePath = Join-Path (Join-Path (Join-Path (Split-Path $directory) "Rules") "DSCResources") $moduleName
143-
# Save the current environment variables
142+
$modulePath = "$(Split-Path $directory)\Rules\DSCResourceModule\DSCResources\$moduleName"
143+
144+
# Save the current environment variables
144145
$oldLocalAppDataPath = $env:LOCALAPPDATA
145146
$oldTempPath = $env:TEMP
146147
$oldPSModulePath = $env:PSModulePath
@@ -190,4 +191,4 @@ Describe "Resolve DSC Resource Dependency" {
190191
Test-EnvironmentVariables($oldEnvVars)
191192
}
192193
}
193-
}
194+
}

‎Tests/Rules/AvoidGlobalOrUnitializedVars.tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $directory = Split-Path -Parent $MyInvocation.MyCommand.Path
1010
$violations = Invoke-ScriptAnalyzer $directory\AvoidGlobalOrUnitializedVars.ps1
1111

1212
# PSAvoidUninitializedVariable rule has been deprecated
13-
# $dscResourceViolations = Invoke-ScriptAnalyzer $directory\DSCResources\MSFT_WaitForAny\MSFT_WaitForAny.psm1 | Where-Object {$_.RuleName -eq $nonInitializedName}
13+
# $dscResourceViolations = Invoke-ScriptAnalyzer $directory\DSCResourceModule\DSCResources\MSFT_WaitForAny\MSFT_WaitForAny.psm1 | Where-Object {$_.RuleName -eq $nonInitializedName}
1414

1515
$globalViolations = $violations | Where-Object {$_.RuleName -eq $globalName}
1616

‎Tests/Rules/DSCResourceModule/DSCResources/MSFT_WaitForAnyNoIdenticalMandatoryParameter/MSFT_WaitForAnyNoIdenticalMandatoryParameter.schema.mof‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#pragma namespace("\\\\.\\root\\microsoft\\windows\\DesiredStateConfiguration")
22

33
[ClassVersion("1.0.0"), FriendlyName("WaitForAny")]
4-
class MSFT_WaitForAny : OMI_BaseResource
4+
5+
class MSFT_WaitForAnyNoIdenticalMandatoryParameter : OMI_BaseResource
56
{
67
[key, Description("Name of Resource on remote machine")]
78
string ResourceName;

‎Tests/Rules/DscExamplesPresent.tests.ps1‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ $ruleName = "PSDSCDscExamplesPresent"
66
if ($PSVersionTable.PSVersion -ge [Version]'5.0.0') {
77

88
Describe "DscExamplesPresent rule in class based resource" {
9-
10-
$examplesPath = "$currentPath\DSCResources\MyDscResource\Examples"
11-
$classResourcePath = "$currentPath\DSCResources\MyDscResource\MyDscResource.psm1"
9+
10+
$examplesPath = "$currentPath\DSCResourceModule\DSCResources\MyDscResource\Examples"
11+
$classResourcePath = "$currentPath\DSCResourceModule\DSCResources\MyDscResource\MyDscResource.psm1"
1212

1313
Context "When examples absent" {
14-
14+
1515
$violations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $classResourcePath | Where-Object {$_.RuleName -eq $ruleName}
1616
$violationMessage = "No examples found for resource 'FileResource'"
1717

@@ -24,7 +24,7 @@ if ($PSVersionTable.PSVersion -ge [Version]'5.0.0') {
2424
}
2525
}
2626

27-
Context "When examples present" {
27+
Context "When examples present" {
2828
New-Item -Path $examplesPath -ItemType Directory
2929
New-Item -Path "$examplesPath\FileResource_Example.psm1" -ItemType File
3030

@@ -40,12 +40,12 @@ if ($PSVersionTable.PSVersion -ge [Version]'5.0.0') {
4040
}
4141

4242
Describe "DscExamplesPresent rule in regular (non-class) based resource" {
43-
44-
$examplesPath = "$currentPath\Examples"
45-
$resourcePath = "$currentPath\DSCResources\MSFT_WaitForAll\MSFT_WaitForAll.psm1"
43+
44+
$examplesPath = "$currentPath\DSCResourceModule\Examples"
45+
$resourcePath = "$currentPath\DSCResourceModule\DSCResources\MSFT_WaitForAll\MSFT_WaitForAll.psm1"
4646

4747
Context "When examples absent" {
48-
48+
4949
$violations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $resourcePath | Where-Object {$_.RuleName -eq $ruleName}
5050
$violationMessage = "No examples found for resource 'MSFT_WaitForAll'"
5151

@@ -58,7 +58,7 @@ Describe "DscExamplesPresent rule in regular (non-class) based resource" {
5858
}
5959
}
6060

61-
Context "When examples present" {
61+
Context "When examples present" {
6262
New-Item -Path $examplesPath -ItemType Directory
6363
New-Item -Path "$examplesPath\MSFT_WaitForAll_Example.psm1" -ItemType File
6464

@@ -70,4 +70,4 @@ Describe "DscExamplesPresent rule in regular (non-class) based resource" {
7070

7171
Remove-Item -Path $examplesPath -Recurse -Force
7272
}
73-
}
73+
}

‎Tests/Rules/DscTestsPresent.tests.ps1‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ $ruleName = "PSDSCDscTestsPresent"
66
if ($PSVersionTable.PSVersion -ge [Version]'5.0.0') {
77

88
Describe "DscTestsPresent rule in class based resource" {
9-
10-
$testsPath = "$currentPath\DSCResources\MyDscResource\Tests"
11-
$classResourcePath = "$currentPath\DSCResources\MyDscResource\MyDscResource.psm1"
9+
10+
$testsPath = "$currentPath\DSCResourceModule\DSCResources\MyDscResource\Tests"
11+
$classResourcePath = "$currentPath\DSCResourceModule\DSCResources\MyDscResource\MyDscResource.psm1"
1212

1313
Context "When tests absent" {
14-
14+
1515
$violations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $classResourcePath | Where-Object {$_.RuleName -eq $ruleName}
1616
$violationMessage = "No tests found for resource 'FileResource'"
1717

@@ -24,7 +24,7 @@ if ($PSVersionTable.PSVersion -ge [Version]'5.0.0') {
2424
}
2525
}
2626

27-
Context "When tests present" {
27+
Context "When tests present" {
2828
New-Item -Path $testsPath -ItemType Directory
2929
New-Item -Path "$testsPath\FileResource_Test.psm1" -ItemType File
3030

@@ -40,12 +40,12 @@ if ($PSVersionTable.PSVersion -ge [Version]'5.0.0') {
4040
}
4141

4242
Describe "DscTestsPresent rule in regular (non-class) based resource" {
43-
44-
$testsPath = "$currentPath\Tests"
45-
$resourcePath = "$currentPath\DSCResources\MSFT_WaitForAll\MSFT_WaitForAll.psm1"
43+
44+
$testsPath = "$currentPath\DSCResourceModule\Tests"
45+
$resourcePath = "$currentPath\DSCResourceModule\DSCResources\MSFT_WaitForAll\MSFT_WaitForAll.psm1"
4646

4747
Context "When tests absent" {
48-
48+
4949
$violations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $resourcePath | Where-Object {$_.RuleName -eq $ruleName}
5050
$violationMessage = "No tests found for resource 'MSFT_WaitForAll'"
5151

@@ -58,7 +58,7 @@ Describe "DscTestsPresent rule in regular (non-class) based resource" {
5858
}
5959
}
6060

61-
Context "When tests present" {
61+
Context "When tests present" {
6262
New-Item -Path $testsPath -ItemType Directory
6363
New-Item -Path "$testsPath\MSFT_WaitForAll_Test.psm1" -ItemType File
6464

@@ -70,4 +70,4 @@ Describe "DscTestsPresent rule in regular (non-class) based resource" {
7070

7171
Remove-Item -Path $testsPath -Recurse -Force
7272
}
73-
}
73+
}

‎Tests/Rules/ProvideCommentHelp.tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $settings = @{
2222
$violations = Invoke-ScriptAnalyzer $directory\BadCmdlet.ps1 | Where-Object {$_.RuleName -eq $violationName}
2323

2424
if ($PSVersionTable.PSVersion -ge [Version]'5.0.0') {
25-
$dscViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
25+
$dscViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResourceModule\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
2626
}
2727

2828
$noViolations = Invoke-ScriptAnalyzer $directory\GoodCmdlet.ps1 | Where-Object {$_.RuleName -eq $violationName}

‎Tests/Rules/ReturnCorrectTypesForDSCFunctions.tests.ps1‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ $violationMessageDSCResource = "Test-TargetResource function in DSC Resource sho
44
$violationMessageDSCClass = "Get function in DSC Class FileResource should return object of type FileResource instead of type System.Collections.Hashtable"
55
$violationName = "PSDSCReturnCorrectTypesForDSCFunctions"
66
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
7-
$violations = Invoke-ScriptAnalyzer $directory\DSCResources\MSFT_WaitForAll\MSFT_WaitForAll.psm1 | Where-Object {$_.RuleName -eq $violationName}
8-
$noViolations = Invoke-ScriptAnalyzer $directory\DSCResources\MSFT_WaitForAny\MSFT_WaitForAny.psm1 | Where-Object {$_.RuleName -eq $violationName}
7+
$violations = Invoke-ScriptAnalyzer $directory\DSCResourceModule\DSCResources\MSFT_WaitForAll\MSFT_WaitForAll.psm1 | Where-Object {$_.RuleName -eq $violationName}
8+
$noViolations = Invoke-ScriptAnalyzer $directory\DSCResourceModule\DSCResources\MSFT_WaitForAny\MSFT_WaitForAny.psm1 | Where-Object {$_.RuleName -eq $violationName}
99

1010
if ($PSVersionTable.PSVersion -ge [Version]'5.0.0')
1111
{
12-
$classViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\BadDscResource\BadDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
13-
$noClassViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
12+
$classViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResourceModule\DSCResources\BadDscResource\BadDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
13+
$noClassViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResourceModule\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
1414
}
1515

1616
Describe "ReturnCorrectTypesForDSCFunctions" {
@@ -49,4 +49,4 @@ if ($PSVersionTable.PSVersion -ge [Version]'5.0.0') {
4949
}
5050
}
5151
}
52-
}
52+
}

‎Tests/Rules/UseDSCResourceFunctions.tests.ps1‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ $violationMessage = "Missing 'Get-TargetResource' function. DSC Resource must im
44
$classViolationMessage = "Missing 'Set' function. DSC Class must implement Get, Set and Test functions."
55
$violationName = "PSDSCStandardDSCFunctionsInResource"
66
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
7-
$violations = Invoke-ScriptAnalyzer $directory\DSCResources\MSFT_WaitForAll\MSFT_WaitForAll.psm1 | Where-Object {$_.RuleName -eq $violationName}
8-
$noViolations = Invoke-ScriptAnalyzer $directory\DSCResources\MSFT_WaitForAny\MSFT_WaitForAny.psm1 | Where-Object {$_.RuleName -eq $violationName}
7+
$violations = Invoke-ScriptAnalyzer $directory\DSCResourceModule\DSCResources\MSFT_WaitForAll\MSFT_WaitForAll.psm1 | Where-Object {$_.RuleName -eq $violationName}
8+
$noViolations = Invoke-ScriptAnalyzer $directory\DSCResourceModule\DSCResources\MSFT_WaitForAny\MSFT_WaitForAny.psm1 | Where-Object {$_.RuleName -eq $violationName}
99

1010
if ($PSVersionTable.PSVersion -ge [Version]'5.0.0')
1111
{
12-
$classViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\BadDscResource\BadDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
13-
$noClassViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
12+
$classViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResourceModule\DSCResources\BadDscResource\BadDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
13+
$noClassViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResourceModule\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
1414
}
1515

1616
Describe "StandardDSCFunctionsInResource" {
@@ -49,4 +49,4 @@ if ($PSVersionTable.PSVersion -ge [Version]'5.0.0') {
4949
}
5050
}
5151
}
52-
}
52+
}

0 commit comments

Comments
 (0)