Update Java.Tests.ps1

This commit is contained in:
Maxim Lobanov
2020-11-02 15:47:58 +03:00
parent cca2fdee1b
commit 5ec18c4b3d

View File

@@ -38,17 +38,15 @@ Describe "Java" {
} }
It "Version is valid" -TestCases $_ { It "Version is valid" -TestCases $_ {
$javaRootPath = (Get-CommandResult "/usr/libexec/java_home -v${Version}").Output $javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.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
$commandResult = Get-CommandResult "/usr/libexec/java_home -v${Version}" $javaBinPath = Join-Path $envVariablePath "/bin/java"
$commandResult.ExitCode | Should -Be 0 Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
$commandResult.Output | Should -Not -BeNullOrEmpty
$commandResult.Output | Should -Be $envVariablePath
} }
if ($_.Title -eq "Default") { if ($_.Title -eq "Default") {