admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dominik Kaszewski
2022-07-25 22:43:48 +05:00
committed by GitHub
parent dc2e682f3a
commit 89cc6d1297
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
+1 -2
View File
@@ -136,12 +136,11 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
protected override void ProcessRecord()
{
JObject parsedJson = null;
bool result = true;
try
{
parsedJson = JObject.Parse(Json);
var parsedJson = JToken.Parse(Json);
if (_jschema != null)
{
test/powershell/Modules/Microsoft.PowerShell.Utility/Test-Json.Tests.ps1
+25 -1
View File
@@ -65,7 +65,7 @@ Describe "Test-Json" -Tags "CI" {
errorNode
}
"@
}
}
It "Missing JSON schema file doesn't exist" {
Test-Path -LiteralPath $missingSchemaJsonPath | Should -BeFalse
@@ -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
}
}