Skip to content

Commit 578fa16

Browse files
Refactor skip logic in PSScriptAnalyzer tests for improved clarity and maintainability
1 parent 8671d8b commit 578fa16

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

scripts/tests/PSScriptAnalyzer/PSScriptAnalyzer.Tests.ps1

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,28 @@ BeforeDiscovery {
2121
$ruleObjects = Get-ScriptAnalyzerRule -Verbose:$false | Sort-Object -Property Severity, CommonName
2222
$Severeties = $ruleObjects | Select-Object -ExpandProperty Severity -Unique
2323
foreach ($ruleObject in $ruleObjects) {
24+
$skip = if ($ruleObject.RuleName -in $settings.ExcludeRules) {
25+
$true
26+
} elseif ($settings.IncludeRules -and $ruleObject.RuleName -notin $settings.IncludeRules) {
27+
$skip = $true
28+
} elseif ($settings.Severity -and $ruleObject.Severity -notin $settings.Severity) {
29+
$skip = $true
30+
} elseif ($settings.SourceType -and $ruleObject.SourceType -notin $settings.SourceType) {
31+
$skip = $true
32+
} elseif ($settings.SourceName -and $ruleObject.SourceName -notin $settings.SourceName) {
33+
$skip = $true
34+
} elseif ($settings.Rules -and $settings.Rules.ContainsKey($ruleObject.RuleName) -and $settings.Rules[$ruleObject.RuleName].Enabled -eq $false) {
35+
$skip = $true
36+
} else {
37+
$skip = $false
38+
}
2439
$rules.Add(
2540
[ordered]@{
2641
RuleName = $ruleObject.RuleName
2742
CommonName = $ruleObject.CommonName
2843
Severity = $ruleObject.Severity
2944
Description = $ruleObject.Description
30-
Skip = $ruleObject.RuleName -in $settings.ExcludeRules
45+
Skip = $skip
3146
<#
3247
RuleName : PSDSCUseVerboseMessageInDSCResource
3348
CommonName : Use verbose message in DSC resource

0 commit comments

Comments
 (0)