Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix parsing of empty hashtable when string is provided as settings object #1073

Merged
merged 2 commits into from
Oct 3, 2018
Merged

Fix parsing of empty hashtable when string is provided as settings object #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa4901b
Fix parsing of empty hashtable when string is provided as settings ob…
bergmeister Sep 25, 2018
59277c7
Fix test as bug only occurs when test settings file is present
bergmeister Sep 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions Engine/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,11 +560,6 @@ private Hashtable GetHashtableFromHashTableAst(HashtableAst hashTableAst)
}
}

if (rhsList.Count == 0)
{
ThrowInvalidDataException(kvp.Item2);
}

output[key] = rhsList.ToArray();
}

Expand Down Expand Up @@ -629,7 +624,7 @@ private List<string> GetArrayFromArrayExpressionAst(ArrayExpressionAst arrayExp)
}
}

return null;
return result;
}

private void ThrowInvalidDataException(Ast ast)
Expand Down
18 changes: 11 additions & 7 deletions Tests/Engine/Settings.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,23 @@ Describe "Settings Precedence" {

Describe "Settings Class" {
Context "When an empty hashtable is provided" {
BeforeAll {
$settings = New-Object -TypeName $settingsTypeName -ArgumentList @{}
}

It "Should return empty <name> property" -TestCases @(
@{ Name = "IncludeRules" }
@{ Name = "ExcludeRules" }
@{ Name = "Severity" }
@{ Name = "RuleArguments" }
) {
Param($Name)
) {
Param($Name)

${settings}.${Name}.Count | Should -Be 0
$settings = New-Object -TypeName $settingsTypeName -ArgumentList @{}
${settings}.${Name}.Count | Should -Be 0
}

It "Should be able to parse empty settings hashtable from settings file" {
$testPSSASettingsFilePath = "TestDrive:\PSSASettings.psd1"
Set-Content $testPSSASettingsFilePath -Value '@{ExcludeRules = @()}'
Invoke-ScriptAnalyzer -ScriptDefinition 'gci' -Settings $testPSSASettingsFilePath | Should -Not -BeNullOrEmpty
}
}

Expand Down Expand Up @@ -104,7 +108,7 @@ Describe "Settings Class" {
It "Should return $expectedNumberOfIncludeRules IncludeRules" {
$settings.IncludeRules.Count | Should -Be $expectedNumberOfIncludeRules
}

$expectedNumberOfExcludeRules = 3
It "Should return $expectedNumberOfExcludeRules ExcludeRules" {
$settings.ExcludeRules.Count | Should -Be $expectedNumberOfExcludeRules
Expand Down