Skip to content

Normalize line endings before comparing string in tests #11499

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
adityapatwardhan merged 1 commit into from
Jan 8, 2020
Merged

Normalize line endings before comparing string in tests #11499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions test/powershell/Language/Scripting/Debugging/DebuggerCommand.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ Describe 'Basic debugger command tests' -tag 'CI' {

Copy link
Collaborator

@PoshChan PoshChan Jan 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adityapatwardhan, your last commit had 1 failures in PowerShell-CI-static-analysis
Verify Markdown Links.Verify links in /home/vsts/work/1/s/docs/debugging/README.md.https://blogs.msdn.microsoft.com/visualstudioalm/2016/03/10/experimental-net-core-debugging-in-vs-code/ should work

Failed to complete request to "https://blogs.msdn.microsoft.com/visualstudioalm/2016/03/10/experimental-net-core-debugging-in-vs-code/". Response status code does not indicate success: 410 (Gone).
at <ScriptBlock>, /home/vsts/work/1/s/test/common/markdown/markdown-link.tests.ps1: line 119
119:                                     throw "Failed to complete request to `"$url`". $($_.Exception.Message)"

Copy link
Collaborator

@PoshChan PoshChan Jan 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adityapatwardhan, your last commit had 2 failures in PowerShell-CI-static-analysis
Verify Markdown Links.Verify links in /home/vsts/work/1/s/docs/debugging/README.md.https://blogs.msdn.microsoft.com/visualstudioalm/2016/03/10/experimental-net-core-debugging-in-vs-code/ should work

Failed to complete request to "https://blogs.msdn.microsoft.com/visualstudioalm/2016/03/10/experimental-net-core-debugging-in-vs-code/". Response status code does not indicate success: 404 (Not Found).
at <ScriptBlock>, /home/vsts/work/1/s/test/common/markdown/markdown-link.tests.ps1: line 119
119:                                     throw "Failed to complete request to `"$url`". $($_.Exception.Message)"

Verify Markdown Links.Verify links in /home/vsts/work/1/s/docs/debugging/README.md.https://blogs.msdn.microsoft.com/visualstudioalm/2016/03/10/experimental-net-core-debugging-in-vs-code/ should work

Failed to complete request to "https://blogs.msdn.microsoft.com/visualstudioalm/2016/03/10/experimental-net-core-debugging-in-vs-code/". Response status code does not indicate success: 410 (Gone).
at <ScriptBlock>, /home/vsts/work/1/s/test/common/markdown/markdown-link.tests.ps1: line 119
119:                                     throw "Failed to complete request to `"$url`". $($_.Exception.Message)"

BeforeAll {
Register-DebuggerHandler

function NormalizeLineEnd
{
param (
[string] $string
)

$string -replace "`r`n", "`n"
}
}

AfterAll {
Expand Down Expand Up @@ -76,6 +85,7 @@ Describe 'Basic debugger command tests' -tag 'CI' {
7: }
8:
'@
$testScriptList = NormalizeLineEnd -string $testScriptList

$results = @(Test-Debugger -ScriptBlock $testScript -CommandQueue 'l','list')
$result = @{
Expand All @@ -99,7 +109,7 @@ Describe 'Basic debugger command tests' -tag 'CI' {
}

It 'Should show the entire script listing with the current position on line 5' {
$result['l'] | Should -BeExactly $testScriptList
(NormalizeLineEnd -string $result['l']) | Should -BeExactly $testScriptList
}
}

Expand All @@ -122,6 +132,8 @@ Describe 'Basic debugger command tests' -tag 'CI' {
8:
'@

$testScriptList = NormalizeLineEnd -string $testScriptList

$results = @(Test-Debugger -ScriptBlock $testScript -CommandQueue 'l 4','list 4')
$result = @{
'l 4' = if ($results.Count -gt 0) {$results[0].Output -replace '\s+$' -join [Environment]::NewLine -replace "^[`r`n]+|[`r`n]+$"}
Expand All @@ -144,7 +156,7 @@ Describe 'Basic debugger command tests' -tag 'CI' {
}

It 'Should show a partial script listing starting on line 4 with the current position on line 5' {
$result['l 4'] | Should -BeExactly $testScriptList
(NormalizeLineEnd -string $result['l 4']) | Should -BeExactly $testScriptList
}
}

Expand All @@ -164,6 +176,8 @@ Describe 'Basic debugger command tests' -tag 'CI' {
4:* Get-Process -Id $PID > $null
'@

$testScriptList = NormalizeLineEnd -string $testScriptList

$results = @(Test-Debugger -ScriptBlock $testScript -CommandQueue 'l 3 2','list 3 2')
$result = @{
'l 3 2' = if ($results.Count -gt 0) {$results[0].Output -replace '\s+$' -join [Environment]::NewLine -replace "^[`r`n]+|[`r`n]+$"}
Expand All @@ -186,7 +200,7 @@ Describe 'Basic debugger command tests' -tag 'CI' {
}

It 'Should show a partial script listing showing 3 lines starting on line 4 with the current position on line 5' {
$result['l 3 2'] | Should -BeExactly $testScriptList
(NormalizeLineEnd -string $result['l 3 2']) | Should -BeExactly $testScriptList
}
}

Expand Down
5 changes: 4 additions & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,10 @@ dbda : KM


"@
$expected = $expected -replace "`r`n", "`n"

$obj | Format-List | Out-String | Should -BeExactly $expected
$actual = $obj | Format-List | Out-String
$actual = $actual -replace "`r`n", "`n"
$actual | Should -BeExactly $expected
}
}
3 changes: 2 additions & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,7 @@ A Name B

"@

$obj | Format-Table | Out-String | Should -BeExactly $expected
$actual = $obj | Format-Table | Out-String
($actual.Replace("`r`n", "`n")) | Should -BeExactly ($expected.Replace("`r`n", "`n"))
}
}