Skip to content

Commit efa9644

Browse files
committed
Limit KeePassXC installation checks to Linux
1 parent 06402e5 commit efa9644

File tree

5 files changed

+20
-0
lines changed

5 files changed

+20
-0
lines changed

src/main/java/org/keepassxc/KindOfKeePassXC.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
package org.keepassxc;
22

3+
import org.apache.commons.lang3.SystemUtils;
34
import org.slf4j.Logger;
45
import org.slf4j.LoggerFactory;
56

67
import java.util.Optional;
78

9+
/**
10+
* Utility class to determine the kind of the KeePassXC installation on Linux
11+
*/
812
public class KindOfKeePassXC {
913
private static final Logger LOG = LoggerFactory.getLogger(KindOfKeePassXC.class);
1014

1115
public static Optional<KeePassXCType> determineType() {
16+
if (!SystemUtils.IS_OS_LINUX) {
17+
return Optional.empty();
18+
}
19+
1220
///home/<user>/Downloads/KeePassXC-2.7.4-x86_64.AppImage
1321
var processHandle = ProcessHandle.allProcesses()
1422
.filter(ph -> ph.info().command().isPresent() && ph.info().command().get().contains("KeePassXC")

src/test/java/org/purejava/AppImageTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import org.junit.jupiter.api.DisplayName;
44
import org.junit.jupiter.api.Order;
55
import org.junit.jupiter.api.Test;
6+
import org.junit.jupiter.api.condition.EnabledOnOs;
7+
import org.junit.jupiter.api.condition.OS;
68
import org.keepassxc.KeePassXCType;
79
import org.keepassxc.KindOfKeePassXC;
810

@@ -15,6 +17,7 @@ public class AppImageTest {
1517
@Test
1618
@Order(7)
1719
@DisplayName("Testing KeePassXC installation type")
20+
@EnabledOnOs(OS.LINUX)
1821
public void shouldHaveNoErrors() {
1922
var type = KindOfKeePassXC.determineType();
2023
assertTrue(type.isPresent() && type.get().equals(KeePassXCType.AppImage));

src/test/java/org/purejava/FlatpakTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import org.junit.jupiter.api.DisplayName;
44
import org.junit.jupiter.api.Order;
55
import org.junit.jupiter.api.Test;
6+
import org.junit.jupiter.api.condition.EnabledOnOs;
7+
import org.junit.jupiter.api.condition.OS;
68
import org.keepassxc.KeePassXCType;
79
import org.keepassxc.KindOfKeePassXC;
810

@@ -15,6 +17,7 @@ public class FlatpakTest {
1517
@Test
1618
@Order(4)
1719
@DisplayName("Testing KeePassXC installation type")
20+
@EnabledOnOs(OS.LINUX)
1821
public void shouldHaveNoErrors() {
1922
var type = KindOfKeePassXC.determineType();
2023
assertTrue(type.isPresent() && type.get().equals(KeePassXCType.Flatpak));

src/test/java/org/purejava/RepoTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import org.junit.jupiter.api.DisplayName;
44
import org.junit.jupiter.api.Order;
55
import org.junit.jupiter.api.Test;
6+
import org.junit.jupiter.api.condition.EnabledOnOs;
7+
import org.junit.jupiter.api.condition.OS;
68
import org.keepassxc.KeePassXCType;
79
import org.keepassxc.KindOfKeePassXC;
810

@@ -15,6 +17,7 @@ public class RepoTest {
1517
@Test
1618
@Order(6)
1719
@DisplayName("Testing KeePassXC installation type")
20+
@EnabledOnOs(OS.LINUX)
1821
public void shouldHaveNoErrors() {
1922
var type = KindOfKeePassXC.determineType();
2023
assertTrue(type.isPresent() && type.get().equals(KeePassXCType.Repo));

src/test/java/org/purejava/SnapTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import org.junit.jupiter.api.DisplayName;
44
import org.junit.jupiter.api.Order;
55
import org.junit.jupiter.api.Test;
6+
import org.junit.jupiter.api.condition.EnabledOnOs;
7+
import org.junit.jupiter.api.condition.OS;
68
import org.keepassxc.KeePassXCType;
79
import org.keepassxc.KindOfKeePassXC;
810

@@ -15,6 +17,7 @@ public class SnapTest {
1517
@Test
1618
@Order(5)
1719
@DisplayName("Testing KeePassXC installation type")
20+
@EnabledOnOs(OS.LINUX)
1821
public void shouldHaveNoErrors() {
1922
var type = KindOfKeePassXC.determineType();
2023
assertTrue(type.isPresent() && type.get().equals(KeePassXCType.Snap));

0 commit comments

Comments
 (0)