Skip to content

Commit cb5680a

Browse files
author
Quoc Truong
committed
Fix test cases failures
1 parent 8172b1a commit cb5680a

35 files changed

Lines changed: 76 additions & 88 deletions

‎Tests/Engine/CommunityAnalyzerRules/CommunityAnalyzerRules.psm1‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ function Measure-RequiresRunAsAdministrator
9595
$result = [Microsoft.Windows.Powershell.ScriptAnalyzer.Generic.DiagnosticRecord]@{"Message" = $Messages.MeasureRequiresRunAsAdministrator;
9696
"Extent" = $assignmentAst.Extent;
9797
"RuleName" = $PSCmdlet.MyInvocation.InvocationName;
98-
"Severity" = "Strict"}
98+
"Severity" = "Information"}
9999
$results += $result
100100
}
101101
}
@@ -106,7 +106,7 @@ function Measure-RequiresRunAsAdministrator
106106
$result = [Microsoft.Windows.Powershell.ScriptAnalyzer.Generic.DiagnosticRecord]@{"Message" = $Messages.MeasureRequiresRunAsAdministrator;
107107
"Extent" = $assignmentAst.Extent;
108108
"RuleName" = $PSCmdlet.MyInvocation.InvocationName;
109-
"Severity" = "Strict"}
109+
"Severity" = "Information"}
110110
$results += $result
111111
}
112112
}
@@ -195,7 +195,7 @@ function Measure-RequiresModules
195195
$result = [Microsoft.Windows.Powershell.ScriptAnalyzer.Generic.DiagnosticRecord]@{"Message" = $Messages.MeasureRequiresModules;
196196
"Extent" = $ast.Extent;
197197
"RuleName" = $PSCmdlet.MyInvocation.InvocationName;
198-
"Severity" = "Strict"}
198+
"Severity" = "Information"}
199199
$results += $result
200200
}
201201
}
@@ -209,7 +209,7 @@ function Measure-RequiresModules
209209
$result = [Microsoft.Windows.Powershell.ScriptAnalyzer.Generic.DiagnosticRecord]@{"Message" = $Messages.MeasureRequiresModules;
210210
"Extent" = $ast.Extent;
211211
"RuleName" = $PSCmdlet.MyInvocation.InvocationName;
212-
"Severity" = "Strict"}
212+
"Severity" = "Information"}
213213
$results += $result
214214
}
215215
}
@@ -288,7 +288,7 @@ function Measure-LongClassName
288288
$result = [Microsoft.Windows.Powershell.ScriptAnalyzer.Generic.DiagnosticRecord]@{"Message" = $Messages.MeasureLongClassName;
289289
"Extent" = $sbResult.BoundParameters["TypeName"].Value.Extent;
290290
"RuleName" = $PSCmdlet.MyInvocation.InvocationName;
291-
"Severity" = "Strict"}
291+
"Severity" = "Information"}
292292
$results += $result
293293
}
294294
}
@@ -346,7 +346,7 @@ function Measure-DeprecatedWMIClass
346346
$result = [Microsoft.Windows.Powershell.ScriptAnalyzer.Generic.DiagnosticRecord]@{"Message" = $Messages.MeasureDeprecatedWMIClass;
347347
"Extent" = $StringConstantExpressionAst.Extent;
348348
"RuleName" = $PSCmdlet.MyInvocation.InvocationName;
349-
"Severity" = "Strict"}
349+
"Severity" = "Information"}
350350
$results += $result
351351
}
352352

@@ -511,7 +511,7 @@ function Measure-CurlyBracket
511511
$result = [Microsoft.Windows.Powershell.ScriptAnalyzer.Generic.DiagnosticRecord]@{"Message" = $Messages.MeasureCurlyBracket;
512512
"Extent" = $ast.Extent;
513513
"RuleName" = $PSCmdlet.MyInvocation.InvocationName;
514-
"Severity" = "Strict"}
514+
"Severity" = "Information"}
515515
$results += $result
516516
}
517517
}

‎Tests/Engine/GetScriptAnalyzerRule.tests.ps1‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
Import-Module -Verbose ScriptAnalyzer
1+
Import-Module -Verbose PSScriptAnalyzer
22
$sa = Get-Command Get-ScriptAnalyzerRule
33
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
44
$singularNouns = "PSUseSingularNouns"
55
$approvedVerbs = "PSUseApprovedVerbs"
6-
$unloadableModule = "PSAvoidUnloadableModule"
76
$dscIdentical = "PSDSCUseIdenticalParametersForDSC"
87

