Skip to content

Commit 5f9457f

Browse files
raghushantharaghushantha
committed
Fixed failing tests
1 parent d4c42ab commit 5f9457f

9 files changed

+68
-24
lines changed

‎PSScriptAnalyzer.sln‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ Global
1515
Release|Any CPU = Release|Any CPU
1616
EndGlobalSection
1717
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Debug|Any CPU.ActiveCfg = PSV3 Debug|Any CPU
19-
{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Debug|Any CPU.Build.0 = PSV3 Debug|Any CPU
18+
{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Debug|Any CPU.ActiveCfg = PSV3 Release|Any CPU
19+
{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Debug|Any CPU.Build.0 = PSV3 Release|Any CPU
2020
{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.PSV3 Debug|Any CPU.ActiveCfg = PSV3 Debug|Any CPU
2121
{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.PSV3 Debug|Any CPU.Build.0 = PSV3 Debug|Any CPU
2222
{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.PSV3 Release|Any CPU.ActiveCfg = PSV3 Release|Any CPU
2323
{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.PSV3 Release|Any CPU.Build.0 = PSV3 Release|Any CPU
2424
{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Release|Any CPU.ActiveCfg = Release|Any CPU
2525
{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.Debug|Any CPU.ActiveCfg = PSV3 Debug|Any CPU
27-
{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.Debug|Any CPU.Build.0 = PSV3 Debug|Any CPU
26+
{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.Debug|Any CPU.ActiveCfg = PSV3 Release|Any CPU
27+
{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.Debug|Any CPU.Build.0 = PSV3 Release|Any CPU
2828
{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.PSV3 Debug|Any CPU.ActiveCfg = Debug|Any CPU
2929
{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.PSV3 Debug|Any CPU.Build.0 = Debug|Any CPU
3030
{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.PSV3 Release|Any CPU.ActiveCfg = Release|Any CPU

‎Tests/Engine/RuleSuppression.tests.ps1‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Check if PSScriptAnalyzer is already loaded so we don't
1+
if ($PSVersionTable.PSVersion -ge [Version]'5.0') {
2+
3+
# Check if PSScriptAnalyzer is already loaded so we don't
24
# overwrite a test version of Invoke-ScriptAnalyzer by
35
# accident
46
if (!(Get-Module PSScriptAnalyzer) -and !$testingLibraryUsage)
@@ -75,4 +77,5 @@ Describe "RuleSuppressionWithScope" {
7577
$suppression.Count | Should Be 0
7678
}
7779
}
80+
}
7881
}

‎Tests/Rules/DscExamplesPresent.tests.ps1‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Import-Module -Verbose PSScriptAnalyzer
33
$currentPath = Split-Path -Parent $MyInvocation.MyCommand.Path
44
$ruleName = "PSDSCDscExamplesPresent"
55

6-
Describe "DscExamplesPresent rule in class based resource" {
6+
if ($PSVersionTable.PSVersion -ge [Version]'5.0') {
7+
8+
Describe "DscExamplesPresent rule in class based resource" {
79

810
$examplesPath = "$currentPath\DSCResources\MyDscResource\Examples"
911
$classResourcePath = "$currentPath\DSCResources\MyDscResource\MyDscResource.psm1"
@@ -34,6 +36,7 @@ Describe "DscExamplesPresent rule in class based resource" {
3436

3537
Remove-Item -Path $examplesPath -Recurse -Force
3638
}
39+
}
3740
}
3841

3942
Describe "DscExamplesPresent rule in regular (non-class) based resource" {

‎Tests/Rules/DscTestsPresent.tests.ps1‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Import-Module -Verbose PSScriptAnalyzer
33
$currentPath = Split-Path -Parent $MyInvocation.MyCommand.Path
44
$ruleName = "PSDSCDscTestsPresent"
55

6-
Describe "DscTestsPresent rule in class based resource" {
6+
if ($PSVersionTable.PSVersion -ge [Version]'5.0') {
7+
8+
Describe "DscTestsPresent rule in class based resource" {
79

810
$testsPath = "$currentPath\DSCResources\MyDscResource\Tests"
911
$classResourcePath = "$currentPath\DSCResources\MyDscResource\MyDscResource.psm1"
@@ -34,6 +36,7 @@ Describe "DscTestsPresent rule in class based resource" {
3436

3537
Remove-Item -Path $testsPath -Recurse -Force
3638
}
39+
}
3740
}
3841

3942
Describe "DscTestsPresent rule in regular (non-class) based resource" {

‎Tests/Rules/ProvideCommentHelp.tests.ps1‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ $violationMessage = "The cmdlet 'Comment' does not have a help comment."
33
$violationName = "PSProvideCommentHelp"
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+
7+
if ($PSVersionTable.PSVersion -ge [Version]'5.0')
8+
{
9+
$dscViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
10+
}
11+
712
$noViolations = Invoke-ScriptAnalyzer $directory\GoodCmdlet.ps1 | Where-Object {$_.RuleName -eq $violationName}
813

914
Describe "ProvideCommentHelp" {
@@ -15,9 +20,12 @@ Describe "ProvideCommentHelp" {
1520
It "has the correct description message" {
1621
$violations[0].Message | Should Match $violationMessage
1722
}
18-
19-
It "Does not count violation in DSC class" {
20-
$dscViolations.Count | Should Be 0
23+
24+
if ($PSVersionTable.PSVersion -ge [Version]'5.0')
25+
{
26+
It "Does not count violation in DSC class" {
27+
$dscViolations.Count | Should Be 0
28+
}
2129
}
2230
}
2331

‎Tests/Rules/ReturnCorrectTypesForDSCFunctions.tests.ps1‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ $violationName = "PSDSCReturnCorrectTypesForDSCFunctions"
66
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
77
$violations = Invoke-ScriptAnalyzer $directory\DSCResources\MSFT_WaitForAll\MSFT_WaitForAll.psm1 | Where-Object {$_.RuleName -eq $violationName}
88
$noViolations = Invoke-ScriptAnalyzer $directory\DSCResources\MSFT_WaitForAny\MSFT_WaitForAny.psm1 | Where-Object {$_.RuleName -eq $violationName}
9-
$classViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\BadDscResource\BadDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
10-
$noClassViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
9+
10+
if ($PSVersionTable.PSVersion -ge [Version]'5.0')
11+
{
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}
14+
}
1115

1216
Describe "ReturnCorrectTypesForDSCFunctions" {
1317
Context "When there are violations" {
@@ -27,7 +31,8 @@ Describe "ReturnCorrectTypesForDSCFunctions" {
2731
}
2832
}
2933

30-
Describe "StandardDSCFunctionsInClass" {
34+
if ($PSVersionTable.PSVersion -ge [Version]'5.0') {
35+
Describe "StandardDSCFunctionsInClass" {
3136
Context "When there are violations" {
3237
It "has 4 return correct types for DSC functions violations" {
3338
$classViolations.Count | Should Be 4
@@ -43,4 +48,5 @@ Describe "StandardDSCFunctionsInClass" {
4348
$noClassViolations.Count | Should Be 0
4449
}
4550
}
51+
}
4652
}

‎Tests/Rules/UseDSCResourceFunctions.tests.ps1‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ $violationName = "PSDSCStandardDSCFunctionsInResource"
66
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
77
$violations = Invoke-ScriptAnalyzer $directory\DSCResources\MSFT_WaitForAll\MSFT_WaitForAll.psm1 | Where-Object {$_.RuleName -eq $violationName}
88
$noViolations = Invoke-ScriptAnalyzer $directory\DSCResources\MSFT_WaitForAny\MSFT_WaitForAny.psm1 | Where-Object {$_.RuleName -eq $violationName}
9-
$classViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\BadDscResource\BadDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
10-
$noClassViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
9+
10+
if ($PSVersionTable.PSVersion -ge [Version]'5.0')
11+
{
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}
14+
}
1115

1216
Describe "StandardDSCFunctionsInResource" {
1317
Context "When there are violations" {
@@ -27,7 +31,8 @@ Describe "StandardDSCFunctionsInResource" {
2731
}
2832
}
2933

30-
Describe "StandardDSCFunctionsInClass" {
34+
if ($PSVersionTable.PSVersion -ge [Version]'5.0') {
35+
Describe "StandardDSCFunctionsInClass" {
3136
Context "When there are violations" {
3237
It "has 1 missing standard DSC functions violation" {
3338
$classViolations.Count | Should Be 1
@@ -43,4 +48,5 @@ Describe "StandardDSCFunctionsInClass" {
4348
$noClassViolations.Count | Should Be 0
4449
}
4550
}
51+
}
4652
}

‎Tests/Rules/UseIdenticalParametersDSC.tests.ps1‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ $violationName = "PSDSCUseIdenticalParametersForDSC"
55
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
66
$violations = Invoke-ScriptAnalyzer $directory\DSCResources\MSFT_WaitForAll\MSFT_WaitForAll.psm1 | Where-Object {$_.RuleName -eq $violationName}
77
$noViolations = Invoke-ScriptAnalyzer $directory\DSCResources\MSFT_WaitForAny\MSFT_WaitForAny.psm1 | Where-Object {$_.RuleName -eq $violationName}
8-
$noClassViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
8+
9+
if ($PSVersionTable.PSVersion -ge [Version]'5.0')
10+
{
11+
$noClassViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
12+
}
913

1014
Describe "UseIdenticalParametersDSC" {
1115
Context "When there are violations" {
@@ -22,9 +26,13 @@ Describe "UseIdenticalParametersDSC" {
2226
It "returns no violations" {
2327
$noViolations.Count | Should Be 0
2428
}
29+
30+
if ($PSVersionTable.PSVersion -ge [Version]'5.0')
31+
{
2532

26-
It "returns no violations for DSC Classes" {
27-
$noClassViolations.Count | Should Be 0
33+
It "returns no violations for DSC Classes" {
34+
$noClassViolations.Count | Should Be 0
35+
}
2836
}
2937
}
3038
}

‎Tests/Rules/UseOutputTypeCorrectly.tests.ps1‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ $violationMessage = "The cmdlet 'Verb-Files' returns an object of type 'System.C
33
$violationName = "PSUseOutputTypeCorrectly"
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+
7+
if ($PSVersionTable.PSVersion -ge [Version]'5.0')
8+
{
9+
$dscViolations = Invoke-ScriptAnalyzer -ErrorAction SilentlyContinue $directory\DSCResources\MyDscResource\MyDscResource.psm1 | Where-Object {$_.RuleName -eq $violationName}
10+
}
11+
712
$noViolations = Invoke-ScriptAnalyzer $directory\GoodCmdlet.ps1 | Where-Object {$_.RuleName -eq $violationName}
813

914
Describe "UseOutputTypeCorrectly" {
@@ -15,9 +20,11 @@ Describe "UseOutputTypeCorrectly" {
1520
It "has the correct description message" {
1621
$violations[0].Message | Should Match $violationMessage
1722
}
18-
19-
It "Does not count violation in DSC class" {
20-
$dscViolations.Count | Should Be 0
23+
24+
if ($PSVersionTable.PSVersion -ge [Version]'5.0') {
25+
It "Does not count violation in DSC class" {
26+
$dscViolations.Count | Should Be 0
27+
}
2128
}
2229
}
2330

0 commit comments

Comments
 (0)