1 files changed, 62 insertions, 2 deletions

diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c
index e588da45d..b3747dfc3 100644
--- a/src/pq/test_pq.c
+++ b/src/pq/test_pq.c
@@ -220,6 +220,64 @@ run_queries (struct GNUNET_PQ_Context *db)
 }
 
 
+static void
+event_cb (void *cls,
+          const void *extra,
+          size_t extra_size)
+{
+  unsigned int *cnt = cls;
+
+  GNUNET_assert (5 == extra_size);
+  GNUNET_assert (0 == memcmp ("world",
+                              extra,
+                              5));
+  (*cnt)++;
+}
+
+
+/**
+ * Run subscribe/notify tests.
+ *
+ * @param db database handle
+ * @return 0 on success
+ */
+static int
+test_notify (struct GNUNET_PQ_Context *db)
+{
+  struct GNUNET_PQ_EventHeaderP e1 = {
+    .size = htons (sizeof (e1)),
+    .type = htons (1)
+  };
+  struct GNUNET_PQ_EventHeaderP e2 = {
+    .size = htons (sizeof (e2)),
+    .type = htons (2)
+  };
+  unsigned int called = 0;
+  struct GNUNET_PQ_EventHandler *eh;
+
+  eh = GNUNET_PQ_event_listen (db,
+                               &e1,
+                               &event_cb,
+                               &called);
+  GNUNET_assert (NULL != eh);
+  GNUNET_PQ_event_notify (db,
+                          &e2,
+                          "hello",
+                          5);
+  GNUNET_PQ_event_do_poll (db);
+  GNUNET_assert (0 == called);
+  GNUNET_PQ_event_notify (db,
+                          &e1,
+                          "world",
+                          5);
+  GNUNET_PQ_event_do_poll (db);
+  GNUNET_assert (1 == called);
+  GNUNET_PQ_event_listen_cancel (eh);
+  return 0;
+}
+
+
+             
 int
 main (int argc,
       const char *const argv[])
@@ -272,12 +330,14 @@ main (int argc,
     return 1;
   }
   ret = run_queries (db);
+  ret |= test_notify (db);
+  ret |= test_notify (db);
 #if TEST_RESTART
   fprintf (stderr, "Please restart Postgres database now!\n");
   sleep (60);
-  ret = run_queries (db);
+  ret |= run_queries (db);
   fprintf (stderr, "Result: %d (expect: 1 -- if you restarted the DB)\n", ret);
-  ret = run_queries (db);
+  ret |= run_queries (db);
   fprintf (stderr, "Result: %d (expect: 0)\n", ret);
 #endif
   {