Merge pull request #109 from PlagueHO/Issue-105

Updated tests to meet Pester V4 guidelines - Fixes #105
dsccommunity · Nov 18, 2017 · 9f3f387 · 9f3f387
2 parents 30f4917 + ef6bc9b
commit 9f3f387
Show file tree

Hide file tree

Showing 13 changed files with 206 additions and 205 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
   to correctly generate parameter documentation in Wiki - see [Issue #103](https://github.com/PowerShell/xCertificate/issues/103).
 - Changed description in Credential parameter of xCertReq resource
   to clarify that a PSCredential object should be used.
+- Updated tests to meet Pester V4 guidelines - fixes [Issue #105](https://github.com/PowerShell/xCertificate/issues/105).
 
 ## 3.0.0.0
 

diff --git a/Tests/Integration/MSFT_xCertReq.Integration.Tests.ps1 b/Tests/Integration/MSFT_xCertReq.Integration.Tests.ps1
@@ -103,11 +103,11 @@ try
                         -ConfigurationData $configData
 
                     Start-DscConfiguration -Path $TestDrive -ComputerName localhost -Wait -Verbose -Force
-                } | Should Not Throw
+                } | Should -Not -Throw
             }
 
             It 'Should be able to call Get-DscConfiguration without throwing' {
-                { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should Not Throw
+                { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
             }
 
             It 'Should have set the resource and all the parameters should match' {
@@ -117,13 +117,13 @@ try
                         $_.Subject -eq "CN=$($subject)" -and `
                         $_.Issuer.split(',')[0] -eq "CN=$($caRootName)"
                     }
-                $CertificateNew.Subject                        | Should Be "CN=$($subject)"
-                $CertificateNew.Issuer.split(',')[0]           | Should Be "CN=$($caRootName)"
-                $CertificateNew.Publickey.Key.KeySize          | Should Be $keyLength
-                $CertificateNew.FriendlyName                   | Should Be $friendlyName
-                $CertificateNew.DnsNameList[0]                 | Should Be $dns1
-                $CertificateNew.DnsNameList[1]                 | Should Be $dns2
-                $CertificateNew.EnhancedKeyUsageList.ObjectId  | Should Be $oid
+                $CertificateNew.Subject                        | Should -Be "CN=$($subject)"
+                $CertificateNew.Issuer.split(',')[0]           | Should -Be "CN=$($caRootName)"
+                $CertificateNew.Publickey.Key.KeySize          | Should -Be $keyLength
+                $CertificateNew.FriendlyName                   | Should -Be $friendlyName
+                $CertificateNew.DnsNameList[0]                 | Should -Be $dns1
+                $CertificateNew.DnsNameList[1]                 | Should -Be $dns2
+                $CertificateNew.EnhancedKeyUsageList.ObjectId  | Should -Be $oid
             }
         }
         #endregion

diff --git a/Tests/Integration/MSFT_xCertificateExport.Integration.Tests.ps1 b/Tests/Integration/MSFT_xCertificateExport.Integration.Tests.ps1
@@ -86,22 +86,22 @@ try
                         -ConfigurationData $ConfigData
 
                     Start-DscConfiguration -Path $TestDrive -ComputerName localhost -Wait -Verbose -Force
-                } | Should Not Throw
+                } | Should -Not -Throw
             }
 
             It 'Should be able to call Get-DscConfiguration without throwing' {
-                { $script:currentCertificate = Get-DscConfiguration -Verbose -ErrorAction Stop } | Should Not Throw
+                { $script:currentCertificate = Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
             }
             #endregion
 
             It 'Should have exported a Cert certificate' {
-                $script:currentCertificate.IsExported | Should Be $true
+                $script:currentCertificate.IsExported | Should -Be $true
             }
 
             It 'Should have set the resource and the thumbprint of the exported certificate should match' {
                 $exportedCertificate = New-Object -TypeName 'System.Security.Cryptography.X509Certificates.X509Certificate2Collection'
                 $exportedCertificate.Import($script:certificatePath)
-                $exportedCertificate[0].Thumbprint | Should Be $script:validCertificateThumbprint
+                $exportedCertificate[0].Thumbprint | Should -Be $script:validCertificateThumbprint
             }
         }
 
@@ -135,22 +135,22 @@ try
                         -ConfigurationData $ConfigData
 
                     Start-DscConfiguration -Path $TestDrive -ComputerName localhost -Wait -Verbose -Force
-                } | Should Not Throw
+                } | Should -Not -Throw
             }
 
             It 'Should be able to call Get-DscConfiguration without throwing' {
-                { $script:currentPFX = Get-DscConfiguration -Verbose -ErrorAction Stop } | Should Not Throw
+                { $script:currentPFX = Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
             }
             #endregion
 
             It 'Should have exported a PFX certificate' {
-                $script:currentPFX.IsExported | Should Be $true
+                $script:currentPFX.IsExported | Should -Be $true
             }
 
             It 'Should have set the resource and the thumbprint of the exported certificate should match' {
                 $exportedCertificate = New-Object -TypeName 'System.Security.Cryptography.X509Certificates.X509Certificate2Collection'
                 $exportedCertificate.Import($script:certificatePath,$pfxPassword,[System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::PersistKeySet)
-                $exportedCertificate[0].Thumbprint | Should Be $script:validCertificateThumbprint
+                $exportedCertificate[0].Thumbprint | Should -Be $script:validCertificateThumbprint
             }
         }
 

diff --git a/Tests/Integration/MSFT_xCertificateImport.Integration.Tests.ps1 b/Tests/Integration/MSFT_xCertificateImport.Integration.Tests.ps1
@@ -52,21 +52,21 @@ try
                     -Thumbprint $Certificate.Thumbprint
 
                 Start-DscConfiguration -Path $TestDrive -ComputerName localhost -Wait -Verbose -Force
-            } | Should Not Throw
+            } | Should -Not -Throw
         }
 
         It 'Should be able to call Get-DscConfiguration without throwing' {
-            { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should Not Throw
+            { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
         }
         #endregion
 
         It 'Should have set the resource and all the parameters should match' {
             # Get the Certificate details
             $CertificateNew = Get-Item `
                 -Path "Cert:\LocalMachine\My\$($Certificate.Thumbprint)"
-            $CertificateNew                             | Should BeOfType System.Security.Cryptography.X509Certificates.X509Certificate2
-            $CertificateNew.Thumbprint                  | Should Be $Certificate.Thumbprint
-            $CertificateNew.Subject                     | Should Be $Certificate.Subject
+            $CertificateNew                             | Should -BeOfType System.Security.Cryptography.X509Certificates.X509Certificate2
+            $CertificateNew.Thumbprint                  | Should -Be $Certificate.Thumbprint
+            $CertificateNew.Subject                     | Should -Be $Certificate.Subject
         }
     }
     #endregion
@@ -84,11 +84,11 @@ try
                     -Path $CertificatePath `
                     -Thumbprint $Certificate.Thumbprint
                 Start-DscConfiguration -Path $TestDrive -ComputerName localhost -Wait -Verbose -Force
-            } | Should not throw
+            } | Should -Not -Throw
         }
 
         It 'should be able to call Get-DscConfiguration without throwing' {
-            { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should Not throw
+            { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
         }
         #endregion
 
@@ -97,7 +97,7 @@ try
             $CertificateNew = Get-Item `
                 -Path "Cert:\LocalMachine\My\$($Certificate.Thumbprint)" `
                 -ErrorAction SilentlyContinue
-            $CertificateNew                             | Should BeNullOrEmpty
+            $CertificateNew                             | Should -BeNullOrEmpty
         }
     }
     #endregion

diff --git a/Tests/Integration/MSFT_xPfxImport.Integration.Tests.ps1 b/Tests/Integration/MSFT_xPfxImport.Integration.Tests.ps1
@@ -68,21 +68,21 @@ try
                     -Credential $testCredential
 
                 Start-DscConfiguration -Path $TestDrive -ComputerName localhost -Wait -Verbose -Force
-            } | Should Not Throw
+            } | Should -Not -Throw
         }
 
         It 'Should be able to call Get-DscConfiguration without throwing' {
-            { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should Not Throw
+            { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
         }
         #endregion
 
         It 'Should have set the resource and all the parameters should match' {
             # Get the Certificate details
             $CertificateNew = Get-Item `
                 -Path "Cert:\LocalMachine\My\$($Certificate.Thumbprint)"
-            $CertificateNew                             | Should BeOfType System.Security.Cryptography.X509Certificates.X509Certificate2
-            $CertificateNew.Thumbprint                  | Should Be $Certificate.Thumbprint
-            $CertificateNew.Subject                     | Should Be $Certificate.Subject
+            $CertificateNew                             | Should -BeOfType System.Security.Cryptography.X509Certificates.X509Certificate2
+            $CertificateNew.Thumbprint                  | Should -Be $Certificate.Thumbprint
+            $CertificateNew.Subject                     | Should -Be $Certificate.Subject
         }
     }
     #endregion
