Migrated to Pester 5.1

Migrated to netcoreapp3.1
2021-02-16 19:10:43 +02:00
parent 5426af92b7
commit ef804e6a05
24 changed files with 187 additions and 168 deletions
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.LsClient/VMware.vSphere.LsClient.csproj
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.LsClient/VMware.vSphere.LsClient.csproj
@@ -4,7 +4,7 @@
    <RootNamespace>VMware.vSphere.LsClient</RootNamespace>
    <AssemblyName>VMware.vSphere.LsClient</AssemblyName>
    <Description>vSphere Lookup Service API client.</Description>
-    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
  </PropertyGroup>

  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
@@ -16,7 +16,7 @@
    <PackageReference Include="System.ServiceModel.Security" Version="4.4.0" />
  </ItemGroup>
  
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
    <PackageReference Include="VMware.System.Private.ServiceModel" Version="4.4.4" />
  </ItemGroup>

--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/VMware.vSphere.SsoAdmin.Utils.csproj
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/VMware.vSphere.SsoAdmin.Utils.csproj
@@ -4,7 +4,7 @@
    <RootNamespace>VMware.vSphere.SsoAdmin.Utils</RootNamespace>
    <AssemblyName>VMware.vSphere.SsoAdmin.Utils</AssemblyName>
    <Description>vSphere Lookup SsoAdmin utility types.</Description>
-    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
  </PropertyGroup>

  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
@@ -17,7 +17,7 @@
    <PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.0.0" />
  </ItemGroup>
  
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
    <PackageReference Include="Microsoft.WSMan.Runtime" Version="6.1.0" />
    <PackageReference Include="VMware.System.Private.ServiceModel" Version="4.4.4" />
  </ItemGroup>
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/SsoAdminClient.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/SsoAdminClient.cs
@@ -693,22 +693,26 @@ namespace VMware.vSphere.SsoAdminClient
            }
         }

-         authorizedInvocationContext.
-         InvokeOperation(() =>
-            _ssoAdminBindingClient.RegisterLdapAsync(
-               new ManagedObjectReference {
-                  type = "SsoAdminIdentitySourceManagementService",
-                  Value = "identitySourceManagementService"
-               },
-               serverType,
-               domainName,
-               domainAlias,
-               adminLdapIdentitySourceDetails,
-               authenticationType,
-               new SsoAdminIdentitySourceManagementServiceAuthenticationCredentials {
-                  username = authenticationUserName,
-                  password = authenticationPassword
-               })).Wait();
+         try {         
+            authorizedInvocationContext.
+            InvokeOperation(() =>
+               _ssoAdminBindingClient.RegisterLdapAsync(
+                  new ManagedObjectReference {
+                     type = "SsoAdminIdentitySourceManagementService",
+                     Value = "identitySourceManagementService"
+                  },
+                  serverType,
+                  domainName,
+                  domainAlias,
+                  adminLdapIdentitySourceDetails,
+                  authenticationType,
+                  new SsoAdminIdentitySourceManagementServiceAuthenticationCredentials {
+                     username = authenticationUserName,
+                     password = authenticationPassword
+                  })).Wait();
+         } catch (AggregateException e) {
+            throw e.InnerException;
+         }
      }

      public IEnumerable<IdentitySource> GetDomains() {
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/VMware.vSphere.SsoAdminClient.csproj
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/VMware.vSphere.SsoAdminClient.csproj
@@ -4,14 +4,14 @@
    <RootNamespace>VMware.vSphere.SsoAdminClient</RootNamespace>
    <AssemblyName>VMware.vSphere.SsoAdminClient</AssemblyName>
    <Description>SSO Admin API client.</Description>
-    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
  </PropertyGroup>
  
  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
    <DefineConstants>$(DefineConstants);NET45</DefineConstants>
  </PropertyGroup>
  
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
    <DefineConstants>$(DefineConstants);NETCORE20</DefineConstants>
  </PropertyGroup>
  
@@ -24,7 +24,7 @@
    <PackageReference Include="System.ServiceModel.Security" Version="4.4.0" />
  </ItemGroup>
  
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
    <PackageReference Include="VMware.System.Private.ServiceModel" Version="4.4.4" />
  </ItemGroup>
  
--- a/Modules/VMware.vSphere.SsoAdmin/src/build.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/build.ps1
@@ -98,7 +98,7 @@ param($OutputFolder)
         "VMware.vSphere.SsoAdmin.Utils.dll")


