Update Java.Tests.ps1

This commit is contained in:
Maxim Lobanov
2020-11-03 16:58:07 +03:00
parent 5ec18c4b3d
commit 43e905b4bd

View File

@@ -1,8 +1,6 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
#Java tests are disabled because Java is not working properly on macOS 11.0 yet.
$os = Get-OSVersion
function Get-NativeVersionFormat { function Get-NativeVersionFormat {
param($Version) param($Version)
if ($Version -in "7", "8") { if ($Version -in "7", "8") {
@@ -37,11 +35,14 @@ Describe "Java" {
"/usr/libexec/java_home -v${Version}" | Should -ReturnZeroExitCode "/usr/libexec/java_home -v${Version}" | Should -ReturnZeroExitCode
} }
if ($_.Title -ne "Default") {
It "Version is valid" -TestCases $_ { It "Version is valid" -TestCases $_ {
$javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk//Contents/Home" $javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk/Contents/Home"
if ($Title -eq "7") { $javaRootPath = "/Library/Java/JavaVirtualMachines/zulu-7.jdk/Contents/Home" }
$javaBinPath = Join-Path $javaRootPath "/bin/java" $javaBinPath = Join-Path $javaRootPath "/bin/java"
Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
} }
}
It "<EnvVariable>" -TestCases $_ { It "<EnvVariable>" -TestCases $_ {
$envVariablePath = Get-EnvironmentVariable $EnvVariable $envVariablePath = Get-EnvironmentVariable $EnvVariable