Remove Compatibility.ps1

build.ps1

@@ -282,8 +282,6 @@ $script = @(
     "$PSScriptRoot/src/Pester.RSpec.ps1"
     "$PSScriptRoot/src/Main.ps1"
 
-    # TODO:  Imports Compatibility.ps1, remove the code that is there, because it is for PowerShell 2.0 compatibility!
-    "$PSScriptRoot/src/functions/assert/*"
     "$PSScriptRoot/src/functions/assert/*/*"
     "$PSScriptRoot/src/functions/assertions/*"
     "$PSScriptRoot/src/functions/*"

src/Format2.ps1

@@ -112,7 +112,7 @@ function Format-Nicely2 ($Value, [switch]$Pretty) {
         return Format-Collection2 -Value $Value -Pretty:$Pretty
     }
 
-    Format-Object2 -Value $Value -Property (Get-DisplayProperty2 (Get-Type $Value)) -Pretty:$Pretty
+    Format-Object2 -Value $Value -Property (Get-DisplayProperty2 $Value.GetType()) -Pretty:$Pretty
 }
 
 function Get-DisplayProperty2 ([Type]$Type) {
@@ -139,7 +139,7 @@ function Get-DisplayProperty2 ([Type]$Type) {
 
 function Get-ShortType2 ($Value) {
     if ($null -ne $value) {
-        Format-Type2 (Get-Type $Value)
+        Format-Type2 $Value.GetType()
     }
     else {
         Format-Type2 $null

src/functions/assert/Equivalence/Assert-Equivalent.ps1

@@ -56,7 +56,7 @@ function Compare-CollectionEquivalent ($Expected, $Actual, $Property, $Options)
     }
 
     if (-not (Is-Collection -Value $Actual)) {
-        v -Difference "`$Actual is not a collection it is a $(Format-Nicely2 (Get-Type $Actual)), so they are not equivalent."
+        v -Difference "`$Actual is not a collection it is a $(Format-Nicely2 $Actual.GetType()), so they are not equivalent."
         $expectedFormatted = Format-Collection2 -Value $Expected
         $expectedLength = $expected.Length
         $actualFormatted = Format-Nicely2 -Value $actual
@@ -240,9 +240,9 @@ function Compare-ValueEquivalent ($Actual, $Expected, $Property, $Options) {
         v "Equality comparator is used, values will be compared for equality."
     }
 
-    v "Comparing values as $(Format-Nicely2 (Get-Type $Expected)) because `$Expected has that type."
+    v "Comparing values as $(Format-Nicely2 $Expected.GetType()) because `$Expected has that type."
     # todo: shorter messages when both sides have the same type (do not compare by using -is, instead query the type and compare it) because -is is true even for parent types
-    $type = Get-Type $Expected
+    $type = $Expected.GetType()
     $coalescedActual = $Actual -as $type
     if ($Expected -ne $Actual) {
         v -Difference "`$Actual is not equivalent to $(Format-Nicely2 $Expected) because it is $(Format-Nicely2 $Actual), and $(Format-Nicely2 $Actual) coalesced to $(Format-Nicely2 $type) is $(Format-Nicely2 $coalescedActual)."
@@ -257,7 +257,7 @@ function Compare-HashtableEquivalent ($Actual, $Expected, $Property, $Options) {
     }
 
     if (-not (Is-Hashtable -Value $Actual)) {
-        v -Difference "`$Actual is not a hashtable it is a $(Format-Nicely2 (Get-Type $Actual)), so they are not equivalent."
+        v -Difference "`$Actual is not a hashtable it is a $(Format-Nicely2 $Actual.GetType()), so they are not equivalent."
         $expectedFormatted = Format-Nicely2 -Value $Expected
         $actualFormatted = Format-Nicely2 -Value $Actual
         return "Expected hashtable '$expectedFormatted', but got '$actualFormatted'."
@@ -323,7 +323,7 @@ function Compare-DictionaryEquivalent ($Actual, $Expected, $Property, $Options)
     }
 
     if (-not (Is-Dictionary -Value $Actual)) {
-        v -Difference "`$Actual is not a dictionary it is a $(Format-Nicely2 (Get-Type $Actual)), so they are not equivalent."
+        v -Difference "`$Actual is not a dictionary it is a $(Format-Nicely2 $Actual.GetType()), so they are not equivalent."
         $expectedFormatted = Format-Nicely2 -Value $Expected
         $actualFormatted = Format-Nicely2 -Value $Actual
         return "Expected dictionary '$expectedFormatted', but got '$actualFormatted'."
@@ -387,7 +387,7 @@ function Compare-ObjectEquivalent ($Actual, $Expected, $Property, $Options) {
     }
 
     if (-not (Is-Object -Value $Actual)) {
-        v -Difference "`$Actual is not an object it is a $(Format-Nicely2 (Get-Type $Actual)), so they are not equivalent."
+        v -Difference "`$Actual is not an object it is a $(Format-Nicely2 $Actual.GetType()), so they are not equivalent."
         $expectedFormatted = Format-Nicely2 -Value $Expected
         $actualFormatted = Format-Nicely2 -Value $Actual
         return "Expected object '$expectedFormatted', but got '$actualFormatted'."
@@ -553,11 +553,11 @@ function Compare-Equivalent {
     }
 
     if ($null -eq $Actual) {
-        v -Difference "`$Actual is $(Format-Nicely2), but `$Expected has value of type $(Format-Nicely2 (Get-Type $Expected)), so they are not equivalent."
+        v -Difference "`$Actual is $(Format-Nicely2), but `$Expected has value of type $(Format-Nicely2 $Expected.GetType()), so they are not equivalent."
         return Get-ValueNotEquivalentMessage -Expected $Expected -Actual $Actual -Property $Path
     }
 
-    v "`$Expected has type $(Get-Type $Expected), `$Actual has type $(Get-Type $Actual), they are both non-null."
+    v "`$Expected has type $$Expected.GetType(), `$Actual has type $$Actual.GetType(), they are both non-null."
 
     # test value types, strings, and single item arrays with values in them as values
     # expand the single item array to get to the value in it
@@ -609,7 +609,7 @@ function Compare-Equivalent {
         return
     }
 
-    v "`$Expected is an object of type $(Get-Type $Expected), we will be comparing `$Actual to objects."
+    v "`$Expected is an object of type $$Expected.GetType(), we will be comparing `$Actual to objects."
     Compare-ObjectEquivalent -Expected $Expected -Actual $Actual -Property $Path -Options $Options
 }
 

src/functions/assert/Exception/Assert-Throw.ps1

@@ -45,15 +45,15 @@ function Assert-Throw {
         }
     }
 
-    $filterOnMessage = -not (Test-NullOrWhiteSpace $ExceptionMessage)
+    $filterOnMessage = -not ([string]::IsNullOrWhiteSpace($ExceptionMessage))
     if ($filterOnMessage) {
         $filters += "with message '$ExceptionMessage'"
         if ($err.ExceptionMessage -notlike $ExceptionMessage) {
             $buts += "the message was '$($err.ExceptionMessage)'"
         }
     }
 
-    $filterOnId = -not (Test-NullOrWhiteSpace $FullyQualifiedErrorId)
+    $filterOnId = -not ([string]::IsNullOrWhiteSpace($FullyQualifiedErrorId))
     if ($filterOnId) {
         $filters += "with FullyQualifiedErrorId '$FullyQualifiedErrorId'"
         if ($err.FullyQualifiedErrorId -notlike $FullyQualifiedErrorId) {