tests/closure: Send SIGUSR1 only to our pid
[platform/upstream/glib.git] / gobject / tests / signals.c
index e54fbff..95c0501 100644 (file)
@@ -1,4 +1,5 @@
 #include <glib-object.h>
+#include "marshalers.h"
 
 typedef enum {
   TEST_ENUM_NEGATIVE = -30,
@@ -9,7 +10,10 @@ typedef enum {
 
 typedef enum {
   TEST_UNSIGNED_ENUM_FOO = 1,
-  TEST_UNSIGNED_ENUM_BAR = 0x80000000
+  TEST_UNSIGNED_ENUM_BAR = 42
+  /* Don't test 0x80000000 for now- nothing appears to do this in
+   * practice, and it triggers GValue/GEnum bugs on ppc64.
+   */
 } TestUnsignedEnum;
 
 static GType
@@ -55,6 +59,23 @@ test_unsigned_enum_get_type (void)
 }
 
 
+static const GEnumValue my_enum_values[] =
+{
+  { 1, "the first value", "one" },
+  { 0, NULL, NULL }
+};
+
+static const GFlagsValue my_flag_values[] =
+{
+  { 1, "the first value", "one" },
+  { 0, NULL, NULL }
+};
+
+static GType enum_type;
+static GType flags_type;
+
+static guint simple_id;
+
 typedef struct _Test Test;
 typedef struct _TestClass TestClass;
 
@@ -63,11 +84,15 @@ struct _Test
   GObject parent_instance;
 };
 
+static void all_types_handler (Test *test, int i, gboolean b, char c, guchar uc, guint ui, glong l, gulong ul, gint e, guint f, float fl, double db, char *str, GParamSpec *param, GBytes *bytes, gpointer ptr, Test *obj, GVariant *var, gint64 i64, guint64 ui64);
+
 struct _TestClass
 {
   GObjectClass parent_class;
 
   void (* variant_changed) (Test *, GVariant *);
+  void (* all_types) (Test *test, int i, gboolean b, char c, guchar uc, guint ui, glong l, gulong ul, gint e, guint f, float fl, double db, char *str, GParamSpec *param, GBytes *bytes, gpointer ptr, Test *obj, GVariant *var, gint64 i64, guint64 ui64);
+  void (* all_types_null) (Test *test, int i, gboolean b, char c, guchar uc, guint ui, glong l, gulong ul, gint e, guint f, float fl, double db, char *str, GParamSpec *param, GBytes *bytes, gpointer ptr, Test *obj, GVariant *var, gint64 i64, guint64 ui64);
 };
 
 static GType test_get_type (void);
