Skip to content

Compare-Object Apply -IncludeEqual when -ExcludeDifferent is specified #12317

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
TravisEz13 merged 4 commits into from
Apr 30, 2020
Merged

Compare-Object Apply -IncludeEqual when -ExcludeDifferent is specified #12317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3de6b7d
Replace test for using -ExcludeDifferent without -IncludeEqual
Apr 15, 2020
ea8a784
Create test for using -ExcludeDifferent switch with -IncludeEqual set…
Apr 15, 2020
7844587
Apply -IncludeEqual switch when -ExcludeDifferent is specified
Apr 15, 2020
b0f98f1
Update comment to reflect new behavior
Apr 15, 2020
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
9 changes: 2 additions & 7 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/Compare-Object.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,18 +372,13 @@ private void Emit(OrderByPropertyEntry entry, string sideIndicator)
#region Overrides

/// <summary>
/// If the parameter 'ExcludeDifferent' is present, then we need to turn on the
/// 'IncludeEqual' switch unless it's turned off by the user specifically.
/// If the parameter 'ExcludeDifferent' is present, then the 'IncludeEqual'
/// switch is turned on unless it's turned off by the user specifically.
/// </summary>
protected override void BeginProcessing()
{
if (ExcludeDifferent)
{
if (_isIncludeEqualSpecified == false)
{
return;
}

if (_isIncludeEqualSpecified && !_includeEqual)
{
return;
Expand Down
12 changes: 9 additions & 3 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Compare-Object.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ Describe "Compare-Object" -Tags "CI" {
{ Compare-Object -ReferenceObject $(Get-Content $file3) -DifferenceObject $anonexistentvariable } | Should -Throw
}

It "Should give a 0 array when using excludedifferent switch without also using the includeequal switch" {
$actualOutput = Compare-Object -ReferenceObject $(Get-Content $file3) -DifferenceObject $(Get-Content $file4) -ExcludeDifferent
It "Should only display equal lines when excludeDifferent switch is used without the includeequal switch" {
$actualOutput = Compare-Object -ReferenceObject $(Get-Content $file3) -DifferenceObject $(Get-Content $file4) -ExcludeDifferent

$actualOutput.Length | Should -Be 0
$actualOutput.Length | Should -Be 2
}

It "Should only display equal lines when excludeDifferent switch is used alongside the includeequal switch" {
Expand All @@ -88,6 +88,12 @@ Describe "Compare-Object" -Tags "CI" {
$actualOutput.Length | Should -Be 2
}

It "Should give a 0 array when using excludedifferent switch when also setting the includeequal switch to false" {
$actualOutput = Compare-Object -ReferenceObject $(Get-Content $file3) -DifferenceObject $(Get-Content $file4) -ExcludeDifferent -IncludeEqual:$false

$actualOutput.Length | Should -Be 0
}

It "Should be able to pass objects to pipeline using the passthru switch" {
{ Compare-Object -ReferenceObject $(Get-Content $file3) -DifferenceObject $(Get-Content $file4) -Passthru | Format-Wide } | Should -Not -Throw
}
Expand Down