@@ -101,11 +101,11 @@ try
                     -Thumbprint $Certificate.Thumbprint
 
                 Start-DscConfiguration -Path $TestDrive -ComputerName localhost -Wait -Verbose -Force
-            } | Should Not Throw
+            } | Should -Not -Throw
         }
 
         It 'Should be able to call Get-DscConfiguration without throwing' {
-            { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should Not Throw
+            { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
         }
         #endregion
 
@@ -114,7 +114,7 @@ try
             $CertificateNew = Get-Item `
                 -Path "Cert:\LocalMachine\My\$($Certificate.Thumbprint)" `
                 -ErrorAction SilentlyContinue
-            $CertificateNew                             | Should BeNullOrEmpty
+            $CertificateNew                             | Should -BeNullOrEmpty
         }
     }
     #endregion

diff --git a/Tests/Integration/MSFT_xWaitForCertificateServices.Integration.Tests.ps1 b/Tests/Integration/MSFT_xWaitForCertificateServices.Integration.Tests.ps1
@@ -67,20 +67,20 @@ try
                             -ConfigurationData $configData
 
                         Start-DscConfiguration -Path $TestDrive -ComputerName localhost -Wait -Verbose -Force
-                    } | Should Not Throw
+                    } | Should -Not -Throw
                 }
 
                 It 'Should be able to call Get-DscConfiguration without throwing' {
-                    { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should Not Throw
+                    { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
                 }
 
                 It 'Should have set the resource and all the parameters should match' {
                     $current = Get-DscConfiguration | Where-Object {
                         $_.ConfigurationName -eq "$($script:DSCResourceName)_Config"
                     }
 
-                    $current.CAServerFQDN | Should Be $caServerFQDN
-                    $current.CARootName   | Should Be $caRootName
+                    $current.CAServerFQDN | Should -Be $caServerFQDN
+                    $current.CARootName   | Should -Be $caRootName
                 }
             }
             #endregion
@@ -110,20 +110,20 @@ try
                         -ConfigurationData $configData
 
                     Start-DscConfiguration -Path $TestDrive -ComputerName localhost -Wait -Verbose -Force
-                } | Should Not Throw
+                } | Should -Not -Throw
             }
 
             It 'Should be able to call Get-DscConfiguration without throwing' {
-                { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should Not Throw
+                { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
             }
 
             It 'Should have set the resource and all the parameters should match' {
                 $current = Get-DscConfiguration | Where-Object {
                     $_.ConfigurationName -eq "$($script:DSCResourceName)_Config"
                 }
 
-                $current.CAServerFQDN | Should Be $caServerFQDN
-                $current.CARootName   | Should Be $caRootName
+                $current.CAServerFQDN | Should -Be $caServerFQDN
+                $current.CARootName   | Should -Be $caRootName
             }
         }
         #endregion

diff --git a/Tests/Integration/ModuleConflict.Tests.ps1 b/Tests/Integration/ModuleConflict.Tests.ps1
@@ -34,7 +34,7 @@ try
             It "Should be able to install DSC Resource module '$moduleToTest'" {
                 {
                     Install-Module -Name $moduleToTest -ErrorAction Stop
-                } | Should Not Throw
+                } | Should -Not -Throw
             }
         }
     }