@@ -81,9 +106,24 @@ test_init (Test *test)
 static void
 test_class_init (TestClass *klass)
 {
+  guint s;
+
+  enum_type = g_enum_register_static ("MyEnum", my_enum_values);
+  flags_type = g_flags_register_static ("MyFlag", my_flag_values);
+
+  klass->all_types = all_types_handler;
+
+  simple_id = g_signal_new ("simple",
+                G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST,
+                0,
+                NULL, NULL,
+                NULL,
+                G_TYPE_NONE,
+                0);
   g_signal_new ("generic-marshaller-1",
                 G_TYPE_FROM_CLASS (klass),
-                G_SIGNAL_RUN_LAST | G_SIGNAL_MUST_COLLECT,
+                G_SIGNAL_RUN_LAST,
                 0,
                 NULL, NULL,
                 NULL,
@@ -92,7 +132,7 @@ test_class_init (TestClass *klass)
                 G_TYPE_CHAR, G_TYPE_UCHAR, G_TYPE_INT, G_TYPE_LONG, G_TYPE_POINTER, G_TYPE_DOUBLE, G_TYPE_FLOAT);
   g_signal_new ("generic-marshaller-2",
                 G_TYPE_FROM_CLASS (klass),
-                G_SIGNAL_RUN_LAST | G_SIGNAL_MUST_COLLECT,
+                G_SIGNAL_RUN_LAST,
                 0,
                 NULL, NULL,
                 NULL,
@@ -101,7 +141,7 @@ test_class_init (TestClass *klass)
                 G_TYPE_INT, test_enum_get_type(), G_TYPE_INT, test_unsigned_enum_get_type (), G_TYPE_INT);
   g_signal_new ("generic-marshaller-enum-return-signed",
                 G_TYPE_FROM_CLASS (klass),
-                G_SIGNAL_RUN_LAST | G_SIGNAL_MUST_COLLECT,
+                G_SIGNAL_RUN_LAST,
                 0,
                 NULL, NULL,
                 NULL,
@@ -109,7 +149,7 @@ test_class_init (TestClass *klass)
                 0);
   g_signal_new ("generic-marshaller-enum-return-unsigned",
                 G_TYPE_FROM_CLASS (klass),
-                G_SIGNAL_RUN_LAST | G_SIGNAL_MUST_COLLECT,
+                G_SIGNAL_RUN_LAST,
                 0,
                 NULL, NULL,
                 NULL,
@@ -117,20 +157,40 @@ test_class_init (TestClass *klass)
                 0);
   g_signal_new ("generic-marshaller-int-return",
                 G_TYPE_FROM_CLASS (klass),
-                G_SIGNAL_RUN_LAST | G_SIGNAL_MUST_COLLECT,
+                G_SIGNAL_RUN_LAST,
                 0,
                 NULL, NULL,
                 NULL,
                 G_TYPE_INT,
                 0);
+  s = g_signal_new ("va-marshaller-int-return",
+                G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST,
+                0,
+                NULL, NULL,
+                test_INT__VOID,
+                G_TYPE_INT,
+                0);
+  g_signal_set_va_marshaller (s, G_TYPE_FROM_CLASS (klass),
+                             test_INT__VOIDv);
   g_signal_new ("generic-marshaller-uint-return",
                 G_TYPE_FROM_CLASS (klass),
-                G_SIGNAL_RUN_LAST | G_SIGNAL_MUST_COLLECT,
+                G_SIGNAL_RUN_LAST,
                 0,
                 NULL, NULL,
                 NULL,
                 G_TYPE_UINT,
                 0);
+  s = g_signal_new ("va-marshaller-uint-return",
+                G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST,
+                0,
+                NULL, NULL,
+                test_INT__VOID,
+                G_TYPE_UINT,
+                0);
+  g_signal_set_va_marshaller (s, G_TYPE_FROM_CLASS (klass),
+                             test_UINT__VOIDv);
   g_signal_new ("variant-changed-no-slot",
                 G_TYPE_FROM_CLASS (klass),
                 G_SIGNAL_RUN_LAST | G_SIGNAL_MUST_COLLECT,
@@ -149,6 +209,144 @@ test_class_init (TestClass *klass)
                 G_TYPE_NONE,
                 1,
                 G_TYPE_VARIANT);
+  g_signal_new ("all-types",
+                G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST,
+                G_STRUCT_OFFSET (TestClass, all_types),
+                NULL, NULL,
+                test_VOID__INT_BOOLEAN_CHAR_UCHAR_UINT_LONG_ULONG_ENUM_FLAGS_FLOAT_DOUBLE_STRING_PARAM_BOXED_POINTER_OBJECT_VARIANT_INT64_UINT64,
+                G_TYPE_NONE,
+                19,
+               G_TYPE_INT,
+               G_TYPE_BOOLEAN,
+               G_TYPE_CHAR,
+               G_TYPE_UCHAR,
+               G_TYPE_UINT,
+               G_TYPE_LONG,
+               G_TYPE_ULONG,
+               enum_type,
+               flags_type,
+               G_TYPE_FLOAT,
+               G_TYPE_DOUBLE,
+               G_TYPE_STRING,
+               G_TYPE_PARAM_LONG,
+               G_TYPE_BYTES,
+               G_TYPE_POINTER,
+               test_get_type (),
+                G_TYPE_VARIANT,
+               G_TYPE_INT64,
+               G_TYPE_UINT64);
+  s = g_signal_new ("all-types-va",
+                G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST,
+                G_STRUCT_OFFSET (TestClass, all_types),
+                NULL, NULL,
+                test_VOID__INT_BOOLEAN_CHAR_UCHAR_UINT_LONG_ULONG_ENUM_FLAGS_FLOAT_DOUBLE_STRING_PARAM_BOXED_POINTER_OBJECT_VARIANT_INT64_UINT64,
+                G_TYPE_NONE,
+                19,
+               G_TYPE_INT,
+               G_TYPE_BOOLEAN,
+               G_TYPE_CHAR,
+               G_TYPE_UCHAR,
+               G_TYPE_UINT,
+               G_TYPE_LONG,
+               G_TYPE_ULONG,
+               enum_type,
+               flags_type,
+               G_TYPE_FLOAT,
+               G_TYPE_DOUBLE,
+               G_TYPE_STRING,
+               G_TYPE_PARAM_LONG,
+               G_TYPE_BYTES,
+               G_TYPE_POINTER,
+               test_get_type (),
+                G_TYPE_VARIANT,
+               G_TYPE_INT64,
+               G_TYPE_UINT64);
+  g_signal_set_va_marshaller (s, G_TYPE_FROM_CLASS (klass),
+                             test_VOID__INT_BOOLEAN_CHAR_UCHAR_UINT_LONG_ULONG_ENUM_FLAGS_FLOAT_DOUBLE_STRING_PARAM_BOXED_POINTER_OBJECT_VARIANT_INT64_UINT64v);
+
+  g_signal_new ("all-types-generic",
+                G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST,
+                G_STRUCT_OFFSET (TestClass, all_types),
+                NULL, NULL,
+                NULL,
+                G_TYPE_NONE,
+                19,
+               G_TYPE_INT,
+               G_TYPE_BOOLEAN,
+               G_TYPE_CHAR,
+               G_TYPE_UCHAR,
+               G_TYPE_UINT,
+               G_TYPE_LONG,
+               G_TYPE_ULONG,
+               enum_type,
+               flags_type,
+               G_TYPE_FLOAT,
+               G_TYPE_DOUBLE,
+               G_TYPE_STRING,
+               G_TYPE_PARAM_LONG,
+               G_TYPE_BYTES,
+               G_TYPE_POINTER,
+               test_get_type (),
+                G_TYPE_VARIANT,
+               G_TYPE_INT64,
+               G_TYPE_UINT64);
+  g_signal_new ("all-types-null",
+                G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST,
+                G_STRUCT_OFFSET (TestClass, all_types_null),
+                NULL, NULL,
+                test_VOID__INT_BOOLEAN_CHAR_UCHAR_UINT_LONG_ULONG_ENUM_FLAGS_FLOAT_DOUBLE_STRING_PARAM_BOXED_POINTER_OBJECT_VARIANT_INT64_UINT64,
+                G_TYPE_NONE,
+                19,
+               G_TYPE_INT,
+               G_TYPE_BOOLEAN,
+               G_TYPE_CHAR,
+               G_TYPE_UCHAR,
+               G_TYPE_UINT,
+               G_TYPE_LONG,
+               G_TYPE_ULONG,
+               enum_type,
+               flags_type,
+               G_TYPE_FLOAT,
+               G_TYPE_DOUBLE,
+               G_TYPE_STRING,
+               G_TYPE_PARAM_LONG,
+               G_TYPE_BYTES,
+               G_TYPE_POINTER,
+               test_get_type (),
+                G_TYPE_VARIANT,
+               G_TYPE_INT64,
+               G_TYPE_UINT64);
+  g_signal_new ("all-types-empty",
+                G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST,
+                0,
+                NULL, NULL,
+                test_VOID__INT_BOOLEAN_CHAR_UCHAR_UINT_LONG_ULONG_ENUM_FLAGS_FLOAT_DOUBLE_STRING_PARAM_BOXED_POINTER_OBJECT_VARIANT_INT64_UINT64,
+                G_TYPE_NONE,
+                19,
+               G_TYPE_INT,
+               G_TYPE_BOOLEAN,
+               G_TYPE_CHAR,
+               G_TYPE_UCHAR,
+               G_TYPE_UINT,
+               G_TYPE_LONG,
+               G_TYPE_ULONG,
+               enum_type,
+               flags_type,
+               G_TYPE_FLOAT,
+               G_TYPE_DOUBLE,
+               G_TYPE_STRING,
+               G_TYPE_PARAM_LONG,
+               G_TYPE_BYTES,
+               G_TYPE_POINTER,
+               test_get_type (),
+                G_TYPE_VARIANT,
+               G_TYPE_INT64,
+               G_TYPE_UINT64);
 }
 
 static void