-      $netcoreTarget = Join-Path $OutputFolder "netcoreapp2.0"
+      $netcoreTarget = Join-Path $OutputFolder "netcoreapp3.1"
      $net45Target = Join-Path $OutputFolder "net45"

      Copy-Item -Path $netcoreLsSource -Destination $netcoreTarget -Force
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/ConnectDisconnect.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/ConnectDisconnect.Tests.ps1
@@ -38,11 +38,11 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {
            -SkipCertificateCheck

         # Assert
-         $actual | Should Not Be $null
-         $actual.GetType().FullName | Should Be 'VMware.vSphere.SsoAdminClient.DataTypes.SsoAdminServer'
-         $actual.IsConnected | Should Be $true
-         $actual.Name | Should Be $VcAddress
-         $global:DefaultSsoAdminServers | Should Contain $actual
+         $actual | Should -Not -Be $null
+         $actual.GetType().FullName | Should -Be 'VMware.vSphere.SsoAdminClient.DataTypes.SsoAdminServer'
+         $actual.IsConnected | Should -Be $true
+         $actual.Name | Should -Be $VcAddress
+         $global:DefaultSsoAdminServers | Should -Contain $actual
      }

      It 'Connect-SsoAdminServer throws error on invalid password' {
@@ -82,8 +82,8 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {
         $expected | Disconnect-SsoAdminServer

         # Assert
-         $global:DefaultSsoAdminServers | Should Not Contain $expected
-         $expected.IsConnected | Should Be $false
+         $global:DefaultSsoAdminServers | Should -Not -Contain $expected
+         $expected.IsConnected | Should -Be $false
      }

      It 'Diconnect-SsoAdminServer disconnects the currently connected SSO in case there is 1 SSO server' {
@@ -98,8 +98,8 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {
         Disconnect-SsoAdminServer -server $expected

         # Assert
-         $global:DefaultSsoAdminServers | Should Not Contain $expected
-         $expected.IsConnected | Should Be $false
+         $global:DefaultSsoAdminServers | Should -Not -Contain $expected
+         $expected.IsConnected | Should -Be $false
      }

      It 'Diconnect-SsoAdminServer does not disconnect if connected to more than 1 SSO server' {
@@ -118,13 +118,13 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {
         # Act

         # Assert
-         $connection2 | Should Be $connection1
-         $connection2.RefCount | Should Be 2
+         $connection2 | Should -Be $connection1
+         $connection2.RefCount | Should -Be 2

         Disconnect-SsoAdminServer

         $connection2.IsConnected | Should -Contain $true
-         $connection2.RefCount | Should Be 1
+         $connection2.RefCount | Should -Be 1
      }

      It 'Diconnect-SsoAdminServer does disconnect via pipeline if connected to more than 1 SSO server' {
@@ -143,9 +143,9 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {
         # Act
         $connection1, $connection2 | Disconnect-SsoAdminServer
         # Assert
-         $global:DefaultSsoAdminServers.Count | Should Be 0
-         $connection1.IsConnected | Should Be $false
-         $connection2.IsConnected | Should Be $false
+         $global:DefaultSsoAdminServers.Count | Should -Be 0
+         $connection1.IsConnected | Should -Be $false
+         $connection2.IsConnected | Should -Be $false
      }

      It 'Disconnects disconnected object' {
@@ -163,8 +163,8 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {
         Should Not Throw

         # Assert
-         $global:DefaultSsoAdminServers | Should Not Contain $expected
-         $expected.IsConnected | Should Be $false
+         $global:DefaultSsoAdminServers | Should -Not -Contain $expected
+         $expected.IsConnected | Should -Be $false
      }

      It 'Disconnects DefaultSsoAdminServers when * is specified on -Server parameter' {
@@ -180,8 +180,8 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {


         # Assert
-         $global:DefaultSsoAdminServers.Count | Should Be 0
-         $expected.IsConnected | Should Be $false
+         $global:DefaultSsoAdminServers.Count | Should -Be 0
+         $expected.IsConnected | Should -Be $false
      }

      It 'Disconnects server specified as string that is equal to VC Address' {
@@ -197,8 +197,8 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {


         # Assert
-         $global:DefaultSsoAdminServers.Count | Should Be 0
-         $expected.IsConnected | Should Be $false
+         $global:DefaultSsoAdminServers.Count | Should -Be 0
+         $expected.IsConnected | Should -Be $false
      }

      It 'Disconnect-SsoAdminServer fails when string that does not match any servers is specified' {
@@ -210,13 +210,13 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {
               -SkipCertificateCheck

         # Act
-         { Disconnect-SsoAdminServer -Server "testserver" } | Should Throw
+         { Disconnect-SsoAdminServer -Server "testserver" } | Should -Throw


         # Assert
-         $global:DefaultSsoAdminServers.Count | Should Be 1
-         $global:DefaultSsoAdminServers[0] | Should Be $expected
-         $expected.IsConnected | Should Be $true
+         $global:DefaultSsoAdminServers.Count | Should -Be 1
+         $global:DefaultSsoAdminServers[0] | Should -Be $expected
+         $expected.IsConnected | Should -Be $true

         # Cleanup
         Disconnect-SsoAdminServer -Server $expected
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/Group.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/Group.Tests.ps1
@@ -42,10 +42,10 @@ Describe "Get-SsoGroup Tests" {
         $actual = Get-SsoGroup

         # Assert
-         $actual | Should Not Be $null
-         $actual.Count | Should BeGreaterThan 0
-         $actual[0].Name | Should Not Be $null
-         $actual[0].Domain | Should Be 'localos'
+         $actual | Should -Not -Be $null
+         $actual.Count | Should -BeGreaterThan 0
+         $actual[0].Name | Should -Not -Be $null
+         $actual[0].Domain | Should -Be 'localos'
      }

      It 'Gets groups for default domain' {
@@ -64,10 +64,10 @@ Describe "Get-SsoGroup Tests" {
            -Domain $newPersonUser.Domain

         # Assert
-         $actual | Should Not Be $null
-         $actual.Count | Should BeGreaterThan 0
-         $actual[0].Name | Should Not Be $null
-         $actual[0].Domain | Should Be $newPersonUser.Domain
+         $actual | Should -Not -Be $null
+         $actual.Count | Should -BeGreaterThan 0
+         $actual[0].Name | Should -Not -Be $null
+         $actual[0].Domain | Should -Be $newPersonUser.Domain

         # Cleanup
         Remove-SsoPersonUser -User $newPersonUser
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/IdentitySource.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/IdentitySource.Tests.ps1
@@ -42,9 +42,9 @@ Describe "Get-IdentitySource Tests" {
         $actual = Get-IdentitySource

         # Assert
-         $actual | Should Not Be $null
-         $actual.Count | Should BeGreaterThan 1
-         $actual[0].NAme | Should Be 'localos'
+         $actual | Should -Not -Be $null
+         $actual.Count | Should -BeGreaterThan 1
+         $actual[0].NAme | Should -Be 'localos'
      }

      It 'Gets localos only identity source' {
@@ -52,9 +52,9 @@ Describe "Get-IdentitySource Tests" {
         $actual = Get-IdentitySource -Localos

         # Assert
-         $actual | Should Not Be $null
-         $actual.Count | Should Be 1
-         $actual[0].NAme | Should Be 'localos'
+         $actual | Should -Not -Be $null
+         $actual.Count | Should -Be 1
+         $actual[0].Name | Should -Be 'localos'
      }

       It 'Gets all available identity sources' {
@@ -62,10 +62,10 @@ Describe "Get-IdentitySource Tests" {
         $actual = Get-IdentitySource -Localos -System

         # Assert
-         $actual | Should Not Be $null
-         $actual.Count | Should Be 2
-         $actual[0].Name | Should Be 'localos'
-         $actual[0].Name | Should Not Be $null
+         $actual | Should -Not -Be $null
+         $actual.Count | Should -Be 2
+         $actual[0].Name | Should -Be 'localos'
+         $actual[0].Name | Should -Not -Be $null
      }
   }
 }
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/LockoutPolicy.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/LockoutPolicy.Tests.ps1
@@ -42,7 +42,7 @@ Describe "LockoutPolicy Tests" {
         $actual = Get-SsoLockoutPolicy

         # Assert
-         $actual | Should Not Be $null
+         $actual | Should -Not -Be $null
      }
   }

@@ -60,11 +60,11 @@ Describe "LockoutPolicy Tests" {
            -MaxFailedAttempts $expectedMaxFailedAttempts

         # Assert
-         $actual | Should Not Be $null
-         $actual.AutoUnlockIntervalSec | Should Be $expectedAutoUnlockIntervalSec
-         $actual.MaxFailedAttempts | Should Be $expectedMaxFailedAttempts
-         $actual.FailedAttemptIntervalSec | Should Be $lockoutPolicyToUpdate.FailedAttemptIntervalSec
-         $actual.Description | Should Be $lockoutPolicyToUpdate.Description
+         $actual | Should -Not -Be $null
+         $actual.AutoUnlockIntervalSec | Should -Be $expectedAutoUnlockIntervalSec
+         $actual.MaxFailedAttempts | Should -Be $expectedMaxFailedAttempts
+         $actual.FailedAttemptIntervalSec | Should -Be $lockoutPolicyToUpdate.FailedAttemptIntervalSec
+         $actual.Description | Should -Be $lockoutPolicyToUpdate.Description

         # Cleanup
         $lockoutPolicyToUpdate | Set-SsoLockoutPolicy
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/LsClient.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/LsClient.Tests.ps1
@@ -40,8 +40,8 @@ Describe "Lookup Service Client Integration Tests" {
         $actual = $script:lsClient.GetSsoAdminEndpointUri()

         # Assert
-         $actual | Should Not Be $null
-         $actual.ToString().StartsWith("https://$VCAddress/sso-adminserver/sdk/") | Should Be $true
+         $actual | Should -Not -Be $null
+         $actual.ToString().StartsWith("https://$VCAddress/sso-adminserver/sdk/") | Should -Be $true
      }

      It 'Gets STS API Url' {
@@ -49,8 +49,8 @@ Describe "Lookup Service Client Integration Tests" {
         $actual = $script:lsClient.GetStsEndpointUri()

         # Assert
-         $actual | Should Not Be $null
-         $actual.ToString().StartsWith("https://$VCAddress/sts/STSService") | Should Be $true
+         $actual | Should -Not -Be $null
+         $actual.ToString().StartsWith("https://$VCAddress/sts/STSService") | Should -Be $true
      }
   }
 }
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/PasswordPolicy.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/PasswordPolicy.Tests.ps1
@@ -42,7 +42,7 @@ Describe "PasswordPolicy Tests" {
         $actual = Get-SsoPasswordPolicy

         # Assert
-         $actual | Should Not Be $null
+         $actual | Should -Not -Be $null
      }
   }

@@ -60,18 +60,18 @@ Describe "PasswordPolicy Tests" {
            -PasswordLifetimeDays $expectedPasswordLifetimeDays

         # Assert
-         $actual | Should Not Be $null
-         $actual.MaxLength | Should Be $expectedMaxLength
-         $actual.PasswordLifetimeDays | Should Be $expectedPasswordLifetimeDays
-         $actual.Description | Should Be $passwordPolicyToUpdate.Description
-         $actual.ProhibitedPreviousPasswordsCount | Should Be $passwordPolicyToUpdate.ProhibitedPreviousPasswordsCount
-         $actual.MinLength | Should Be $passwordPolicyToUpdate.MinLength
-         $actual.MaxIdenticalAdjacentCharacters | Should Be $passwordPolicyToUpdate.MaxIdenticalAdjacentCharacters
-         $actual.MinNumericCount | Should Be $passwordPolicyToUpdate.MinNumericCount
-         $actual.MinSpecialCharCount | Should Be $passwordPolicyToUpdate.MinSpecialCharCount
-         $actual.MinAlphabeticCount | Should Be $passwordPolicyToUpdate.MinAlphabeticCount
-         $actual.MinUppercaseCount | Should Be $passwordPolicyToUpdate.MinUppercaseCount
-         $actual.MinLowercaseCount | Should Be $passwordPolicyToUpdate.MinLowercaseCount
+         $actual | Should -Not -Be $null
+         $actual.MaxLength | Should -Be $expectedMaxLength
+         $actual.PasswordLifetimeDays | Should -Be $expectedPasswordLifetimeDays
+         $actual.Description | Should -Be $passwordPolicyToUpdate.Description
+         $actual.ProhibitedPreviousPasswordsCount | Should -Be $passwordPolicyToUpdate.ProhibitedPreviousPasswordsCount
+         $actual.MinLength | Should -Be $passwordPolicyToUpdate.MinLength
+         $actual.MaxIdenticalAdjacentCharacters | Should -Be $passwordPolicyToUpdate.MaxIdenticalAdjacentCharacters
+         $actual.MinNumericCount | Should -Be $passwordPolicyToUpdate.MinNumericCount
+         $actual.MinSpecialCharCount | Should -Be $passwordPolicyToUpdate.MinSpecialCharCount
+         $actual.MinAlphabeticCount | Should -Be $passwordPolicyToUpdate.MinAlphabeticCount
+         $actual.MinUppercaseCount | Should -Be $passwordPolicyToUpdate.MinUppercaseCount
+         $actual.MinLowercaseCount | Should -Be $passwordPolicyToUpdate.MinLowercaseCount

         # Cleanup
         $passwordPolicyToUpdate | Set-SsoPasswordPolicy
@@ -89,18 +89,18 @@ Describe "PasswordPolicy Tests" {
            -MinUppercaseCount $expectedMinUppercaseCount

         # Assert
-         $actual | Should Not Be $null
-         $actual.Description | Should Be $expectedDescription
-         $actual.MinUppercaseCount | Should Be $expectedMinUppercaseCount
-         $actual.MaxLength | Should Be $passwordPolicyToUpdate.MaxLength
-         $actual.PasswordLifetimeDays | Should Be $passwordPolicyToUpdate.PasswordLifetimeDays
-         $actual.ProhibitedPreviousPasswordsCount | Should Be $passwordPolicyToUpdate.ProhibitedPreviousPasswordsCount
-         $actual.MinLength | Should Be $passwordPolicyToUpdate.MinLength
-         $actual.MaxIdenticalAdjacentCharacters | Should Be $passwordPolicyToUpdate.MaxIdenticalAdjacentCharacters
-         $actual.MinNumericCount | Should Be $passwordPolicyToUpdate.MinNumericCount
-         $actual.MinSpecialCharCount | Should Be $passwordPolicyToUpdate.MinSpecialCharCount
-         $actual.MinAlphabeticCount | Should Be $passwordPolicyToUpdate.MinAlphabeticCount
-         $actual.MinLowercaseCount | Should Be $passwordPolicyToUpdate.MinLowercaseCount
+         $actual | Should -Not -Be $null
+         $actual.Description | Should -Be $expectedDescription
+         $actual.MinUppercaseCount | Should -Be $expectedMinUppercaseCount
+         $actual.MaxLength | Should -Be $passwordPolicyToUpdate.MaxLength
+         $actual.PasswordLifetimeDays | Should -Be $passwordPolicyToUpdate.PasswordLifetimeDays
+         $actual.ProhibitedPreviousPasswordsCount | Should -Be $passwordPolicyToUpdate.ProhibitedPreviousPasswordsCount
+         $actual.MinLength | Should -Be $passwordPolicyToUpdate.MinLength
+         $actual.MaxIdenticalAdjacentCharacters | Should -Be $passwordPolicyToUpdate.MaxIdenticalAdjacentCharacters
+         $actual.MinNumericCount | Should -Be $passwordPolicyToUpdate.MinNumericCount
+         $actual.MinSpecialCharCount | Should -Be $passwordPolicyToUpdate.MinSpecialCharCount
+         $actual.MinAlphabeticCount | Should -Be $passwordPolicyToUpdate.MinAlphabeticCount
+         $actual.MinLowercaseCount | Should -Be $passwordPolicyToUpdate.MinLowercaseCount

         # Cleanup
         $passwordPolicyToUpdate | Set-SsoPasswordPolicy
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/PersonUser.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/PersonUser.Tests.ps1
@@ -63,14 +63,14 @@ Describe "PersonUser Tests" {
         $script:usersToCleanup += $actual

         # Assert
-         $actual | Should Not Be $null
-         $actual.GetType().FullName | Should Be 'VMware.vSphere.SsoAdminClient.DataTypes.PersonUser'
-         $actual.Name | Should Be $expectedUserName
-         $actual.Domain | Should Not Be $null
-         $actual.Description | Should Be $expectedDescription
-         $actual.FirstName | Should Be $expectedFirstName
-         $actual.LastName | Should Be $expectedLastName
-         $actual.EmailAddress | Should Be $expectedEmailAddress
+         $actual | Should -Not -Be $null
+         $actual.GetType().FullName | Should -Be 'VMware.vSphere.SsoAdminClient.DataTypes.PersonUser'
+         $actual.Name | Should -Be $expectedUserName
+         $actual.Domain | Should -Not -Be $null
+         $actual.Description | Should -Be $expectedDescription
+         $actual.FirstName | Should -Be $expectedFirstName
+         $actual.LastName | Should -Be $expectedLastName
+         $actual.EmailAddress | Should -Be $expectedEmailAddress
      }

      It 'Creates person user without details' {
@@ -92,14 +92,14 @@ Describe "PersonUser Tests" {
         $script:usersToCleanup += $actual

         # Assert
-         $actual | Should Not Be $null
-         $actual.GetType().FullName | Should Be 'VMware.vSphere.SsoAdminClient.DataTypes.PersonUser'
-         $actual.Name | Should Be $expectedUserName
-         $actual.Domain | Should Not Be $null
-         $actual.Description | Should Be $null
-         $actual.FirstName | Should Be $null
-         $actual.LastName | Should Be $null
-         $actual.EmailAddress | Should Be $null
+         $actual | Should -Not -Be $null
+         $actual.GetType().FullName | Should -Be 'VMware.vSphere.SsoAdminClient.DataTypes.PersonUser'
+         $actual.Name | Should -Be $expectedUserName
+         $actual.Domain | Should -Not -Be $null
+         $actual.Description | Should -Be $null
+         $actual.FirstName | Should -Be $null
+         $actual.LastName | Should -Be $null
+         $actual.EmailAddress | Should -Be $null
      }
   }

@@ -116,10 +116,10 @@ Describe "PersonUser Tests" {
         $actual = Get-SsoPersonUser

         # Assert
-         $actual | Should Not Be $null
-         $actual.Count | Should BeGreaterThan 0
-         $actual[0].Name | Should Not Be $null
-         $actual[0].Domain | Should Be 'localos'
+         $actual | Should -Not -Be $null
+         $actual.Count | Should -BeGreaterThan 0
+         $actual[0].Name | Should -Not -Be $null
+         $actual[0].Domain | Should -Be 'localos'
      }

      It 'Gets person users by name (exact match) and domain filters' {
@@ -153,10 +153,10 @@ Describe "PersonUser Tests" {
            -Server $connection

         # Assert
-         $actual | Should Not Be $null
-         $actual.Name | Should Be $expectedUserName
-         $actual.Domain | Should Not Be $null
-         $actual.Domain | Should Be $personUserToSearch.Domain
+         $actual | Should -Not -Be $null
+         $actual.Name | Should -Be $expectedUserName
+         $actual.Domain | Should -Not -Be $null
+         $actual.Domain | Should -Be $personUserToSearch.Domain
      }

      It 'Gets person users by name (* wildcard match) and domain filters' {
@@ -190,10 +190,10 @@ Describe "PersonUser Tests" {
            -Server $connection

         # Assert
-         $actual | Should Not Be $null
-         $actual.Count | Should Be 2
-         $actual.Name | Should Contain $expectedUserName
-         $actual.Name | Should Contain $secondUserName
+         $actual | Should -Not -Be $null
+         $actual.Count | Should -Be 2
+         $actual.Name | Should -Contain $expectedUserName
+         $actual.Name | Should -Contain $secondUserName
      }

      It 'Gets person users by name (? wildcard match) and domain filters' {
@@ -227,10 +227,10 @@ Describe "PersonUser Tests" {
            -Server $connection

         # Assert
-         $actual | Should Not Be $null
-         $actual.Count | Should Be 2
-         $actual.Name | Should Contain $expectedUserName
-         $actual.Name | Should Contain $secondUserName
+         $actual | Should -Not -Be $null
+         $actual.Count | Should -Be 2
+         $actual.Name | Should -Contain $expectedUserName
+         $actual.Name | Should -Contain $secondUserName
      }

      It 'Gets person users by unexisting name does not return' {
@@ -258,7 +258,7 @@ Describe "PersonUser Tests" {
            -Server $connection

         # Assert
-         $actual | Should Be $null
+         $actual | Should -Be $null
      }
   }

@@ -292,7 +292,7 @@ Describe "PersonUser Tests" {
            -Add

         # Assert
-         $actual | Should Not Be $null
+         $actual | Should -Not -Be $null
      }

      It 'Removes person user from group' {
@@ -329,7 +329,7 @@ Describe "PersonUser Tests" {
            -Remove

         # Assert
-         $actual | Should Not Be $null
+         $actual | Should -Not -Be $null
      }

      It 'Resets person user password' {
@@ -356,7 +356,7 @@ Describe "PersonUser Tests" {
            -NewPassword $newPassword

         # Assert
-         $actual | Should Not Be $null
+         $actual | Should -Not -Be $null
      }

      It 'Unlocks not locked person user' {
@@ -382,7 +382,7 @@ Describe "PersonUser Tests" {
            -Unlock

         # Assert
-         $actual | Should Be $null
+         $actual | Should -Be $null
      }
   }

@@ -407,12 +407,12 @@ Describe "PersonUser Tests" {
         Remove-SsoPersonUser -User $personUserToRemove

         # Assert
-         $personUserToRemove | Should Not Be $null
+         $personUserToRemove | Should -Not -Be $null
         $userFromServer = Get-SsoPersonUser `
            -Name $personUserToRemove.Name `
            -Domain $personUserToRemove.Domain `
            -Server $connection
-         $userFromServer | Should Be $null
+         $userFromServer | Should -Be $null
      }
   }
 }
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/RunTests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/RunTests.ps1
@@ -17,20 +17,35 @@ param(
 )

 function Test-PesterIsAvailable() {
-   $pesterModule = Get-Module Pester -List
-   if ($pesterModule -eq $null) {
-      throw "Pester Module is not available"
+   $pesterModules = Get-Module Pester -ListAvailable
+   $pesterModule = $null
+   # Search for Pester 4.X
+   foreach ($p in $pesterModules) {
+      if ($p.Version -ge [version]"5.0.0") {
+         $pesterModule = $p
+         break
+      }
   }
+
+   if ($pesterModule -eq $null) {
+      throw "Pester Module version 5.X is not available"
+   }
+
+   Import-Module -Name $pesterModule.Name -RequiredVersion $pesterModule.RequiredVersion
 }

 Test-PesterIsAvailable

-Invoke-Pester `
-   -Script @{
-       Path = $PSScriptRoot
-       Parameters = @{
-         VcAddress = $VcAddress
-         User = $User
-         Password = $Password
-      }
-   }
+$testsData = @{
+    VcAddress = $VcAddress
+    User = $User
+    Password = $Password
+}
+
+$pesterContainer = New-PesterContainer -Path $PSScriptRoot -Data $testsData
+$pesterConfiguration = [PesterConfiguration]::Default
+
+$pesterConfiguration.Run.Path = $PSScriptRoot
+$pesterConfiguration.Run.Container = $pesterContainer
+
+Invoke-Pester -Configuration $pesterConfiguration
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/TokenLifetime.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/TokenLifetime.Tests.ps1
@@ -42,9 +42,9 @@ Describe "TokenLifetime Tests" {
         $actual = Get-SsoTokenLifetime

         # Assert
-         $actual | Should Not Be $null
-         $actual.MaxHoKTokenLifetime | Should BeGreaterThan 0
-         $actual.MaxBearerTokenLifetime | Should BeGreaterThan 0
+         $actual | Should -Not -Be $null
+         $actual.MaxHoKTokenLifetime | Should -BeGreaterThan 0
+         $actual.MaxBearerTokenLifetime | Should -BeGreaterThan 0
      }
   }

@@ -62,9 +62,9 @@ Describe "TokenLifetime Tests" {
            -MaxBearerTokenLifetime $expectedMaxBearerTokenLifetime

         # Assert
-         $actual | Should Not Be $null
-         $actual.MaxHoKTokenLifetime | Should Be $expectedMaxHoKTokenLifetime
-         $actual.MaxBearerTokenLifetime | Should Be $expectedMaxBearerTokenLifetime
+         $actual | Should -Not -Be $null
+         $actual.MaxHoKTokenLifetime | Should -Be $expectedMaxHoKTokenLifetime
+         $actual.MaxBearerTokenLifetime | Should -Be $expectedMaxBearerTokenLifetime

         # Cleanup
         $tokenLifetimeToUpdate | Set-SsoTokenLifetime `