Fixed bug with connecting detailed signal from builder object

jwharm · Sep 30, 2024 · a086d26 · a086d26
1 parent aa3527b
commit a086d26
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/modules/gio/src/test/java/io/github/jwharm/javagi/test/gio/PropertiesTest.java b/modules/gio/src/test/java/io/github/jwharm/javagi/test/gio/PropertiesTest.java
@@ -26,7 +26,10 @@
 import org.gnome.gobject.GObject;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Tests for the patched GObject methods to get and set properties,
@@ -58,4 +61,25 @@ public void newGObjectWithProperties() {
         String applicationId = (String) Properties.getProperty(app, "application-id");
         assertEquals("io.github.jwharm.javagi.test.Application", applicationId);
     }
+
+    @Test
+    public void builder() {
+        AtomicBoolean notified = new AtomicBoolean(false);
+        Application app = Application.builder()
+                .setApplicationId("javagi.test.Application1")
+                .setFlags(Set.of(ApplicationFlags.IS_SERVICE))
+                .onNotify("application-id", _ -> {
+                    notified.set(true);
+                })
+                .build();
+
+        // Assert that the properties are set
+        assertEquals("javagi.test.Application1", app.getApplicationId());
+        assertEquals(Set.of(ApplicationFlags.IS_SERVICE), app.getFlags());
+
+        // Assert that the "notify" signal is connected
+        assertFalse(notified.get());
+        app.setApplicationId("javagi.test.Application2");
+        assertTrue(notified.get());
+    }
 }
diff --git a/modules/gobject/src/main/java/io/github/jwharm/javagi/gobject/Builder.java b/modules/gobject/src/main/java/io/github/jwharm/javagi/gobject/Builder.java
@@ -109,7 +109,7 @@ public void connect(String name, FunctionPointer callback) {
      */
     @Override
     public void connect(String name, String detail, FunctionPointer callback) {
-        boolean isDetailed = detail != null && detail.isBlank();
+        boolean isDetailed = detail != null && !detail.isBlank();
         String fullName = name + (isDetailed ? "" : ("::" + detail));
         connectRequests.add(new ConnectRequest(fullName, callback));
     }