@@ -371,6 +569,27 @@ test_generic_marshaller_signal_int_return (void)
   g_assert_cmpint (retval, ==, 2);
   g_signal_handler_disconnect (test, id);
 
+  /* Same test for va marshaller */
+
+  /* Test return value -30 */
+  id = g_signal_connect (test,
+                         "va-marshaller-int-return",
+                         G_CALLBACK (on_generic_marshaller_int_return_signed_1),
+                         NULL);
+  g_signal_emit_by_name (test, "va-marshaller-int-return", &retval);
+  g_assert_cmpint (retval, ==, -30);
+  g_signal_handler_disconnect (test, id);
+
+  /* Test return value positive */
+  retval = 0;
+  id = g_signal_connect (test,
+                         "va-marshaller-int-return",
+                         G_CALLBACK (on_generic_marshaller_int_return_signed_2),
+                         NULL);
+  g_signal_emit_by_name (test, "va-marshaller-int-return", &retval);
+  g_assert_cmpint (retval, ==, 2);
+  g_signal_handler_disconnect (test, id);
+
   g_object_unref (test);
 }
 
@@ -412,26 +631,436 @@ test_generic_marshaller_signal_uint_return (void)
   g_assert_cmpint (retval, ==, G_MAXUINT);
   g_signal_handler_disconnect (test, id);
 
