Update the tests

Author: CedX

Tests/Command/New-CommandBuilder.Tests.ps1

@@ -38,7 +38,7 @@ Describe "New-CommandBuilder" {
 
 		It "should also return an empty parameter collection" {
 			$command = (New-SqlCommandBuilder $connection).GetDeleteAllCommand([Character])
-			$command.Item2 | Should -BeNullOrEmpty
+			Should-Be 0 $command.Item2.Count
 		}
 	}
 
@@ -92,7 +92,7 @@ Describe "New-CommandBuilder" {
 
 		It "should also return an empty parameter collection" {
 			$command = (New-SqlCommandBuilder $connection).GetFindAllCommand([Character])
-			$command.Item2 | Should -BeNullOrEmpty
+			Should-Be 0 $command.Item2.Count
 		}
 
 		It "should allow sorting the results by a specific set of columns" {

Tests/Command/New-OrderHintCollection.Tests.ps1

@@ -8,15 +8,15 @@ using namespace System.Collections.Generic
 Describe "New-OrderHintCollection" {
 	It "should create an empty collection by default" {
 		$collection = New-SqlOrderHintCollection
-		$collection | Should -BeNullOrEmpty
+		Should-Be 0 $collection.Count
 	}
 
 	It "should create a collection from a single order hint" {
 		$collection = New-SqlOrderHintCollection (New-SqlOrderHint ID Descending)
 		Should-Be 1 $collection.Count
 
 		$orderHint = $collection[0]
-		$orderHint.Column | Should -BeExactly ID
+		Should-BeString ID $orderHint.Column -CaseSensitive
 		Should-Be ([SortOrder]::Descending) $orderHint.SortOrder
 	}
 
@@ -26,7 +26,7 @@ Describe "New-OrderHintCollection" {
 		Should-Be 2 $collection.Count
 
 		$orderHint = $collection[$collection.Count - 1]
-		$orderHint.Column | Should -BeExactly Name
+		Should-BeString Name $orderHint.Column -CaseSensitive
 		Should-Be ([SortOrder]::Ascending) $orderHint.SortOrder
 	}
 
@@ -67,14 +67,14 @@ Describe "New-OrderHintCollection" {
 		It "should return the order hint with the specified column name" {
 			$collection = New-SqlOrderHintCollection (New-SqlOrderHint ID Descending), (New-SqlOrderHint Name)
 			$orderHint = $collection["id"]
-			$orderHint.Column | Should -BeExactly ID
+			Should-BeString ID $orderHint.Column -CaseSensitive
 			Should-Be ([SortOrder]::Descending) $orderHint.SortOrder
 			Should-Be $orderHint $collection[0]
 		}
 
 		It "should return `$null, or throw an error, if the specified column name does not exist" {
 			$collection = New-SqlOrderHintCollection (New-SqlOrderHint ID Descending), (New-SqlOrderHint Name)
-			$collection["foo"] | Should -BeNullOrEmpty
+			Should-BeNull $collection["foo"]
 
 			Set-StrictMode -Version Latest
 			Should-Throw -ScriptBlock { $collection["foo"] }
@@ -102,7 +102,7 @@ Describe "New-OrderHintCollection" {
 			$collection.RemoveAt("name")
 			Should-Be 1 $collection.Count
 			$collection.RemoveAt("id")
-			$collection | Should -BeNullOrEmpty
+			Should-Be 0 $collection.Count
 		}
 
 		It "should throw an error if the specified column name does not exist" {

Tests/Command/New-ParameterCollection.Tests.ps1

@@ -10,7 +10,7 @@ using module ../../Sql.psd1
 Describe "New-ParameterCollection" {
 	It "should create an empty collection by default" {
 		$collection = New-SqlParameterCollection
-		$collection | Should -BeNullOrEmpty
+		Should-Be 0 $collection.Count
 	}
 
 	It "should create a collection from a single parameter" {
@@ -37,7 +37,7 @@ Describe "New-ParameterCollection" {
 	Context "AddWithValue" {
 		It "should add a new parameter to the collection" {
 			$collection = New-SqlParameterCollection
-			$collection | Should -BeNullOrEmpty
+			Should-Be 0 $collection.Count
 
 			$parameter = $collection.AddWithValue("Name", "Value1")
 			Should-Be 1 $collection.Count
@@ -80,8 +80,8 @@ Describe "New-ParameterCollection" {
 
 		It "should create a collection from the specified hash table of named parameters" {
 			[SqlParameterCollection] $collection = @{ foo = "bar"; baz = "qux" }
-			Compare-Object @("@foo", "@baz") $collection.PSForEach{ $_.Name } | Should -BeNullOrEmpty
-			Compare-Object @("bar", "qux") $collection.PSForEach{ $_.Value } | Should -BeNullOrEmpty
+			Should-BeNull (Compare-Object @("@foo", "@baz") $collection.PSForEach{ $_.Name })
+			Should-BeNull (Compare-Object @("bar", "qux") $collection.PSForEach{ $_.Value })
 		}
 	}
 
@@ -96,7 +96,7 @@ Describe "New-ParameterCollection" {
 
 		It "should return `$null, or throw an error, if the specified name does not exist" {
 			$collection = New-SqlParameterCollection (New-SqlParameter "?1" 123), (New-SqlParameter "@Key" Unique -DbType AnsiString)
-			$collection["@Foo"] | Should -BeNullOrEmpty
+			Should-BeNull $collection["@Foo"]
 
 			Set-StrictMode -Version Latest
 			Should-Throw -ScriptBlock { $collection["@Foo"] }
@@ -125,7 +125,7 @@ Describe "New-ParameterCollection" {
 			$collection.RemoveAt("Key")
 			Should-Be 1 $collection.Count
 			$collection.RemoveAt("?1")
-			$collection | Should -BeNullOrEmpty
+			Should-Be 0 $collection.Count
 		}
 
 		It "should throw an error if the specified name does not exist" {

Tests/Connection/New-Connection.Tests.ps1

@@ -12,7 +12,7 @@ Describe "New-Connection" {
 		@{ Provider = "SqlClient"; ConnectionString = "Server=localhost; Database=TestDb; Uid=user; Pwd=password"; Expected = [System.Data.SqlClient.SqlConnection] }
 	) {
 		$connection = New-SqlConnection $provider $connectionString
-		$connection | Should -BeOfType $expected
+		Should-HaveType $expected $connection
 		Should-Be ([ConnectionState]::Closed) $connection.State
 	}
 

Tests/Mapping/DbTableInfo.Tests.ps1

@@ -9,7 +9,7 @@ using module ../Character.psm1
 Describe "DbTableInfo" {
 	Context "Columns" {
 		It "should return all columns associated with the specified entity class" {
-			[DbTableInfo]::new([ConsoleKeyInfo]).Columns.Keys | Should -BeNullOrEmpty
+			Should-Be 0 ([DbTableInfo]::new([ConsoleKeyInfo]).Columns.Count)
 
 			$columns = [DbTableInfo]::new([Character]).Columns
 			Should-Be 5 $columns.Count
@@ -19,10 +19,10 @@ Describe "DbTableInfo" {
 
 	Context "IdentityColumn" {
 		It "should return the identity column associated with the specified entity class, if any" {
-			[DbTableInfo]::new([ConsoleKeyInfo]).IdentityColumn | Should -BeNullOrEmpty
+			Should-BeNull ([DbTableInfo]::new([ConsoleKeyInfo]).IdentityColumn)
 
 			$identityColumn = [DbTableInfo]::new([Character]).IdentityColumn
-			$identityColumn | Should -Not -BeNullOrEmpty
+			Should-NotBeNull $identityColumn
 			$identityColumn.Name | Should -BeExactly ID
 		}
 	}
@@ -39,7 +39,7 @@ Describe "DbTableInfo" {
 
 	Context "Schema" {
 		It "should return `$null` when there is no [Table] attribute" {
-			[DbTableInfo]::new([ConsoleKeyInfo]).Schema | Should -BeNullOrEmpty
+			Should-BeNull ([DbTableInfo]::new([ConsoleKeyInfo]).Schema)
 		}
 
 		It "should return the value of the [Table] attribute when it is present" {

Tests/Mapping/Get-Mapper.Tests.ps1

@@ -90,17 +90,17 @@ Describe "Get-Mapper" {
 		It "should support creating an object of type [psobject]" {
 			$properties = @{ CLASS = "Bard/minstrel"; firstName = "Cédric"; gender = "Balrog"; lastName = $null }
 			$psObject = (Get-SqlMapper).CreateInstance([psobject], $properties)
-			$psObject | Should -BeOfType ([psobject])
+			Should-HaveType ([psobject]) $psObject
 			$psObject.CLASS | Should -BeExactly "Bard/minstrel"
 			$psObject.firstName | Should -BeExactly Cédric
 			$psObject.gender | Should -BeExactly ([CharacterGender]::Balrog.ToString())
-			$psObject.lastName | Should -BeNullOrEmpty
+			Should-BeNull $psObject.lastName
 		}
 
 		It "should create an object of the specified type" {
 			$properties = @{ CLASS = "Bard/minstrel"; firstName = "Cédric"; gender = "Balrog"; lastName = $null }
 			$character = (Get-SqlMapper).CreateInstance([Character], $properties)
-			$character | Should -BeOfType ([Character])
+			Should-HaveType ([Character]) $character
 			$character.FirstName | Should -BeExactly Cédric
 			Should-Be ([CharacterGender]::Balrog) $character.Gender
 			Should-BeEmptyString $character.LastName

Tests/Object/Find-Object.Tests.ps1

@@ -32,38 +32,38 @@ Describe "Find-Object" {
 			$records = Find-SqlObject $connection -All -Class ([Character]) -Columns gender
 			Should-Be 1 $records[0].Id
 			Should-Be ([CharacterGender]::Human) $records[0].Gender
-			$records[0].FullName | Should -BeNullOrEmpty
+			Should-BeEmptyString $records[0].FullName
 			Should-Be 16 $records[15].Id
 			Should-Be ([CharacterGender]::DarkLord) $records[15].Gender
-			$records[15].FullName | Should -BeNullOrEmpty
+			Should-BeEmptyString $records[15].FullName
 		}
 	}
 
 	Context "Id" {
 		It "should find the entity with the specified identifier" {
 			$record = Find-SqlObject $connection -Class ([Character]) -Id 2
-			$record | Should -Not -BeNullOrEmpty
+			Should-NotBeNull $record
 			Should-Be 2 $record.Id
 			$record.FullName | Should -BeExactly Balin
 
 			$record = Find-SqlObject $connection -Class ([Character]) -Id 14
-			$record | Should -Not -BeNullOrEmpty
+			Should-NotBeNull $record
 			Should-Be 14 $record.Id
 			$record.FullName | Should -BeExactly "Sam Gamgee"
 		}
 
 		It "should allow selecting a specific set of columns" {
 			$record = Find-SqlObject $connection -Class ([Character]) -Id 2 -Columns gender
-			$record.FullName | Should -BeNullOrEmpty
+			Should-BeEmptyString $record.FullName
 			Should-Be ([CharacterGender]::Dwarf) $record.Gender
 
 			$record = Find-SqlObject $connection -Class ([Character]) -Id 14 -Columns gender
-			$record.FullName | Should -BeNullOrEmpty
+			Should-BeEmptyString $record.FullName
 			Should-Be ([CharacterGender]::Hobbit) $record.Gender
 		}
 
 		It "should return `$null if the entity is not found" {
-			Find-SqlObject $connection -Class ([Character]) -Id 666 | Should -BeNullOrEmpty
+			Should-BeNull (Find-SqlObject $connection -Class ([Character]) -Id 666)
 		}
 	}
 }

Tests/Object/Publish-Object.Tests.ps1

@@ -18,7 +18,7 @@ Describe "Publish-Object" {
 		Should-BeEmptyString $record.FullName
 
 		$id = Publish-SqlObject $connection -InputObject $record
-		$id | Should -BeGreaterThan 16
+		Should-BeGreaterThan 16 $id
 		Should-Be $id $record.Id
 
 		$records = Invoke-SqlQuery $connection -As ([Character]) -Command $sql

Tests/Object/Remove-Object.Tests.ps1

@@ -12,7 +12,7 @@ Describe "Remove-Object" {
 	Context "All" {
 		It "should remove all entities from the underlying table" {
 			$sql = "SELECT COUNT(*) FROM Characters"
-			Get-SqlScalar $connection -As ([int]) -Command $sql | Should -BeGreaterThan 0
+			Should-BeGreaterThan 0 (Get-SqlScalar $connection -As ([int]) -Command $sql)
 			Remove-SqlObject $connection -Class ([Character]) -All -Truncate
 			Should-Be 0 (Get-SqlScalar $connection -As ([int]) -Command $sql)
 		}

Tests/Query/Get-Scalar.Tests.ps1

@@ -13,7 +13,7 @@ Describe "Get-Scalar" {
 		Should-Be 2 (Get-SqlScalar $connection -As ([int]) -Command $sql -Parameters @{ Gender = "Balrog" })
 
 		$sql = "SELECT tbl_name FROM sqlite_schema WHERE type = @Type AND name = @Name"
-		Get-SqlScalar $connection -As ([string]) -Command $sql -Parameters @{ Name = "Characters"; Type = "table" } | Should -BeExactly Characters
+		Should-BeString Characters (Get-SqlScalar $connection -As ([string]) -Command $sql -Parameters @{ Name = "Characters"; Type = "table" }) -CaseSensitive
 
 		$sql = "SELECT tbl_name FROM sqlite_schema WHERE name = @Name"
 		Should-BeNull (Get-SqlScalar $connection -As ([string]) -Command $sql -Parameters @{ Name = "FooBarBazQux" })