Skip to content

Commit

Permalink
Fix $error
Browse files Browse the repository at this point in the history
  • Loading branch information
nohwnd committed Apr 6, 2024
1 parent cfaa965 commit 911a465
Show file tree
Hide file tree
Showing 14 changed files with 62 additions and 62 deletions.
8 changes: 4 additions & 4 deletions tst/functions/assert/Boolean/Assert-False.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Describe "Assert-False" {
}

It "Fails with custom message" {
$error = { 9 | Assert-False -CustomMessage "<actual> is not false" } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal "9 is not false"
$err = { 9 | Assert-False -CustomMessage "<actual> is not false" } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal "9 is not false"
}

Context "Validate messages" {
Expand All @@ -30,8 +30,8 @@ Describe "Assert-False" {
@{ Actual = 10 ; Message = "Expected int '10' to be bool '`$false' or falsy value 0, """", `$null, @()." }
) {
param($Actual, $Message)
$error = { Assert-False -Actual $Actual } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal $Message
$err = { Assert-False -Actual $Actual } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal $Message
}
}

Expand Down
8 changes: 4 additions & 4 deletions tst/functions/assert/Boolean/Assert-True.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Describe "Assert-True" {
}

It "Fails with custom message" {
$error = { $null | Assert-True -CustomMessage "<actual> is not true" } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal "`$null is not true"
$err = { $null | Assert-True -CustomMessage "<actual> is not true" } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal "`$null is not true"
}

Context "Validate messages" {
Expand All @@ -26,8 +26,8 @@ Describe "Assert-True" {
@{ Actual = 0 ; Message = "Expected int '0' to be bool '`$true' or truthy value." }
) {
param($Actual, $Message)
$error = { Assert-True -Actual $Actual } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal $Message
$err = { Assert-True -Actual $Actual } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal $Message
}
}

Expand Down
8 changes: 4 additions & 4 deletions tst/functions/assert/Collection/Assert-Contain.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ InPesterModuleScope {
}

It "Fails when collection of single item does not contain the expected item" {
$error = { @(5) | Assert-Contain 1 } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal "Expected int '1' to be present in collection '5', but it was not there."
$err = { @(5) | Assert-Contain 1 } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal "Expected int '1' to be present in collection '5', but it was not there."
}

It "Passes when collection of multiple items contains the expected item" {
@(1,2,3) | Assert-Contain 1
}

It "Fails when collection of multiple items does not contain the expected item" {
$error = { @(5,6,7) | Assert-Contain 1 } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal "Expected int '1' to be present in collection '5, 6, 7', but it was not there."
$err = { @(5,6,7) | Assert-Contain 1 } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal "Expected int '1' to be present in collection '5, 6, 7', but it was not there."
}

It "Can be called with positional parameters" {
Expand Down
8 changes: 4 additions & 4 deletions tst/functions/assert/Collection/Assert-NotContain.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ Set-StrictMode -Version Latest
InPesterModuleScope {
Describe "Assert-NotContain" {
It "Fails when collection of single item contains the expected item" {
$error = { @(1) | Assert-NotContain 1 } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal "Expected int '1' to not be present in collection '1', but it was there."
$err = { @(1) | Assert-NotContain 1 } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal "Expected int '1' to not be present in collection '1', but it was there."
}

It "Passes when collection of single item does not contain the expected item" {
@(5) | Assert-NotContain 1
}

It "Fails when collection of multiple items contains the expected item" {
$error = { @(1,2,3) | Assert-NotContain 1 } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal "Expected int '1' to not be present in collection '1, 2, 3', but it was there."
$err = { @(1,2,3) | Assert-NotContain 1 } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal "Expected int '1' to not be present in collection '1, 2, 3', but it was there."
}

It "Passes when collection of multiple items does not contain the expected item" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
InPesterModuleScope {
Describe "Ensure-ExpectedIsNotCollection" {
It "Given a collection it throws ArgumentException" {
$error = { Ensure-ExpectedIsNotCollection -InputObject @() } | Verify-Throw
$error.Exception | Verify-Type ([ArgumentException])
$err = { Ensure-ExpectedIsNotCollection -InputObject @() } | Verify-Throw
$err.Exception | Verify-Type ([ArgumentException])
}

It "Given a collection it throws correct message" {
$error = { Ensure-ExpectedIsNotCollection -InputObject @() } | Verify-Throw
$error.Exception.Message | Verify-Equal 'You provided a collection to the -Expected parameter. Using a collection on the -Expected side is not allowed by this assertion, because it leads to unexpected behavior. Please use Assert-Any, Assert-All or some other specialized collection assertion.'
$err = { Ensure-ExpectedIsNotCollection -InputObject @() } | Verify-Throw
$err.Exception.Message | Verify-Equal 'You provided a collection to the -Expected parameter. Using a collection on the -Expected side is not allowed by this assertion, because it leads to unexpected behavior. Please use Assert-Any, Assert-All or some other specialized collection assertion.'
}


Expand Down
8 changes: 4 additions & 4 deletions tst/functions/assert/Exception/Assert-Throw.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ Describe "Assert-Throw" {
}

It "Given scriptblock that throws it returns ErrorRecord to the output" {
$error = { throw [InvalidOperationException]"error" } | Assert-Throw
$error | Verify-Type ([Management.Automation.ErrorRecord])
$error.Exception | Verify-Type ([System.InvalidOperationException])
$error.Exception.Message | Verify-Equal "error"
$err = { throw [InvalidOperationException]"error" } | Assert-Throw
$err | Verify-Type ([Management.Automation.ErrorRecord])
$err.Exception | Verify-Type ([System.InvalidOperationException])
$err.Exception.Message | Verify-Equal "error"
}
}

Expand Down
12 changes: 6 additions & 6 deletions tst/functions/assert/General/Assert-Equal.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ InPesterModuleScope {
}

It "Fails with custom message" {
$error = { 9 | Assert-Equal 3 -CustomMessage "<expected> is not <actual>" } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal "3 is not 9"
$err = { 9 | Assert-Equal 3 -CustomMessage "<expected> is not <actual>" } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal "3 is not 9"
}

Context "Validate messages" {
Expand All @@ -71,8 +71,8 @@ InPesterModuleScope {
@{ Expected = "a" ; Actual = 10.1D ; Message = "Expected string 'a', but got decimal '10.1'."}
) {
param($Expected, $Actual, $Message)
$error = { Assert-Equal -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal $Message
$err = { Assert-Equal -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal $Message
}
}

Expand All @@ -86,8 +86,8 @@ InPesterModuleScope {
}

It "Given collection to Expected it throws" {
$error = { "dummy" | Assert-Equal @() } | Verify-Throw
$error.Exception | Verify-Type ([ArgumentException])
$err = { "dummy" | Assert-Equal @() } | Verify-Throw
$err.Exception | Verify-Type ([ArgumentException])
}
}
}
8 changes: 4 additions & 4 deletions tst/functions/assert/General/Assert-GreaterThan.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ InPesterModuleScope {
@{ Expected = 10.1D ; Actual = 1.1D ; Message = "Expected decimal '1.1' to be greater than decimal '10.1', but it was not."}
) {
param($Expected, $Actual, $Message)
$error = { Assert-GreaterThan -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal $Message
$err = { Assert-GreaterThan -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal $Message
}
}

Expand All @@ -104,8 +104,8 @@ InPesterModuleScope {
}

It "Given collection to Expected it throws" {
$error = { "dummy" | Assert-GreaterThan @() } | Verify-Throw
$error.Exception | Verify-Type ([ArgumentException])
$err = { "dummy" | Assert-GreaterThan @() } | Verify-Throw
$err.Exception | Verify-Type ([ArgumentException])
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ InPesterModuleScope {
@{ Expected = 10.1D ; Actual = 1.1D ; Message = "Expected decimal '1.1' to be greater than or equal to decimal '10.1', but it was not."}
) {
param($Expected, $Actual, $Message)
$error = { Assert-GreaterThanOrEqual -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal $Message
$err = { Assert-GreaterThanOrEqual -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal $Message
}
}

Expand All @@ -104,8 +104,8 @@ InPesterModuleScope {
}

It "Given collection to Expected it throws" {
$error = { "dummy" | Assert-GreaterThanOrEqual @() } | Verify-Throw
$error.Exception | Verify-Type ([ArgumentException])
$err = { "dummy" | Assert-GreaterThanOrEqual @() } | Verify-Throw
$err.Exception | Verify-Type ([ArgumentException])
}
}
}
8 changes: 4 additions & 4 deletions tst/functions/assert/General/Assert-LessThan.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ Describe "Assert-LessThan" {
@{ Expected = 1.1D ; Actual = 10.1D ; Message = "Expected decimal '10.1' to be less than decimal '1.1', but it was not." }
) {
param($Expected, $Actual, $Message)
$error = { Assert-LessThan -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal $Message
$err = { Assert-LessThan -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal $Message
}
}

Expand All @@ -103,7 +103,7 @@ Describe "Assert-LessThan" {
}

It "Given collection to Expected it throws" {
$error = { "dummy" | Assert-LessThan @() } | Verify-Throw
$error.Exception | Verify-Type ([ArgumentException])
$err = { "dummy" | Assert-LessThan @() } | Verify-Throw
$err.Exception | Verify-Type ([ArgumentException])
}
}
8 changes: 4 additions & 4 deletions tst/functions/assert/General/Assert-LessThanOrEqual.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ Describe "Assert-LessThanOrEqual" {
@{ Expected = 1.1D ; Actual = 10.1D ; Message = "Expected decimal '10.1' to be less than or equal to decimal '1.1', but it was not." }
) {
param($Expected, $Actual, $Message)
$error = { Assert-LessThanOrEqual -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal $Message
$err = { Assert-LessThanOrEqual -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal $Message
}
}

Expand All @@ -103,7 +103,7 @@ Describe "Assert-LessThanOrEqual" {
}

It "Given collection to Expected it throws" {
$error = { "dummy" | Assert-LessThanOrEqual @() } | Verify-Throw
$error.Exception | Verify-Type ([ArgumentException])
$err = { "dummy" | Assert-LessThanOrEqual @() } | Verify-Throw
$err.Exception | Verify-Type ([ArgumentException])
}
}
12 changes: 6 additions & 6 deletions tst/functions/assert/General/Assert-NotEqual.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@ InPesterModuleScope {
}

It "Fails with custom message" {
$error = { 3 | Assert-NotEqual 3 -CustomMessage "<expected> is <actual>" } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal "3 is 3"
$err = { 3 | Assert-NotEqual 3 -CustomMessage "<expected> is <actual>" } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal "3 is 3"
}

Context "Validate messages" {
It "Given two values that are the same '<value>' it returns expected message '<message>'" -TestCases @(
@{ Value = 1; Message = "Expected int '1', to be different than the actual value, but they were the same."}
) {
param($Value, $Message)
$error = { Assert-NotEqual -Actual $Value -Expected $Value } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal $Message
$err = { Assert-NotEqual -Actual $Value -Expected $Value } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal $Message
}
}

Expand All @@ -84,8 +84,8 @@ InPesterModuleScope {
}

It "Given collection to Expected it throws" {
$error = { "dummy" | Assert-NotEqual @() } | Verify-Throw
$error.Exception | Verify-Type ([ArgumentException])
$err = { "dummy" | Assert-NotEqual @() } | Verify-Throw
$err.Exception | Verify-Type ([ArgumentException])
}
}
}
8 changes: 4 additions & 4 deletions tst/functions/assert/General/Assert-NotSame.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ InPesterModuleScope {

It "Fails with custom message" {
$object = 1
$error = { $object | Assert-NotSame $object -CustomMessage "<expected> is <actual>" } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal "1 is 1"
$err = { $object | Assert-NotSame $object -CustomMessage "<expected> is <actual>" } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal "1 is 1"
}

It "Given two values that are the same instance it returns expected message '<message>'" -TestCases @(
@{ Value = "a"; Message = "Expected string 'a', to not be the same instance."}
) {
param($Value, $Message)
$error = { Assert-NotSame -Actual $Value -Expected $Value } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal $Message
$err = { Assert-NotSame -Actual $Value -Expected $Value } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal $Message
}

It "Returns the value on output" {
Expand Down
12 changes: 6 additions & 6 deletions tst/functions/assert/General/Assert-Same.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ InPesterModuleScope {

It "Fails for array input even if the last item is the same as expected" {
$object = New-Object Diagnostics.Process
{ 1,2, $object | Assert-Same $object } | Verify-AssertionFailed
{ 1, 2, $object | Assert-Same $object } | Verify-AssertionFailed
}

It "Fails with custom message" {
$object = New-Object Diagnostics.Process
$error = { "text" | Assert-Same $object -CustomMessage "'<expected>' is not '<actual>'" } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal "'Diagnostics.Process{Id=; Name=}' is not 'text'"
$err = { "text" | Assert-Same $object -CustomMessage "'<expected>' is not '<actual>'" } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal "'Diagnostics.Process{Id=; Name=}' is not 'text'"
}

It "Given two values that are not the same instance '<expected>' and '<actual>' it returns expected message '<message>'" -TestCases @(
@{ Expected = New-Object -TypeName PSObject ; Actual = New-Object -TypeName PSObject ; Message = "Expected PSObject '', to be the same instance but it was not."}
@{ Expected = New-Object -TypeName PSObject ; Actual = New-Object -TypeName PSObject ; Message = "Expected PSObject '', to be the same instance but it was not." }
) {
param($Expected, $Actual, $Message)
$error = { Assert-Same -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$error.Exception.Message | Verify-Equal $Message
$err = { Assert-Same -Actual $Actual -Expected $Expected } | Verify-AssertionFailed
$err.Exception.Message | Verify-Equal $Message
}

It "Returns the value on output" {
Expand Down

0 comments on commit 911a465

Please sign in to comment.