[Feature] Tests correction in Microsoft.PowerShell.Managemet module.

PowerShell · TravisEz13 · Mar 9, 2018 · Mar 2, 2018 · Mar 2, 2018 · Mar 2, 2018
commit 7531e93eb73f5030433155cd9e8dbfc94e03fe9f
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Alias.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Alias.Tests.ps1
@@ -52,7 +52,7 @@ Describe "Basic Alias Provider Tests" -Tags "CI" {
 
     It "Test executing the new alias" {
         $result = Invoke-Expression $testAliasName
-        $result | Should -BeOfType DateTime
+        $result | Should -BeOfType [DateTime]
     }
 }
 

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Clear-Content.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Clear-Content.Tests.ps1
@@ -89,7 +89,7 @@ Describe "Clear-Content cmdlet tests" -Tags "CI" {
     It "the '-Stream' dynamic parameter is visible to get-command in the filesystem" -Skip:(!$IsWindows) {
       try {
         push-location TESTDRIVE:
-        (get-command clear-content -stream foo).parameters.keys -eq "stream" | should be "stream"`
+        (get-command clear-content -stream foo).parameters.keys -eq "stream" | Should -Be "stream"
       }
       finally {
         pop-location

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/ControlService.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/ControlService.Tests.ps1
@@ -42,18 +42,18 @@ Describe "Control Service cmdlet tests" -Tags "Feature","RequireAdminOnWindows"
         $wasStopped = $true
         $spooler = Start-Service Spooler -PassThru
       }
-      $spooler.Status | Should -Be "Running"
+      $spooler.Status | Should -BeExactly "Running"
       $spooler = Stop-Service Spooler -PassThru
-      $spooler.Status | Should -Be "Stopped"
-      (Get-Service Spooler).Status | Should -Be "Stopped"
+      $spooler.Status | Should -BeExaclty "Stopped"
+      (Get-Service Spooler).Status | Should -BeExactly "Stopped"
       $spooler = Start-Service Spooler -PassThru
-      $spooler.Status | Should -Be "Running"
-      (Get-Service Spooler).Status | Should -Be "Running"
+      $spooler.Status | Should -BeExactly "Running"
+      (Get-Service Spooler).Status | Should -BeExactly "Running"
       Stop-Service Spooler
-      (Get-Service Spooler).Status | Should -Be "Stopped"
+      (Get-Service Spooler).Status | Should -BeExactly "Stopped"
       $spooler = Restart-Service Spooler -PassThru
-      $spooler.Status | Should -Be "Running"
-      (Get-Service Spooler).Status | Should -Be "Running"
+      $spooler.Status | Should -BeExactly "Running"
+      (Get-Service Spooler).Status | Should -BeExactly "Running"
     } finally {
       if ($wasStopped) {
         Stop-Service Spooler
@@ -72,9 +72,9 @@ Describe "Control Service cmdlet tests" -Tags "Feature","RequireAdminOnWindows"
       }
       $service | Should -Not -BeNullOrEmpty
       Suspend-Service $serviceName
-      (Get-Service $serviceName).Status | Should -Be "Paused"
+      (Get-Service $serviceName).Status | Should -BeExactly "Paused"
       Resume-Service $serviceName
-      (Get-Service $serviceName).Status | Should -Be "Running"
+      (Get-Service $serviceName).Status | Should -BeExactly "Running"
     } finally {
       Set-Service $serviceName -Status $originalState
     }

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Copy.Item.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Copy.Item.Tests.ps1
@@ -298,7 +298,7 @@ Describe "Validate Copy-Item Remotely" -Tags "CI" {
             {
                 $copiedFilePath = ([string]$file).Replace("SourceDirectory", "DestinationDirectory\SourceDirectory")
                 $copiedFilePath | Should -Exist
-
+		(Get-Item $copiedFilePath).Length | Should -Be (Get-Item $file).Length
             }
         }
 

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
@@ -551,7 +551,7 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
             $filenamePattern = "AlphaFile[12]\.txt"
             New-Item -ItemType SymbolicLink -Path $alphaLink -Value $alphaDir
             $ci = Get-ChildItem $alphaLink
-            $ci.Count | Should -BeExactly 3
+            $ci.Count | Should -Be 3
             $ci[1].Name | Should -MatchExactly $filenamePattern
             $ci[2].Name | Should -MatchExactly $filenamePattern
         }

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1
@@ -1063,7 +1063,7 @@ try {
                 $expectedProperties = @("BiosBIOSVersion")
                 $propertyFilter = "BiosBIOSVersion"
                 $computerInfoWithProp = Get-ComputerInfoForTest -properties $propertyFilter
-                $computerInfoWithProp | Should -Beoftype [pscustomobject]
+                $computerInfoWithProp | Should -BeOfType [pscustomobject]
                 @($computerInfoWithProp.psobject.properties).count | Should -Be 1
                 $computerInfoWithProp.$propertyFilter | Should -Be $expected.$propertyFilter
             }
@@ -1076,7 +1076,7 @@ try {
                 $expectedProperties = @("BiosBIOSVersion","BiosBuildNumber","BiosCaption")
                 $propertyFilter = @("BiosBIOSVersion","BiosBuildNumber","BiosCaption")
                 $computerInfoWithProp = Get-ComputerInfoForTest -properties $propertyFilter
-                $computerInfoWithProp | Should -Beoftype [pscustomobject]
+                $computerInfoWithProp | Should -BeOfType [pscustomobject]
                 @($computerInfoWithProp.psobject.properties).count | Should -Be 3
                 foreach($property in $propertyFilter) {
                     $ComputerInfoWithProp.$property | Should -Be $Expected.$property
@@ -1091,7 +1091,7 @@ try {
                 $expectedProperties = $null
                 $propertyFilter = @("BiosBIOSVersionXXX")
                 $computerInfoWithProp = Get-ComputerInfoForTest -properties $propertyFilter
-                $computerInfoWithProp | Should -Beoftype [pscustomobject]
+                $computerInfoWithProp | Should -BeOfType [pscustomobject]
                 @($computerInfoWithProp.psobject.properties).count | Should -Be 0
             }
 
@@ -1103,7 +1103,7 @@ try {
                 $expectedProperties = $null
                 $propertyFilter = @("BiosBIOSVersionXXX","InvalidProperty1","InvalidProperty2","InvalidProperty3")
                 $computerInfoWithProp = Get-ComputerInfoForTest -properties $propertyFilter
-                $computerInfoWithProp | Should -Beoftype [pscustomobject]
+                $computerInfoWithProp | Should -BeOfType [pscustomobject]
                 @($computerInfoWithProp.psobject.properties).count | Should -Be 0
             }
 
@@ -1115,7 +1115,7 @@ try {
                 $expectedProperties = @("BiosCodeSet","BiosCurrentLanguage","BiosDescription")
                 $propertyFilter = @("InvalidProperty1","BiosCodeSet","BiosCurrentLanguage","BiosDescription")
                 $computerInfoWithProp = Get-ComputerInfoForTest -properties $propertyFilter
-                $computerInfoWithProp | Should -Beoftype [pscustomobject]
+                $computerInfoWithProp | Should -BeOfType [pscustomobject]
                 $realProperties  = $propertyFilter | Where-Object { $_ -notmatch "^InvalidProperty[0-9]+" }
                 @($computerInfoWithProp.psobject.properties).count | Should -Be $realProperties.Count
                 foreach ( $property in $realProperties )
@@ -1132,7 +1132,7 @@ try {
                 $expectedProperties = @("BiosCodeSet","BiosCurrentLanguage","BiosDescription")
                 $propertyFilter = @("BiosCodeSet","InvalidProperty1","BiosCurrentLanguage","BiosDescription","InvalidProperty2")
                 $computerInfoWithProp = Get-ComputerInfoForTest -properties $propertyFilter
-                $computerInfoWithProp | Should -Beoftype [pscustomobject]
+                $computerInfoWithProp | Should -BeOfType [pscustomobject]
                 $realProperties  = $propertyFilter | Where-Object { $_ -notmatch "^InvalidProperty[0-9]+" }
                 @($computerInfoWithProp.psobject.properties).count | Should -Be $realProperties.Count
                 foreach ( $property in $realProperties )
@@ -1149,7 +1149,7 @@ try {
                 $expectedProperties = @("BiosCaption","BiosCharacteristics","BiosCodeSet","BiosCurrentLanguage")
                 $propertyFilter = @("BiosC*")
                 $computerInfoWithProp = Get-ComputerInfoForTest -properties $propertyFilter
-                $computerInfoWithProp | Should -Beoftype [pscustomobject]
+                $computerInfoWithProp | Should -BeOfType [pscustomobject]
                 @($computerInfoWithProp.psobject.properties).count | Should -Be $expectedProperties.Count
                 foreach ( $property in $expectedProperties )
                 {
@@ -1165,7 +1165,7 @@ try {
                 $expectedProperties = @("BiosCaption","BiosCharacteristics","BiosCodeSet","BiosCurrentLanguage","CsCaption")
                 $propertyFilter = @("BiosC*","CsCaption")
                 $computerInfoWithProp = Get-ComputerInfoForTest -properties $propertyFilter
-                $computerInfoWithProp | Should -Beoftype [pscustomobject]
+                $computerInfoWithProp | Should -BeOfType [pscustomobject]
                 @($computerInfoWithProp.psobject.properties).count | Should -Be $expectedProperties.Count
                 foreach ( $property in $expectedProperties )
                 {
@@ -1181,7 +1181,7 @@ try {
                 $expectedProperties = @("BiosCaption","BiosCharacteristics","BiosCodeSet","BiosCurrentLanguage","CsCaption")
                 $propertyFilter = @("CsCaption","InvalidProperty1","BiosC*")
                 $computerInfoWithProp = Get-ComputerInfoForTest -properties $propertyFilter
-                $computerInfoWithProp | Should -Beoftype [pscustomobject]
+                $computerInfoWithProp | Should -BeOfType [pscustomobject]
                 @($computerInfoWithProp.psobject.properties).count | Should -Be $expectedProperties.Count
                 foreach ( $property in $expectedProperties )
                 {
@@ -1197,7 +1197,7 @@ try {
                 $expectedProperties = $null
                 $propertyFilter = @("BiosBIOSVersionX*")
                 $computerInfoWithProp = Get-ComputerInfoForTest -properties $propertyFilter
-                $computerInfoWithProp | Should -Beoftype [pscustomobject]
+                $computerInfoWithProp | Should -BeOfType [pscustomobject]
                 @($computerInfoWithProp.psobject.properties).count | Should -Be 0
             }
         }

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1
@@ -124,7 +124,7 @@ baz
         $expected = 'foo'
 
         $actual = Get-Content -Path $testPath -Tail $tailCount -Encoding $encodingName
-        $actual | Should -BeOfType "[string]"
+        $actual | Should -BeOfType [string]
         $actual.Length | Should -Be $tailCount
         $actual[0] | Should -BeExactly $expected
     }

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/New-Item.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/New-Item.Tests.ps1
@@ -181,7 +181,8 @@ Describe "New-Item with links" -Tags @('CI', 'RequireAdminOnWindows') {
 
     It "Should error correctly when failing to create a symbolic link" -Skip:($IsWindows -or $IsElevated) {
         # This test expects that /sbin exists but is not writable by the user
-        { New-Item -ItemType SymbolicLink -Path "/sbin/powershell-test" -Target $FullyQualifiedFolder -ErrorAction Stop } | Should -Throw -ErrorId "NewItemSymbolicLinkElevationRequired,Microsoft.PowerShell.Commands.NewItemCommand"
+        { New-Item -ItemType SymbolicLink -Path "/sbin/powershell-test" -Target $FullyQualifiedFolder -ErrorAction Stop } |
+		Should -Throw -ErrorId "NewItemSymbolicLinkElevationRequired,Microsoft.PowerShell.Commands.NewItemCommand"
     }
 
     It "New-Item -ItemType SymbolicLink should understand directory path ending with slash" {

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Remove-EventLog.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Remove-EventLog.Tests.ps1
@@ -21,7 +21,7 @@ Describe "New-EventLog cmdlet tests" -Tags @('CI', 'RequireAdminOnWindows') {
     }
     #CmdLet is NYI - change to -Skip:($NonWinAdmin) when implemented
     It "should be able to Remove-EventLog -LogName <string> -ComputerName <string>" -Pending:($True) {
-      {Remove-EventLog -LogName TestLog -ComputerName $env:COMPUTERNAME -ErrorAction Stop}              | Should -Not -Throw
+      { Remove-EventLog -LogName TestLog -ComputerName $env:COMPUTERNAME -ErrorAction Stop }              | Should -Not -Throw
       { Write-EventLog -LogName TestLog -Source TestSource -Message "Test" -EventID 1 -ErrorAction Stop } | Should -Throw -ErrorId "Microsoft.PowerShell.Commands.WriteEventLogCommand"
       { Get-EventLog -LogName TestLog -ErrorAction Stop } | Should -Throw -ErrorId "System.InvalidOperationException,Microsoft.PowerShell.Commands.GetEventLogCommand"
     }

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Split-Path.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Split-Path.Tests.ps1
@@ -87,6 +87,6 @@ Describe "Split-Path" -Tags "CI" {
     }
 
     It 'Does not split a drive leter'{
-    Split-Path -Path 'C:\' | Should -Be ''
+    Split-Path -Path 'C:\' | Should -BeNullOrEmpty
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -298,7 +298,7 @@ Describe "Validate Copy-Item Remotely" -Tags "CI" { @@
                 {
                     $copiedFilePath = ([string]$file).Replace("SourceDirectory", "DestinationDirectory\SourceDirectory")
                     $copiedFilePath | Should -Exist
+    		(Get-Item $copiedFilePath).Length | Should -Be (Get-Item $file).Length
                 }
             }
@@ Expand Down @@