Skip to content

Commit

Permalink
Use the actual object instead of 'the other'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nohwnd
nohwnd committed Jun 18, 2024
1 parent f1ccddf commit c5d3b04
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions src/functions/assert/Equivalence/Should-BeEquivalent.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ function Compare-HashtableEquivalent ($Actual, $Expected, $Property, $Options) {
$actualHasKey = $actualKeys -contains $k
if (-not $actualHasKey) {
Write-EquivalenceResult -Difference "`$Actual is missing key '$k'."
$result += "Expected has key '$k' that the other object does not have."
$result += "Expected has key '$k' that the actual object does not have."
continue
}

Expand All @@ -303,7 +303,7 @@ function Compare-HashtableEquivalent ($Actual, $Expected, $Property, $Options) {
}

foreach ($k in $filteredKeysNotInExpected | & $SafeCommands['Where-Object'] { $_ }) {
$result += "Expected is missing key '$k' that the other object has."
$result += "Expected is missing key '$k' that the actual object has."
}
}

Expand Down Expand Up @@ -344,7 +344,7 @@ function Compare-DictionaryEquivalent ($Actual, $Expected, $Property, $Options)
$actualHasKey = $actualKeys -contains $k
if (-not $actualHasKey) {
Write-EquivalenceResult -Difference "`$Actual is missing key '$k'."
$result += "Expected has key '$k' that the other object does not have."
$result += "Expected has key '$k' that the actual object does not have."
continue
}

Expand All @@ -367,7 +367,7 @@ function Compare-DictionaryEquivalent ($Actual, $Expected, $Property, $Options)
}

foreach ($k in $filteredKeysNotInExpected | & $SafeCommands['Where-Object'] { $_ }) {
$result += "Expected is missing key '$k' that the other object has."
$result += "Expected is missing key '$k' that the actual object has."
}
}

