Try different Test structer

javakeyring · Sep 25, 2023 · f813069 · f813069
1 parent fcb06de
commit f813069
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.../src/main/java/com/github/javakeyring/internal/freedesktop/FreedesktopKeyringBackend.java b/.../src/main/java/com/github/javakeyring/internal/freedesktop/FreedesktopKeyringBackend.java
@@ -52,6 +52,9 @@ public class FreedesktopKeyringBackend implements KeyringBackend {
   public FreedesktopKeyringBackend() throws BackendNotSupportedException {
     try {
       collection = new SimpleCollection();
+      if (!collection.isConnected()) {
+        throw new BackendNotSupportedException("Error connecting to dbus");
+      }
     } catch (IOException ex) {
       throw new BackendNotSupportedException("Error connecting to dbus", ex);
     }

diff --git a/java-keyring/src/main/java/com/github/javakeyring/internal/freedesktop/SimpleCollection.java b/java-keyring/src/main/java/com/github/javakeyring/internal/freedesktop/SimpleCollection.java
@@ -82,6 +82,10 @@ public SimpleCollection() throws IOException {
     unlock();
   }
 
+  public boolean isConnected() {
+    return this.session.getConnection().isConnected();
+  }
+
   /*
    * A user specified collection.
    *

diff --git a/java-keyring/src/main/java/com/github/javakeyring/internal/kde/KWalletBackend.java b/java-keyring/src/main/java/com/github/javakeyring/internal/kde/KWalletBackend.java
@@ -47,14 +47,6 @@ public class KWalletBackend implements KeyringBackend {
 
   public KWalletBackend() throws BackendNotSupportedException {
     try {
-    //  connection = DBusConnectionBuilder.forAddress(BusAddress.of(System.getProperty("DBUS_TCP_SESSION")))
-    //         .withRegisterSelf(true)
-    //         .withShared(true)
-    //         .transportConfig()
-    //             .withAdditionalConfig("TIMEOUT", 10000)
-    //         .back()
-    //         .build();
-
       connection = DBusConnectionBuilder.forSessionBus().build();
       wallet = connection.getRemoteObject("org.kde.kwalletd5", "/modules/kwalletd5", KWallet.class, true);
       wallet.localWallet(); //attempt connection to wallet

diff --git a/java-keyring/src/test/java/com/github/javakeyring/kde/KWalletBackendTest.java b/java-keyring/src/test/java/com/github/javakeyring/kde/KWalletBackendTest.java
@@ -64,7 +64,7 @@ public void testSetup() throws Exception {
    */
   @Test
   public void testPasswordFlow() throws Exception {
-    assumeTrue(Platform.isLinux() && Keyring.create().getKeyringStorageType() == KeyringStorageType.KWALLET);
+    assumeTrue(Platform.isLinux() && Keyring.create().getKeyringStorageType() != KeyringStorageType.KWALLET);
     KeyringBackend backend = new KWalletBackend();
     catchThrowable(() -> backend.deletePassword(SERVICE, ACCOUNT));
     checkExistenceOfPasswordEntry(backend);