further fixes

* open quickaccess package to integrations-api module * add checkAvailability annotation to DolphinPlaces
cryptomator · Aug 14, 2024 · 2a23abb · 2a23abb
1 parent eef20ec
commit 2a23abb
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 0 deletions.
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -26,4 +26,5 @@
 	provides QuickAccessService with NautilusBookmarks, DolphinPlaces;
 
 	opens org.cryptomator.linux.tray to org.cryptomator.integrations.api;
+	opens org.cryptomator.linux.quickaccess to org.cryptomator.integrations.api;
 }
diff --git a/src/main/java/org/cryptomator/linux/quickaccess/DolphinPlaces.java b/src/main/java/org/cryptomator/linux/quickaccess/DolphinPlaces.java
@@ -30,6 +30,7 @@
  * Implemenation of the {@link QuickAccessService} for KDE desktop environments using Dolphin file browser.
  */
 @DisplayName("KDE Dolphin Places")
+@CheckAvailability
 @OperatingSystem(OperatingSystem.Value.LINUX)
 @Priority(90)
 public class DolphinPlaces implements QuickAccessService {

diff --git a/src/test/java/org/cryptomator/linux/quickaccess/DolphinPlacesIT.java b/src/test/java/org/cryptomator/linux/quickaccess/DolphinPlacesIT.java
@@ -1,6 +1,9 @@
 package org.cryptomator.linux.quickaccess;
 
+import org.cryptomator.integrations.common.IntegrationsLoader;
+import org.cryptomator.integrations.quickaccess.QuickAccessService;
 import org.cryptomator.integrations.quickaccess.QuickAccessServiceException;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -11,6 +14,16 @@
 
 public class DolphinPlacesIT {
 
+	@Test
+	@DisplayName("If dolphin is installed, isSupported returns true and service is contained in the service provider stream")
+	@Disabled
+	public void testSupport() {
+		Assertions.assertTrue(DolphinPlaces.isSupported());
+
+		var optionalService = IntegrationsLoader.loadAll(QuickAccessService.class).filter(s -> s.getClass().getName().equals("org.cryptomator.linux.quickaccess.DolphinPlaces")).findAny();
+		Assertions.assertTrue(optionalService.isPresent());
+	}
+
 	@Test
 	@DisplayName("Adds for 20s an entry to the Dolphin sidebar")
 	@Disabled

diff --git a/src/test/java/org/cryptomator/linux/quickaccess/NautilusBookmarksIT.java b/src/test/java/org/cryptomator/linux/quickaccess/NautilusBookmarksIT.java
@@ -1,6 +1,9 @@
 package org.cryptomator.linux.quickaccess;
 
+import org.cryptomator.integrations.common.IntegrationsLoader;
+import org.cryptomator.integrations.quickaccess.QuickAccessService;
 import org.cryptomator.integrations.quickaccess.QuickAccessServiceException;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -11,6 +14,16 @@
 
 public class NautilusBookmarksIT {
 
+	@Test
+	@DisplayName("If nautilus is installed, isSupported returns true and service is contained in the service provider stream")
+	@Disabled
+	public void testSupport() {
+		Assertions.assertTrue(NautilusBookmarks.isSupported());
+
+		var optionalService = IntegrationsLoader.loadAll(QuickAccessService.class).filter(s -> s.getClass().getName().equals("org.cryptomator.linux.quickaccess.NautilusBookmarks")).findAny();
+		Assertions.assertTrue(optionalService.isPresent());
+	}
+
 	@Test
 	@DisplayName("Adds for 20s an entryto the Nautilus sidebar")
 	@Disabled