Expand Down Expand Up @@ -406,7 +406,7 @@ function Compare-ObjectEquivalent ($Actual, $Expected, $Property, $Options) {
$actualProperty = $actualProperties | & $SafeCommands['Where-Object'] { $_.Name -eq $propertyName }
if (-not $actualProperty) {
Write-EquivalenceResult -Difference "Property '$propertyName' was not found on `$Actual."
"Expected has property '$PropertyName' that the other object does not have."
"Expected has property '$PropertyName' that the actual object does not have."
continue
}
Write-EquivalenceResult "Property '$propertyName` was found on `$Actual, comparing them for equivalence."
Expand Down Expand Up @@ -439,7 +439,7 @@ function Compare-ObjectEquivalent ($Actual, $Expected, $Property, $Options) {

# fix for powershell v2 where foreach goes once over null
foreach ($p in $filteredPropertiesNotInExpected | & $SafeCommands['Where-Object'] { $_ }) {
"Expected is missing property '$($p.Name)' that the other object has."
"Expected is missing property '$($p.Name)' that the actual object has."
}
}
}
Expand All @@ -463,7 +463,7 @@ function Compare-DataRowEquivalent ($Actual, $Expected, $Property, $Options) {
$propertyName = $p.Name
$actualProperty = $actualProperties | & $SafeCommands['Where-Object'] { $_.Name -eq $propertyName }
if (-not $actualProperty) {
"Expected has property '$PropertyName' that the other object does not have."
"Expected has property '$PropertyName' that the actual object does not have."
continue
}

Expand All @@ -477,7 +477,7 @@ function Compare-DataRowEquivalent ($Actual, $Expected, $Property, $Options) {

# fix for powershell v2 where foreach goes once over null
foreach ($p in $propertiesNotInExpected | & $SafeCommands['Where-Object'] { $_ }) {
"Expected is missing property '$($p.Name)' that the other object has."
"Expected is missing property '$($p.Name)' that the actual object has."
}
}

Expand Down
12 changes: 6 additions & 6 deletions tst/functions/assert/Equivalence/Should-BeEquivalent.Tests.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,9 @@ InPesterModuleScope {

It "Given values '<expected>' and '<actual>' that are not equivalent it returns message '<message>'." -TestCases @(
@{ Actual = 'a'; Expected = @{ Name = 'Jakub' }; Message = "Expected hashtable @{Name='Jakub'}, but got 'a'." }
@{ Actual = @{ }; Expected = @{ Name = 'Jakub' }; Message = "Expected hashtable @{Name='Jakub'}, but got @{}.`nExpected has key 'Name' that the other object does not have." }
@{ Actual = @{ }; Expected = @{ Name = 'Jakub' }; Message = "Expected hashtable @{Name='Jakub'}, but got @{}.`nExpected has key 'Name' that the actual object does not have." }
@{ Actual = @{ Name = 'Tomas' }; Expected = @{ Name = 'Jakub' }; Message = "Expected hashtable @{Name='Jakub'}, but got @{Name='Tomas'}.`nExpected property .Name with value 'Jakub' to be equivalent to the actual value, but got 'Tomas'." }
@{ Actual = @{ Name = 'Tomas'; Value = 10 }; Expected = @{ Name = 'Jakub' }; Message = "Expected hashtable @{Name='Jakub'}, but got @{Name='Tomas'; Value=10}.`nExpected property .Name with value 'Jakub' to be equivalent to the actual value, but got 'Tomas'.`nExpected is missing key 'Value' that the other object has." }
@{ Actual = @{ Name = 'Tomas'; Value = 10 }; Expected = @{ Name = 'Jakub' }; Message = "Expected hashtable @{Name='Jakub'}, but got @{Name='Tomas'; Value=10}.`nExpected property .Name with value 'Jakub' to be equivalent to the actual value, but got 'Tomas'.`nExpected is missing key 'Value' that the actual object has." }
) {
param ($Actual, $Expected, $Message)

Expand All @@ -282,9 +282,9 @@ InPesterModuleScope {

It "Given values '<expected>' and '<actual>' that are not equivalent it returns message '<message>'." -TestCases @(
@{ Actual = 'a'; Expected = New-Dictionary @{ Name = 'Jakub' }; Message = "Expected dictionary Dictionary{Name='Jakub'}, but got 'a'." }
@{ Actual = New-Dictionary @{ }; Expected = New-Dictionary @{ Name = 'Jakub' }; Message = "Expected dictionary Dictionary{Name='Jakub'}, but got Dictionary{}.`nExpected has key 'Name' that the other object does not have." }
@{ Actual = New-Dictionary @{ }; Expected = New-Dictionary @{ Name = 'Jakub' }; Message = "Expected dictionary Dictionary{Name='Jakub'}, but got Dictionary{}.`nExpected has key 'Name' that the actual object does not have." }
@{ Actual = New-Dictionary @{ Name = 'Tomas' }; Expected = New-Dictionary @{ Name = 'Jakub' }; Message = "Expected dictionary Dictionary{Name='Jakub'}, but got Dictionary{Name='Tomas'}.`nExpected property .Name with value 'Jakub' to be equivalent to the actual value, but got 'Tomas'." }
@{ Actual = New-Dictionary @{ Name = 'Tomas'; Value = 10 }; Expected = New-Dictionary @{ Name = 'Jakub' }; Message = "Expected dictionary Dictionary{Name='Jakub'}, but got Dictionary{Name='Tomas'; Value=10}.`nExpected property .Name with value 'Jakub' to be equivalent to the actual value, but got 'Tomas'.`nExpected is missing key 'Value' that the other object has." }
@{ Actual = New-Dictionary @{ Name = 'Tomas'; Value = 10 }; Expected = New-Dictionary @{ Name = 'Jakub' }; Message = "Expected dictionary Dictionary{Name='Jakub'}, but got Dictionary{Name='Tomas'; Value=10}.`nExpected property .Name with value 'Jakub' to be equivalent to the actual value, but got 'Tomas'.`nExpected is missing key 'Value' that the actual object has." }
) {
param ($Actual, $Expected, $Message)

Expand Down Expand Up @@ -374,12 +374,12 @@ InPesterModuleScope {
@{
Expected = [PSCustomObject]@{ Name = 'Jakub'; Age = 28 }
Actual = [PSCustomObject]@{ Name = 'Jakub' }
Message = "Expected has property 'Age' that the other object does not have."
Message = "Expected has property 'Age' that the actual object does not have."
},
@{
Expected = [PSCustomObject]@{ Name = 'Jakub' }
Actual = [PSCustomObject]@{ Name = 'Jakub'; Age = 28 }
Message = "Expected is missing property 'Age' that the other object has."
Message = "Expected is missing property 'Age' that the actual object has."
}
) {
param ($Expected, $Actual, $Message)
Expand Down

0 comments on commit c5d3b04

Please sign in to comment.