Add EscapeHandling parameter in ConvertTo-Json cmdlet

Fix test
Split tests
PowerShell · iSazonov · Oct 2, 2018 · iSazonov · Oct 2, 2018 · iSazonov
+        }
+        $expected1 = "{$newline  ""abc"": ""'def'""$newline}"
+        $expected2 = "{$newline  ""abc"": ""\u0027def\u0027""$newline}"
+        @{ 'abc' = "'def'" } | ConvertTo-Json | Should -BeExactly $expected1
-        # wait for verbose message from ConvertTo-Json to ensure cmdlet is processing
-        Wait-UntilTrue { $ps.Streams.Verbose.Count -gt 0 }
+        # wait that ConvertTo-Json cmdlet is processing
+        Start-Sleep -Milliseconds 300
-        # wait a bit to ensure state has changed, not using synchronous Stop() to avoid blocking Pester
-        Start-Sleep -Milliseconds 100
+        Wait-UntilTrue { $ps.Streams.Verbose.Count -gt 0 } -IntervalInMilliseconds 50
+        $null = $ps.Stop()
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1
@@ -22,7 +26,7 @@ Describe 'ConvertTo-Json' -tags "CI" {
        $null = $ps.AddScript({
            $obj = [PSCustomObject]@{P1 = ''; P2 = ''; P3 = ''; P4 = ''; P5 = ''; P6 = ''}
            $obj.P1 = $obj.P2 = $obj.P3 = $obj.P4 = $obj.P5 = $obj.P6 = $obj
-            1..100 | Foreach-Object { $obj } | ConvertTo-Json -Depth 10 -Verbose
+            1..100 | Foreach-Object { $obj } | ConvertTo-Json -Depth 10
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1
@@ -22,7 +26,7 @@ Describe 'ConvertTo-Json' -tags "CI" {
        $null = $ps.AddScript({
            $obj = [PSCustomObject]@{P1 = ''; P2 = ''; P3 = ''; P4 = ''; P5 = ''; P6 = ''}
            $obj.P1 = $obj.P2 = $obj.P3 = $obj.P4 = $obj.P5 = $obj.P6 = $obj
-            1..100 | Foreach-Object { $obj } | ConvertTo-Json -Depth 10 -Verbose
+            1..100 | Foreach-Object { $obj } | ConvertTo-Json -Depth 10