+  /* Same test for va marshaller */
+
+  id = g_signal_connect (test,
+                         "va-marshaller-uint-return",
+                         G_CALLBACK (on_generic_marshaller_uint_return_1),
+                         NULL);
+  g_signal_emit_by_name (test, "va-marshaller-uint-return", &retval);
+  g_assert_cmpint (retval, ==, 1);
+  g_signal_handler_disconnect (test, id);
+
+  retval = 0;
+  id = g_signal_connect (test,
+                         "va-marshaller-uint-return",
+                         G_CALLBACK (on_generic_marshaller_uint_return_2),
+                         NULL);
+  g_signal_emit_by_name (test, "va-marshaller-uint-return", &retval);
+  g_assert_cmpint (retval, ==, G_MAXUINT);
+  g_signal_handler_disconnect (test, id);
+
   g_object_unref (test);
 }
 
+static int all_type_handlers_count = 0;
+
+static void
+all_types_handler (Test *test, int i, gboolean b, char c, guchar uc, guint ui, glong l, gulong ul, gint e, guint f, float fl, double db, char *str, GParamSpec *param, GBytes *bytes, gpointer ptr, Test *obj, GVariant *var, gint64 i64, guint64 ui64)
+{
+  all_type_handlers_count++;
+
+  g_assert_cmpint (i, ==, 42);
+  g_assert_cmpint (b, ==, TRUE);
+  g_assert_cmpint (c, ==, 17);
+  g_assert_cmpuint (uc, ==, 140);
+  g_assert_cmpuint (ui, ==, G_MAXUINT - 42);
+  g_assert_cmpint (l, ==, -1117);
+  g_assert_cmpuint (ul, ==, G_MAXULONG - 999);
+  g_assert_cmpint (e, ==, 1);
+  g_assert_cmpuint (f, ==, 0);
+  g_assert_cmpfloat (fl, ==, 0.25);
+  g_assert_cmpfloat (db, ==, 1.5);
+  g_assert_cmpstr (str, ==, "Test");
+  g_assert_cmpstr (g_param_spec_get_nick (param), ==, "nick");
+  g_assert_cmpstr (g_bytes_get_data (bytes, NULL), ==, "Blah");
+  g_assert (ptr == &enum_type);
+  g_assert_cmpuint (g_variant_get_uint16 (var), == , 99);
+  g_assert_cmpint (i64, ==, G_MAXINT64 - 1234);
+  g_assert_cmpuint (ui64, ==, G_MAXUINT64 - 123456);
+}
+
+static void
+all_types_handler_cb (Test *test, int i, gboolean b, char c, guchar uc, guint ui, glong l, gulong ul, gint e, guint f, float fl, double db, char *str, GParamSpec *param, GBytes *bytes, gpointer ptr, Test *obj, GVariant *var, gint64 i64, guint64 ui64, gpointer user_data)
+{
+  g_assert (user_data == &flags_type);
+  all_types_handler (test, i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, obj, var, i64, ui64);
+}
+
+static void
+test_all_types (void)
+{
+  Test *test;
+
+  int i = 42;
+  gboolean b = TRUE;
+  char c = 17;
+  guchar uc = 140;
+  guint ui = G_MAXUINT - 42;
+  glong l =  -1117;
+  gulong ul = G_MAXULONG - 999;
+  gint e = 1;
+  guint f = 0;
+  float fl = 0.25;
+  double db = 1.5;
+  char *str = "Test";
+  GParamSpec *param = g_param_spec_long         ("param", "nick", "blurb", 0, 10, 4, 0);
+  GBytes *bytes = g_bytes_new_static ("Blah", 5);
+  gpointer ptr = &enum_type;
+  GVariant *var = g_variant_new_uint16 (99);
+  gint64 i64;
+  guint64 ui64;
+  g_variant_ref_sink (var);
+  i64 = G_MAXINT64 - 1234;
+  ui64 = G_MAXUINT64 - 123456;
+
+  test = g_object_new (test_get_type (), NULL);
+
+  all_type_handlers_count = 0;
+
+  g_signal_emit_by_name (test, "all-types",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-va",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-generic",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-empty",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-null",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+
+  g_assert_cmpint (all_type_handlers_count, ==, 3);
+
+  all_type_handlers_count = 0;
+
+  g_signal_connect (test, "all-types", G_CALLBACK (all_types_handler_cb), &flags_type);
+  g_signal_connect (test, "all-types-va", G_CALLBACK (all_types_handler_cb), &flags_type);
+  g_signal_connect (test, "all-types-generic", G_CALLBACK (all_types_handler_cb), &flags_type);
+  g_signal_connect (test, "all-types-empty", G_CALLBACK (all_types_handler_cb), &flags_type);
+  g_signal_connect (test, "all-types-null", G_CALLBACK (all_types_handler_cb), &flags_type);
+
+  g_signal_emit_by_name (test, "all-types",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-va",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-generic",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-empty",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-null",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+
+  g_assert_cmpint (all_type_handlers_count, ==, 3 + 5);
+
+  all_type_handlers_count = 0;
+
+  g_signal_connect (test, "all-types", G_CALLBACK (all_types_handler_cb), &flags_type);
+  g_signal_connect (test, "all-types-va", G_CALLBACK (all_types_handler_cb), &flags_type);
+  g_signal_connect (test, "all-types-generic", G_CALLBACK (all_types_handler_cb), &flags_type);
+  g_signal_connect (test, "all-types-empty", G_CALLBACK (all_types_handler_cb), &flags_type);
+  g_signal_connect (test, "all-types-null", G_CALLBACK (all_types_handler_cb), &flags_type);
+
+  g_signal_emit_by_name (test, "all-types",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-va",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-generic",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-empty",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+  g_signal_emit_by_name (test, "all-types-null",
+                        i, b, c, uc, ui, l, ul, e, f, fl, db, str, param, bytes, ptr, test, var, i64, ui64);
+
+  g_assert_cmpint (all_type_handlers_count, ==, 3 + 5 + 5);
+
+  g_object_unref (test);
+  g_param_spec_unref (param);
+  g_bytes_unref (bytes);
+  g_variant_unref (var);
+}
+
+static void
+test_connect (void)
+{
+  GObject *test;
+  gint retval;
+
+  test = g_object_new (test_get_type (), NULL);
+
+  g_object_connect (test,
+                    "signal::generic-marshaller-int-return",
+                    G_CALLBACK (on_generic_marshaller_int_return_signed_1),
+                    NULL,
+                    "object-signal::va-marshaller-int-return",
+                    G_CALLBACK (on_generic_marshaller_int_return_signed_2),
+                    NULL,
+                    NULL);
+  g_signal_emit_by_name (test, "generic-marshaller-int-return", &retval);
+  g_assert_cmpint (retval, ==, -30);
+  g_signal_emit_by_name (test, "va-marshaller-int-return", &retval);
+  g_assert_cmpint (retval, ==, 2);
+
+  g_object_disconnect (test,
+                       "any-signal",
+                       G_CALLBACK (on_generic_marshaller_int_return_signed_1),
+                       NULL,
+                       "any-signal::va-marshaller-int-return",
+                       G_CALLBACK (on_generic_marshaller_int_return_signed_2),
+                       NULL,
+                       NULL);
+
+  g_object_unref (test);
+}
+
+static void
+simple_handler1 (GObject *sender,
+                 GObject *target)
+{
+  g_object_unref (target);
+}
+
+static void
+simple_handler2 (GObject *sender,
+                 GObject *target)
+{
+  g_object_unref (target);
+}
+
+static void
+test_destroy_target_object (void)
+{
+  Test *sender, *target1, *target2;
+
+  sender = g_object_new (test_get_type (), NULL);
+  target1 = g_object_new (test_get_type (), NULL);
+  target2 = g_object_new (test_get_type (), NULL);
+  g_signal_connect_object (sender, "simple", G_CALLBACK (simple_handler1), target1, 0);
+  g_signal_connect_object (sender, "simple", G_CALLBACK (simple_handler2), target2, 0);
+  g_signal_emit_by_name (sender, "simple");
+  g_object_unref (sender);
+}
+
+static gboolean
+hook_func (GSignalInvocationHint *ihint,
+           guint                  n_params,
+           const GValue          *params,
+           gpointer               data)
+{
+  gint *count = data;
+
+  (*count)++;
+
+  return TRUE;
+}
+
+static void
+test_emission_hook (void)
+{
+  GObject *test1, *test2;
+  gint count = 0;
+  gulong hook;
+
+  test1 = g_object_new (test_get_type (), NULL);
+  test2 = g_object_new (test_get_type (), NULL);
+
+  hook = g_signal_add_emission_hook (simple_id, 0, hook_func, &count, NULL);
+  g_assert_cmpint (count, ==, 0);
+  g_signal_emit_by_name (test1, "simple");
+  g_assert_cmpint (count, ==, 1);
+  g_signal_emit_by_name (test2, "simple");
+  g_assert_cmpint (count, ==, 2);
+  g_signal_remove_emission_hook (simple_id, hook);
+  g_signal_emit_by_name (test1, "simple");
+  g_assert_cmpint (count, ==, 2);
+}
+
+static gboolean
+in_set (const gchar *s,
+        const gchar *set[])
+{
+  gint i;
+
+  for (i = 0; set[i]; i++)
+    {
+      if (g_strcmp0 (s, set[i]) == 0)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+test_introspection (void)
+{
+  guint *ids;
+  guint n_ids;
+  const gchar *name;
+  gint i;
+  const gchar *names[] = {
+    "simple",
+    "generic-marshaller-1",
+    "generic-marshaller-2",
+    "generic-marshaller-enum-return-signed",
+    "generic-marshaller-enum-return-unsigned",
+    "generic-marshaller-int-return",
+    "va-marshaller-int-return",
+    "generic-marshaller-uint-return",
+    "va-marshaller-uint-return",
+    "variant-changed-no-slot",
+    "variant-changed",
+    "all-types",
+    "all-types-va",
+    "all-types-generic",
+    "all-types-null",
+    "all-types-empty",
+    NULL
+  };
+  GSignalQuery query;
+
+  ids = g_signal_list_ids (test_get_type (), &n_ids);
+  g_assert_cmpuint (n_ids, ==, g_strv_length ((gchar**)names));
+
+  for (i = 0; i < n_ids; i++)
+    {
+      name = g_signal_name (ids[i]);
+      g_assert (in_set (name, names));
+    }
+
+  g_signal_query (simple_id, &query);
+  g_assert_cmpuint (query.signal_id, ==, simple_id);
+  g_assert_cmpstr (query.signal_name, ==, "simple");
+  g_assert (query.itype == test_get_type ());
+  g_assert (query.signal_flags == G_SIGNAL_RUN_LAST);
+  g_assert (query.return_type == G_TYPE_NONE);
+  g_assert_cmpuint (query.n_params, ==, 0);
+}
+
+static void
+test_handler (gpointer instance, gpointer data)
+{
+  gint *count = data;
+
+  (*count)++;
+}
+
+static void
+test_block_handler (void)
+{
+  GObject *test1, *test2;
+  gint count1 = 0;
+  gint count2 = 0;
+  gulong handler1, handler;
+
+  test1 = g_object_new (test_get_type (), NULL);
+  test2 = g_object_new (test_get_type (), NULL);
+
+  handler1 = g_signal_connect (test1, "simple", G_CALLBACK (test_handler), &count1);
+  g_signal_connect (test2, "simple", G_CALLBACK (test_handler), &count2);
+
+  handler = g_signal_handler_find (test1, G_SIGNAL_MATCH_ID, simple_id, 0, NULL, NULL, NULL);
+
+  g_assert (handler == handler1);
+
+  g_assert_cmpint (count1, ==, 0);
+  g_assert_cmpint (count2, ==, 0);
+
+  g_signal_emit_by_name (test1, "simple");
+  g_signal_emit_by_name (test2, "simple");
+
+  g_assert_cmpint (count1, ==, 1);
+  g_assert_cmpint (count2, ==, 1);
+
+  g_signal_handler_block (test1, handler1);
+
+  g_signal_emit_by_name (test1, "simple");
+  g_signal_emit_by_name (test2, "simple");
+
+  g_assert_cmpint (count1, ==, 1);
+  g_assert_cmpint (count2, ==, 2);
+
+  g_signal_handler_unblock (test1, handler1);
+
+  g_signal_emit_by_name (test1, "simple");
+  g_signal_emit_by_name (test2, "simple");
+
+  g_assert_cmpint (count1, ==, 2);
+  g_assert_cmpint (count2, ==, 3);
+
+  g_assert_cmpuint (g_signal_handlers_block_matched (test1, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, test_block_handler, NULL), ==, 0);
+  g_assert_cmpuint (g_signal_handlers_block_matched (test2, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, test_handler, NULL), ==, 1);
+
+  g_signal_emit_by_name (test1, "simple");
+  g_signal_emit_by_name (test2, "simple");
+
+  g_assert_cmpint (count1, ==, 3);
+  g_assert_cmpint (count2, ==, 3);
+
+  g_signal_handlers_unblock_matched (test2, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, test_handler, NULL);
+
+  g_object_unref (test1);
+  g_object_unref (test2);
+}
+
+static void
+stop_emission (gpointer instance, gpointer data)
+{
+  g_signal_stop_emission (instance, simple_id, 0);
+}
+
+static void
+stop_emission_by_name (gpointer instance, gpointer data)
+{
+  g_signal_stop_emission_by_name (instance, "simple");
+}
+
+static void
+dont_reach (gpointer instance, gpointer data)
+{
+  g_assert_not_reached ();
+}
+
+static void
+test_stop_emission (void)
+{
+  GObject *test1;
+  gulong handler;
+
+  test1 = g_object_new (test_get_type (), NULL);
+  handler = g_signal_connect (test1, "simple", G_CALLBACK (stop_emission), NULL);
+  g_signal_connect_after (test1, "simple", G_CALLBACK (dont_reach), NULL);
+
+  g_signal_emit_by_name (test1, "simple");
+
+  g_signal_handler_disconnect (test1, handler);
+  g_signal_connect (test1, "simple", G_CALLBACK (stop_emission_by_name), NULL);
+
+  g_signal_emit_by_name (test1, "simple");
+
+  g_object_unref (test1);
+}
+
 /* --- */
 
 int
 main (int argc,
      char *argv[])
 {
-  g_type_init ();
-
   g_test_init (&argc, &argv, NULL);
 
+  g_test_add_func ("/gobject/signals/all-types", test_all_types);
   g_test_add_func ("/gobject/signals/variant", test_variant_signal);
+  g_test_add_func ("/gobject/signals/destroy-target-object", test_destroy_target_object);
   g_test_add_func ("/gobject/signals/generic-marshaller-1", test_generic_marshaller_signal_1);
   g_test_add_func ("/gobject/signals/generic-marshaller-2", test_generic_marshaller_signal_2);
   g_test_add_func ("/gobject/signals/generic-marshaller-enum-return-signed", test_generic_marshaller_signal_enum_return_signed);
   g_test_add_func ("/gobject/signals/generic-marshaller-enum-return-unsigned", test_generic_marshaller_signal_enum_return_unsigned);
   g_test_add_func ("/gobject/signals/generic-marshaller-int-return", test_generic_marshaller_signal_int_return);
   g_test_add_func ("/gobject/signals/generic-marshaller-uint-return", test_generic_marshaller_signal_uint_return);
+  g_test_add_func ("/gobject/signals/connect", test_connect);
+  g_test_add_func ("/gobject/signals/emission-hook", test_emission_hook);
+  g_test_add_func ("/gobject/signals/introspection", test_introspection);
+  g_test_add_func ("/gobject/signals/block-handler", test_block_handler);
+  g_test_add_func ("/gobject/signals/stop-emission", test_stop_emission);
 
   return g_test_run ();
 }