Fix tests for latest PS build

Author: Kapil Borle

Tests/Engine/CommunityAnalyzerRules/CommunityAnalyzerRules.psm1

@@ -227,7 +227,7 @@ function Measure-RequiresModules
 
 # The two rules in the following if block use StaticParameterBinder class. 
 # StaticParameterBinder class was introduced in PSv4. 
-if ($PSVersionTable.PSVersion -ge [Version]'4.0')
+if ($PSVersionTable.PSVersion -ge [Version]'4.0.0')
 {
 	<#
 	.SYNOPSIS

Tests/Engine/CustomizedRule.tests.ps1

@@ -1,4 +1,5 @@
-# Check if PSScriptAnalyzer is already loaded so we don't
+
+# Check if PSScriptAnalyzer is already loaded so we don't
 # overwrite a test version of Invoke-ScriptAnalyzer by
 # accident
 if (!(Get-Module PSScriptAnalyzer) -and !$testingLibraryUsage)
@@ -195,7 +196,7 @@ Describe "Test importing correct customized rules" {
                 $customizedRulePath.Count | Should Be 1
             }
 
-		if ($PSVersionTable.PSVersion -ge [Version]'5.0')
+		if ($PSVersionTable.PSVersion -lt [Version]'5.0.0')
 		{
 			It "loads custom rules that contain version in their path" {
 			$customizedRulePath = Invoke-ScriptAnalyzer $directory\TestScript.ps1 -CustomRulePath $directory\VersionedSampleRule\SampleRuleWithVersion

Tests/Engine/GetScriptAnalyzerRule.tests.ps1

@@ -1,4 +1,5 @@
-$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
+
+$directory = Split-Path -Parent $MyInvocation.MyCommand.Path
 Import-Module -Verbose PSScriptAnalyzer
 $testRootDirectory = Split-Path -Parent $directory
 Import-Module (Join-Path $testRootDirectory 'PSScriptAnalyzerTestHelper.psm1')
@@ -94,7 +95,7 @@ Describe "Test RuleExtension" {
     Context "When used correctly" {
 
 		$expectedNumCommunityRules = 10
-		if ($PSVersionTable.PSVersion -ge [Version]'4.0')
+		if ($PSVersionTable.PSVersion -ge [Version]'4.0.0')
 		{
 			$expectedNumCommunityRules = 12
 		}

Tests/Engine/InvokeScriptAnalyzer.tests.ps1

@@ -73,7 +73,7 @@ Describe "Test available parameters" {
         }
     }
 
-    if (!$testingLibraryUsage -and ($PSVersionTable.PSVersion -ge [Version]'5.0'))
+    if (!$testingLibraryUsage -and ($PSVersionTable.PSVersion -ge [Version]'5.0.0'))
     {
         Context "SaveDscDependency parameter" {
             It "has the parameter" {

Tests/Engine/ModuleDependencyHandler.tests.ps1

@@ -20,7 +20,7 @@ if ((Test-PSEditionCoreCLRLinux))
 }
 
 # DSC Module saving is not supported in versions less than PSv5
-if (($PSVersionTable.PSVersion -lt [Version]'5.0'))
+if (($PSVersionTable.PSVersion -lt [Version]'5.0.0'))
 {
     return
 }

Tests/Engine/ModuleHelp.Tests.ps1

@@ -1,9 +1,9 @@
-<#	
+<#
 .SYNOPSIS
-Tests the PowerShell help for the commands in a module. 
+Tests the PowerShell help for the commands in a module.
 
 .DESCRIPTION
-This Pester test verifies that the commands in a module have basic help content. 
+This Pester test verifies that the commands in a module have basic help content.
 It works on all command types and both comment-based and XML help.
 
 This test verifies that Get-Help is not autogenerating help because it cannot
@@ -21,15 +21,15 @@ When testing attributes of parameters that appear in multiple parameter sets,
 this test uses the parameter that appears in the default parameter set, if one
 is defined.
 
-You can run this Tests file from any location. For a help test that is located in a module 
+You can run this Tests file from any location. For a help test that is located in a module
 directory, use https://github.com/juneb/PesterTDD/InModule.Help.Tests.ps1
 
 .PARAMETER ModuleName
 Enter the name of the module to test. You can enter only one name at a time. This
 parameter is mandatory.
 
 .PARAMETER RequiredVersion
-Enter the version of the module to test. This parameter is optional. If you 
+Enter the version of the module to test. This parameter is optional. If you
 omit it, the test runs on the latest version of the module in $env:PSModulePath.
 
 .EXAMPLE
@@ -57,13 +57,13 @@ Param
 	[ValidateScript({ Get-Module -ListAvailable -Name $_ })]
 	[string]
 	$ModuleName = 'PSScriptAnalyzer',
-	
+
 	[Parameter(Mandatory = $false)]
 	[System.Version]
 	$RequiredVersion
 )
 
-#Requires -Module @{ModuleName = 'Pester'; ModuleVersion = '3.4.0'}
+# #Requires -Module @{ModuleName = 'Pester'; ModuleVersion = '3.4.0'}
 
 <#
 .SYNOPSIS
@@ -87,16 +87,16 @@ Enter a CommandInfo object, such as the object that Get-Command returns. You
 can also pipe a CommandInfo object to the function.
 
 This parameter takes a CommandInfo object, instead of a command name, so
-you can use the parameters of Get-Command to specify the module and version 
+you can use the parameters of Get-Command to specify the module and version
 of the command.
 
 .EXAMPLE
 PS C:\> Get-ParametersDefaultFirst -Command (Get-Command New-Guid)
-This command uses the Command parameter to specify the command to 
+This command uses the Command parameter to specify the command to
 Get-ParametersDefaultFirst
 
 .EXAMPLE
-PS C:\> Get-Command New-Guid | Get-ParametersDefaultFirst 
+PS C:\> Get-Command New-Guid | Get-ParametersDefaultFirst
 You can also pipe a CommandInfo object to Get-ParametersDefaultFirst
 
 .EXAMPLE
@@ -107,7 +107,7 @@ command runs Get-Command module-qualified name value.
 .EXAMPLE
 PS C:\> $ModuleSpec = @{ModuleName='BetterCredentials';RequiredVersion=4.3}
 PS C:\> Get-Command -FullyQualifiedName $ModuleSpec | Get-ParametersDefaultFirst
-This command uses a Microsoft.PowerShell.Commands.ModuleSpecification object to 
+This command uses a Microsoft.PowerShell.Commands.ModuleSpecification object to
 specify the module and version. You can also use it to specify the module GUID.
 Then, it pipes the CommandInfo object to Get-ParametersDefaultFirst.
 #>
@@ -119,7 +119,7 @@ function Get-ParametersDefaultFirst {
 		[System.Management.Automation.CommandInfo]
 		$Command
 	)
-	
+
 	BEGIN {
 		$Common = 'Debug', 'ErrorAction', 'ErrorVariable', 'InformationAction', 'InformationVariable', 'OutBuffer', 'OutVariable', 'PipelineVariable', 'Verbose', 'WarningAction', 'WarningVariable'
 		$parameters = @()
@@ -128,7 +128,7 @@ function Get-ParametersDefaultFirst {
 		if ($defaultPSetName = $Command.DefaultParameterSet) {
 			$defaultParameters = ($Command.ParameterSets | Where-Object Name -eq $defaultPSetName).parameters | Where-Object Name -NotIn $common
 			$otherParameters = ($Command.ParameterSets | Where-Object Name -ne $defaultPSetName).parameters | Where-Object Name -NotIn $common
-			
+
 			$parameters = $defaultParameters
 			if ($parameters -and $otherParameters) {
 				$otherParameters | ForEach-Object {
@@ -142,8 +142,8 @@ function Get-ParametersDefaultFirst {
 		else {
 			$parameters = $Command.ParameterSets.Parameters | Where-Object Name -NotIn $common | Sort-Object Name -Unique
 		}
-		
-		
+
+
 		return $parameters
 	}
 	END { }
@@ -161,7 +161,7 @@ following properties:
     -- [string] $CommandName
 	-- [string] $ModuleName (or PSSnapin name)
 	-- [string] $ModuleVersion (or PowerShell Version)
-    
+
 .PARAMETER CommandInfo
 Specifies a Commandinfo object, e.g. (Get-Command Get-Item).
 
@@ -191,7 +191,7 @@ function Get-CommandVersion {
 		[System.Management.Automation.CommandInfo]
 		$CommandInfo
 	)
-	
+
 	if ((-not ((($commandModuleName = $CommandInfo.Module.Name) -and ($commandVersion = $CommandInfo.Module.Version)) -or
 	(($commandModuleName = $CommandInfo.PSSnapin) -and ($commandVersion = $CommandInfo.PSSnapin.Version))))) {
 		Write-Error "For $($CommandInfo.Name) :  Can't find PSSnapin/module name and version"
@@ -215,7 +215,7 @@ Import-Module $ModuleName -RequiredVersion $RequiredVersion -ErrorAction Stop
 $ms = $null
 $commands =$null
 $paramBlackList = @()
-if ($PSVersionTable.PSVersion -lt [Version]'5.0') {
+if ($PSVersionTable.PSVersion -lt [Version]'5.0.0') {
 	$ms = New-Object -TypeName 'Microsoft.PowerShell.Commands.ModuleSpecification' -ArgumentList $ModuleName
 	$commands = Get-Command -Module $ms.Name
 	$paramBlackList += 'SaveDscDependency'
@@ -230,79 +230,80 @@ else {
 
 foreach ($command in $commands) {
 	$commandName = $command.Name
-	
+
 	# Get the module name and version of the command. Used in the Describe name.
 	$commandModuleVersion = Get-CommandVersion -CommandInfo $command
-	
+
 	# The module-qualified command fails on Microsoft.PowerShell.Archive cmdlets
 	$Help = Get-Help $ModuleName\$commandName -ErrorAction SilentlyContinue
 	if ($Help.Synopsis -like '*`[`<CommonParameters`>`]*') {
 		$Help = Get-Help $commandName -ErrorAction SilentlyContinue
 	}
-	
+
 	Describe "Test help for $commandName in $($commandModuleVersion.ModuleName) ($($commandModuleVersion.Version))" {
-		
+
 		# If help is not found, synopsis in auto-generated help is the syntax diagram
 		It "should not be auto-generated" {
-			$Help.Synopsis | Should Not BeLike '*`[`<CommonParameters`>`]*'
+			# Replace pester BeLike with powershell -like as pester 3.3.9 does not support BeLike
+			$Help.Synopsis -like '*`[`<CommonParameters`>`]*' | Should Be $false
 		}
-		
+
 		# Should be a description for every function
 		It "gets description for $commandName" {
 			$Help.Description | Should Not BeNullOrEmpty
 		}
-		
+
 		# Should be at least one example
 		It "gets example code from $commandName" {
 			($Help.Examples.Example | Select-Object -First 1).Code | Should Not BeNullOrEmpty
 		}
-		
+
 		# Should be at least one example description
 		It "gets example help from $commandName" {
 			($Help.Examples.Example.Remarks | Select-Object -First 1).Text | Should Not BeNullOrEmpty
 		}
-		
+
 		Context "Test parameter help for $commandName" {
-			
+
 			$Common = 'Debug', 'ErrorAction', 'ErrorVariable', 'InformationAction', 'InformationVariable', 'OutBuffer', 'OutVariable',
 			'PipelineVariable', 'Verbose', 'WarningAction', 'WarningVariable'
-			
-			# Get parameters. When >1 parameter with same name, 
+
+			# Get parameters. When >1 parameter with same name,
 			# get parameter from the default parameter set, if any.
 			$parameters = Get-ParametersDefaultFirst -Command $command
-			
+
 			$parameterNames = $parameters.Name
 			$HelpParameterNames = $Help.Parameters.Parameter.Name | Sort-Object -Unique
-			
+
 			foreach ($parameter in $parameters) {
 				if ($parameter -in $paramBlackList) {
 					continue
 				}
 				$parameterName = $parameter.Name
 				$parameterHelp = $Help.parameters.parameter | Where-Object Name -EQ $parameterName
-				
+
 				# Should be a description for every parameter
 				It "gets help for parameter: $parameterName : in $commandName" {
-					# `$parameterHelp.Description.Text | Should Not BeNullOrEmpty` fails for -Settings paramter 
+					# `$parameterHelp.Description.Text | Should Not BeNullOrEmpty` fails for -Settings paramter
 					# without explicit [string] casting on the Text property
 					[string]::IsNullOrEmpty($parameterHelp.Description.Text) | Should Be $false
 				}
-				
+
 				# Required value in Help should match IsMandatory property of parameter
 				It "help for $parameterName parameter in $commandName has correct Mandatory value" {
 					$codeMandatory = $parameter.IsMandatory.toString()
 					$parameterHelp.Required | Should Be $codeMandatory
 				}
-				
+
 				# Parameter type in Help should match code
 				It "help for $commandName has correct parameter type for $parameterName" {
 					$codeType = $parameter.ParameterType.Name
 					# To avoid calling Trim method on a null object.
 					$helpType = if ($parameterHelp.parameterValue) { $parameterHelp.parameterValue.Trim() }
-					$helpType | Should be $codeType 
+					$helpType | Should be $codeType
 				}
 			}
-			
+
 			foreach ($helpParm in $HelpParameterNames) {
 				if ($helpParm -in $paramBlackList) {
 					continue

Tests/Engine/RuleSuppression.tests.ps1

@@ -103,7 +103,7 @@ function SuppressPwdParam()
     }
 
     Context "Rule suppression within DSC Configuration definition" {
-        It "Suppresses rule" -skip:((Test-PSEditionCoreCLRLinux) -or ($PSVersionTable.PSVersion -ge [Version]'5.0')) {
+        It "Suppresses rule" -skip:((Test-PSEditionCoreCLRLinux) -or ($PSVersionTable.PSVersion -ge [Version]'5.0.0')) {
             $suppressedRule = Invoke-ScriptAnalyzer -ScriptDefinition $ruleSuppressionInConfiguration -SuppressedOnly
             $suppressedRule.Count | Should Be 1
         }

Tests/Engine/RuleSuppressionClass.tests.ps1

@@ -1,4 +1,4 @@
-if ($PSVersionTable.PSVersion -ge [Version]'5.0') {
+if ($PSVersionTable.PSVersion -ge [Version]'5.0.0') {
 
 # Check if PSScriptAnalyzer is already loaded so we don't
 # overwrite a test version of Invoke-ScriptAnalyzer by

Tests/PSScriptAnalyzerTestHelper.psm1

@@ -30,12 +30,12 @@ Function Test-CorrectionExtent
 
 Function Test-PSEditionCoreCLR
 {
-    ($PSVersionTable.Keys -contains "PSEdition") -and ($PSVersionTable.PSEdition -ne 'Desktop')
+    [bool]$IsCoreCLR
 }
 
 Function Test-PSEditionCoreCLRLinux
 {
-    (Test-PSEditionCoreCLR) -and ($env:OS -eq "Linux")
+    (Test-PSEditionCoreCLR) -and $IsLinux
 }
 
 Export-ModuleMember -Function Get-ExtentText

Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1

@@ -59,32 +59,32 @@ ModuleVersion = '1.0.0.0'
     Context "Validate the contents of a .psd1 file" {
         It "detects a valid module manifest file" {
             $filepath = Join-Path $directory "TestManifest/ManifestGood.psd1"
-            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"5.0") | Should Be $true
+            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"5.0.0") | Should Be $true
         }
 
         It "detects a .psd1 file which is not module manifest" {
             $filepath = Join-Path $directory "TestManifest/PowerShellDataFile.psd1"
-            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"5.0") | Should Be $false
+            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"5.0.0") | Should Be $false
         }
 
         It "detects valid module manifest file for PSv5" {
-            $filepath = Join-Path $directory "TestManifest/ManifestGoodPSv5.psd1"
-            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"5.0") | Should Be $true
+            $filepath = Join-Path $directory "TestManifest/ManifestGoodPsv5.psd1"
+            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"5.0.0") | Should Be $true
         }
 
         It "does not validate PSv5 module manifest file for PSv3 check" {
-            $filepath = Join-Path $directory "TestManifest/ManifestGoodPSv5.psd1"
-            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"3.0") | Should Be $false
+            $filepath = Join-Path $directory "TestManifest/ManifestGoodPsv5.psd1"
+            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"3.0.0") | Should Be $false
         }
 
         It "detects valid module manifest file for PSv4" {
-            $filepath = Join-Path $directory "TestManifest/ManifestGoodPSv4.psd1"
-            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"4.0") | Should Be $true
+            $filepath = Join-Path $directory "TestManifest/ManifestGoodPsv4.psd1"
+            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"4.0.0") | Should Be $true
         }
 
         It "detects valid module manifest file for PSv3" {
-            $filepath = Join-Path $directory "TestManifest/ManifestGoodPSv3.psd1"
-            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"3.0") | Should Be $true
+            $filepath = Join-Path $directory "TestManifest/ManifestGoodPsv3.psd1"
+            [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::IsModuleManifest($filepath, [version]"3.0.0") | Should Be $true
         }
     }