98
Describe "Test available parameters" {
@@ -45,9 +44,8 @@ Describe "Test Name parameters" {
4544
}
4645

4746
It "works with 3 names" {
48-
$rules = Get-ScriptAnalyzerRule -Name $unloadableModule, $approvedVerbs, $singularNouns
49-
$rules.Count | Should Be 3
50-
($rules | Where-Object {$_.Name -eq $unloadableModule}).Count | Should Be 1
47+
$rules = Get-ScriptAnalyzerRule -Name $approvedVerbs, $singularNouns
48+
$rules.Count | Should Be 2
5149
($rules | Where-Object {$_.Name -eq $singularNouns}).Count | Should Be 1
5250
($rules | Where-Object {$_.Name -eq $approvedVerbs}).Count | Should Be 1
5351
}

‎Tests/Engine/InvokeScriptAnalyzer.tests.ps1‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Import-Module ScriptAnalyzer
1+
Import-Module PSScriptAnalyzer
22
$sa = Get-Command Invoke-ScriptAnalyzer
33
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
44
$singularNouns = "PSUseSingularNouns"
@@ -26,16 +26,6 @@ Describe "Test available parameters" {
2626
}
2727
}
2828

29-
Context "LoggerPath parameters" {
30-
It "has a LoggerPath parameter" {
31-
$params.ContainsKey("LoggerPath") | Should Be $true
32-
}
33-
34-
It "accepts string array" {
35-
$params["LoggerPath"].ParameterType.FullName | Should Be "System.String[]"
36-
}
37-
}
38-
3929
Context "IncludeRule parameters" {
4030
It "has an IncludeRule parameter" {
4131
$params.ContainsKey("IncludeRule") | Should Be $true
@@ -72,21 +62,21 @@ Describe "Test Path" {
7262
}
7363

7464
Context "When given a directory" {
75-
$withoutPathWithDirectory = Invoke-ScriptAnalyzer $directory\RecursionDirectoryTest
76-
$withPathWithDirectory = Invoke-ScriptAnalyzer -Path $directory\RecursionDirectoryTest
65+
$withoutPathWithDirectory = Invoke-ScriptAnalyzer -Recurse $directory\RecursionDirectoryTest
66+
$withPathWithDirectory = Invoke-ScriptAnalyzer -Recurse -Path $directory\RecursionDirectoryTest
7767

7868
It "Has the same count as without Path parameter"{
7969
$withoutPathWithDirectory.Count -eq $withPathWithDirectory.Count | Should Be $true
8070
}
8171

82-
It "Analyzes all the file" {
72+
It "Analyzes all the files" {
8373
$globalVarsViolation = $withPathWithDirectory | Where-Object {$_.RuleName -eq "PSAvoidGlobalVars"}
8474
$clearHostViolation = $withPathWithDirectory | Where-Object {$_.RuleName -eq "PSAvoidUsingClearHost"}
8575
$writeHostViolation = $withPathWithDirectory | Where-Object {$_.RuleName -eq "PSAvoidUsingWriteHost"}
8676
Write-Output $globalVarsViolation.Count
8777
Write-Output $clearHostViolation.Count
8878
Write-Output $writeHostViolation.Count
89-
$globalVarsViolation.Count -eq 1 -and $clearHostViolation.Count -eq 1 -and $writeHostViolation.Count -eq 1 | Should Be $true
79+
$globalVarsViolation.Count -eq 1 -and $writeHostViolation.Count -eq 1 | Should Be $true
9080
}
9181

9282
}
@@ -151,12 +141,12 @@ Describe "Test Exclude And Include" {
151141
Describe "Test Severity" {
152142
Context "When used correctly" {
153143
It "works with one argument" {
154-
$errors = Invoke-ScriptAnalyzer $directory\TestScript.ps1 -Severity Strict
144+
$errors = Invoke-ScriptAnalyzer $directory\TestScript.ps1 -Severity Information
155145
$errors.Count | Should Be 0
156146
}
157147

158148
It "works with 2 arguments" {
159-
$errors = Invoke-ScriptAnalyzer $directory\TestScript.ps1 -Severity Strict, Warning
149+
$errors = Invoke-ScriptAnalyzer $directory\TestScript.ps1 -Severity Information, Warning
160150
$errors.Count | Should Be 2
161151
}
162152
}

‎Tests/Rules/AvoidConvertToSecureStringWithPlainText.tests.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Import-Module ScriptAnalyzer
1+
Import-Module PSScriptAnalyzer
22
Set-Alias ctss ConvertTo-SecureString
3-
$violationMessage = "File AvoidConvertToSecureStringWithPlainText.ps1 uses ConvertTo-SecureString with plaintext. This will expose secure information. Encrypted standard strings should be used instead."
3+
$violationMessage = "File 'AvoidConvertToSecureStringWithPlainText.ps1' uses ConvertTo-SecureString with plaintext. This will expose secure information. Encrypted standard strings should be used instead."
44
$violationName = "PSAvoidUsingConvertToSecureStringWithPlainText"
55
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
66
$violations = Invoke-ScriptAnalyzer $directory\AvoidConvertToSecureStringWithPlainText.ps1 | Where-Object {$_.RuleName -eq $violationName}

‎Tests/Rules/AvoidDefaultTrueValueSwitchParameter.tests.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Import-Module ScriptAnalyzer
2-
$violationMessage = "File AvoidDefaultTrueValueSwitchParameter.ps1 has a switch parameter default to true."
1+
Import-Module PSScriptAnalyzer
2+
$violationMessage = "File 'AvoidDefaultTrueValueSwitchParameter.ps1' has a switch parameter default to true."
33
$violationName = "PSAvoidDefaultValueSwitchParameter"
44
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
55
$violations = Invoke-ScriptAnalyzer $directory\AvoidDefaultTrueValueSwitchParameter.ps1 | Where-Object {$_.RuleName -eq $violationName}

‎Tests/Rules/AvoidEmptyCatchBlock.tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Import-Module ScriptAnalyzer
1+
Import-Module PSScriptAnalyzer
22
$violationMessage = "Empty catch block is used. Please use Write-Error or throw statements in catch blocks."
33
$violationName = "PSAvoidUsingEmptyCatchBlock"
44
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path

‎Tests/Rules/AvoidGlobalOrUnitializedVars.tests.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Import-Module ScriptAnalyzer
1+
Import-Module PSScriptAnalyzer
22
$globalMessage = "Found global variable 'Global:1'."
33
$globalName = "PSAvoidGlobalVars"
44
$nonInitializedName = "PSAvoidUninitializedVariable"
5-
$nonInitializedMessage = "Variable a is not initialized. Non-global variables must be initialized. To fix a violation of this rule, please initialize non-global variables."
5+
$nonInitializedMessage = "Variable 'a' is not initialized. Non-global variables must be initialized. To fix a violation of this rule, please initialize non-global variables."
66
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
77
$violations = Invoke-ScriptAnalyzer $directory\AvoidGlobalOrUnitializedVars.ps1
88
$globalViolations = $violations | Where-Object {$_.RuleName -eq $globalName}
@@ -18,7 +18,7 @@ Describe "AvoidGlobalVars" {
1818
}
1919

2020
It "has the correct description message" {
21-
$violations[0].Message | Should Match $violationMessage
21+
$violations[0].Message | Should Match $globalMessage
2222
}
2323
}
2424

‎Tests/Rules/AvoidInvokingEmptyMembers.tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Import-Module ScriptAnalyzer
1+
Import-Module PSScriptAnalyzer
22

33
$violationMessage = "() has non-constant members. Invoking empty members may cause bugs in the script."
44
$violationName = "PSAvoidInvokingEmptyMembers"

‎Tests/Rules/AvoidPositionalParameters.tests.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Import-Module ScriptAnalyzer
2-
$violationMessage = "Cmdlet Get-Content has positional parameter. Please use named parameters instead of positional parameters when calling a command."
1+
Import-Module PSScriptAnalyzer
2+
$violationMessage = "Cmdlet 'Get-Content' has positional parameter. Please use named parameters instead of positional parameters when calling a command."
33
$violationName = "PSAvoidUsingPositionalParameters"
44
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
55
$violations = Invoke-ScriptAnalyzer $directory\AvoidPositionalParameters.ps1 | Where-Object {$_.RuleName -eq $violationName}

‎Tests/Rules/AvoidReservedParams.tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Import-Module ScriptAnalyzer
1+
Import-Module PSScriptAnalyzer
22
$violationMessage = [regex]::Escape("Verb-Files' defines the reserved common parameter 'Verbose'.")
33
$violationName = "PSReservedParams"
44
$directory = Split-Path -Parent $MyInvocation.MyCommand.Path

0 commit comments

Comments
 (0)