Skip to content

Fix Test-Json not handling non-object types at root #17741

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

Merged
iSazonov merged 2 commits into from
Jul 25, 2022
Merged

Fix Test-Json not handling non-object types at root #17741

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
519ec51
Fix Test-Json not handling non-object types at root
dkaszews Jul 21, 2022
674594e
Replace question mark alias with `Where-Object`
dkaszews Jul 22, 2022
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
3 changes: 1 addition & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,11 @@ e is SecurityException
/// </summary>
protected override void ProcessRecord()
{
JObject parsedJson = null;
bool result = true;

try
{
parsedJson = JObject.Parse(Json);
var parsedJson = JToken.Parse(Json);

if (_jschema != null)
{
Expand Down
26 changes: 25 additions & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Utility/Test-Json.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Describe "Test-Json" -Tags "CI" {
errorNode
}
"@
}
}

It "Missing JSON schema file doesn't exist" {
Test-Path -LiteralPath $missingSchemaJsonPath | Should -BeFalse
Expand Down Expand Up @@ -152,4 +152,28 @@ Describe "Test-Json" -Tags "CI" {
$errorVar[0].FullyQualifiedErrorId | Should -BeExactly "InvalidJsonAgainstSchema,Microsoft.PowerShell.Commands.TestJsonCommand"
$errorVar[1].FullyQualifiedErrorId | Should -BeExactly "InvalidJsonAgainstSchema,Microsoft.PowerShell.Commands.TestJsonCommand"
}

It 'Test-Json recognizes non-object types: <name>' -TestCases @(
@{ name = 'number'; value = 1; expected = 'number' }
@{ name = '"true"'; value = '"true"'; expected = 'string' }
@{ name = 'true'; value = 'true'; expected = 'boolean' }
@{ name = '"false"'; value = '"false"'; expected = 'string' }
@{ name = 'false'; value = 'false'; expected = 'boolean' }
@{ name = '"null"'; value = '"null"'; expected = 'string' }
@{ name = 'null'; value = 'null'; expected = 'null' }
@{ name = 'string'; value = '"abc"'; expected = 'string' }
@{ name = 'array'; value = '[ 1, 2 ]'; expected = 'array' }
) {
param ($name, $value, $expected)

# All JSON valid
Test-Json -Json $value | Should -BeTrue

# Exactly one type should match
$types = 'string', 'number', 'boolean', 'null', 'array', 'object'
$types | Where-Object {
$schema = "{ 'type': '$_' }"
Test-Json -Json $value -Schema $schema -ErrorAction SilentlyContinue
} | Should -Be $expected
}
}