Skip to content

Commit d5ec3a4

Browse files
authored
Use ZuluFX on UI testing Azure agent (#946)
Update TestFX to 4.0.7-alpha
1 parent 5a8e1b4 commit d5ec3a4

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

azure-pipelines.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,16 @@ jobs:
203203
vmImage: 'xcode9-macos10.13'
204204

205205
steps:
206+
- script: |
207+
mkdir build
208+
wget "https://cdn.azul.com/zulu/bin/zulu8.38.0.13-ca-fx-jdk8.0.212-macosx_x64.tar.gz" -O "build/jdk.tar.gz"
209+
sudo tar xzvf build/jdk.tar.gz -C /Library/Java/JavaVirtualMachines/
210+
displayName: 'Install ZuluFX'
206211
- task: Gradle@2
207212
inputs:
208213
workingDirectory: ''
209214
gradleWrapperFile: 'gradlew'
210-
gradleOptions: '-Xmx3072m'
211-
jdkVersionOption: '1.8'
212-
jdkArchitectureOption: 'x64'
215+
gradleOptions: '-Xmx3072m -Dorg.gradle.java.home=/Library/Java/JavaVirtualMachines/zulu8.38.0.13-ca-fx-jdk8.0.212-macosx_x64'
213216
publishJUnitResults: false
214217
tasks: 'check jacocoTestReport jacocoRootReport -Pheadless=true -Pgeneration -PlogTests --stacktrace'
215218
- script: |

ui/ui.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ dependencies {
4646
testCompile(files(coreTestOutput))
4747
testCompile(files(coreTestOutput.resourcesDir))
4848

49-
// Note: testfx is ONLY usable on JDK 8, so we have to use the versions
50-
testCompile(group = "org.testfx", name = "testfx-core", version = "4.0.5-alpha")
51-
testCompile(group = "org.testfx", name = "testfx-junit", version = "4.0.5-alpha")
52-
testRuntime(group = "org.testfx", name = "openjfx-monocle", version = "1.8.0_20")
49+
// Note: testfx is ONLY usable on JDK 8, so we have to use the versions compatible with it
50+
testCompile(group = "org.testfx", name = "testfx-core", version = "4.0.7-alpha")
51+
testCompile(group = "org.testfx", name = "testfx-junit", version = "4.0.7-alpha")
52+
testRuntime(group = "org.testfx", name = "openjfx-monocle", version = "8u76-b04")
5353
testCompile(group = "org.opencv", name = "opencv-java", version = "3.1.0")
5454
}
5555

0 commit comments

Comments
 (0)