actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-15 14:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[macOS] Refactor Common.Helpers (#8924)

Browse Source 
* [macOS] Refactor Common.Helpers

* Update readme file

* Remove unnecessary double quotes

---------

Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”>
This commit is contained in:
Alexey-Ayupov
2023-12-04 12:13:08 +01:00
committed by GitHub
parent ff1dc02cbc
commit 69db5c6c63
46 changed files with 292 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
images/macos/scripts/tests/Java.Tests.ps1
View File

@@ -14,7 +14,7 @@ function Get-NativeVersionFormat {
Describe "Java" {
BeforeAll {
function Validate-JavaVersion {
function Confirm-JavaVersion {
param($JavaCommand, $ExpectedVersion)
$commandResult = Get-CommandResult $JavaCommand
@@ -26,7 +26,7 @@ Describe "Java" {
}
}
$toolsetJava = Get-ToolsetValue "java"
$toolsetJava = (Get-ToolsetContent).java
$defaultVersion = $toolsetJava.$arch.default
$jdkVersions = $toolsetJava.$arch.versions
@@ -44,14 +44,14 @@ Describe "Java" {
}
It "Java <Version>" -TestCases $_ {
$envVariablePath = Get-EnvironmentVariable $EnvVariable
$envVariablePath = [System.Environment]::GetEnvironmentVariable($EnvVariable)
$javaBinPath = Join-Path $envVariablePath "/bin/java"
Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
Confirm-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
}
if ($_.Title -eq "Default") {
It "Version is default" -TestCases $_ {
Validate-JavaVersion -JavaCommand "java -version" -ExpectedVersion $Version
Confirm-JavaVersion -JavaCommand "java -version" -ExpectedVersion $Version
}
}
}