From f357266aae23ee713bd2913669d06abaca72b8da Mon Sep 17 00:00:00 2001 From: Devin Bileck <603793+devinbileck@users.noreply.github.com> Date: Sat, 22 Jun 2024 23:32:21 -0700 Subject: [PATCH] Enable ImageCaptureReaderTest This test was disabled in #7109 due to encountering dependency issues. Using a newer version of the JavaFX Gradle Plugin should hopefully resolve those issues since a similar issue [1] was fixed in v0.0.11 when they added M1 Mac support. [1] https://github.com/openjfx/javafx-gradle-plugin/issues/112 --- .../content/notifications/qr/ImageCaptureReaderTest.java | 8 -------- gradle/libs.versions.toml | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/desktop/src/test/java/bisq/desktop/main/account/content/notifications/qr/ImageCaptureReaderTest.java b/desktop/src/test/java/bisq/desktop/main/account/content/notifications/qr/ImageCaptureReaderTest.java index 041423ea550..af045c136d2 100644 --- a/desktop/src/test/java/bisq/desktop/main/account/content/notifications/qr/ImageCaptureReaderTest.java +++ b/desktop/src/test/java/bisq/desktop/main/account/content/notifications/qr/ImageCaptureReaderTest.java @@ -28,7 +28,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -40,13 +39,6 @@ import org.bytedeco.javacv.Frame; import org.bytedeco.javacv.FrameGrabber; -// TODO fix dependency problems -// If tests are run via gradle I get an error: -// `Loading library prism_es2 from resource failed: java.lang.UnsatisfiedLinkError: Can't load library: /Users/dev/.openjfx/cache/16/libprism_es2.dylib` -// If run from the IDE it works. -// CI on windows also fails, other OS work. -// Seems that there are some platfomr specific dependency issues... -@Disabled @ExtendWith(MockitoExtension.class) class ImageCaptureReaderTest { @Mock diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 694c72e6bdb..c9aaa142b02 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,7 +43,7 @@ lombok = { strictly = '1.18.22' } mockito = { strictly = '4.0.0' } natpryce-make-it-easy = { strictly = '4.0.1' } netlayer = { strictly = '2b459dc' } -openjfx-javafx-plugin = { strictly = '0.0.10' } +openjfx-javafx-plugin = { strictly = '0.1.0' } protobuf = { strictly = '3.19.1' } pushy = { strictly = '0.13.10' } qrgen = { strictly = '1.3' }