Add a threaded test for g_object_replace_data
[platform/upstream/glib.git] / gobject / tests / signals.c
index f4b8240..58c9370 100644 (file)
@@ -1,4 +1,76 @@
 #include <glib-object.h>
+#include "marshalers.h"
+
+typedef enum {
+  TEST_ENUM_NEGATIVE = -30,
+  TEST_ENUM_NONE = 0,
+  TEST_ENUM_FOO = 1,
+  TEST_ENUM_BAR = 2
+} TestEnum;
+
+typedef enum {
+  TEST_UNSIGNED_ENUM_FOO = 1,
+  TEST_UNSIGNED_ENUM_BAR = 0x80000000
+} TestUnsignedEnum;
+
+static GType
+test_enum_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { TEST_ENUM_NEGATIVE, "TEST_ENUM_NEGATIVE", "negative" },
+        { TEST_ENUM_NONE, "TEST_ENUM_NONE", "none" },
+        { TEST_ENUM_FOO, "TEST_ENUM_FOO", "foo" },
+        { TEST_ENUM_BAR, "TEST_ENUM_BAR", "bar" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("TestEnum"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+
+static GType
+test_unsigned_enum_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { TEST_UNSIGNED_ENUM_FOO, "TEST_UNSIGNED_ENUM_FOO", "foo" },
+        { TEST_UNSIGNED_ENUM_BAR, "TEST_UNSIGNED_ENUM_BAR", "bar" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("TestUnsignedEnum"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+
+
+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;
+
 
 typedef struct _Test Test;
 typedef struct _TestClass TestClass;
@@ -8,11 +80,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);
@@ -26,6 +102,83 @@ 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;
+
+  g_signal_new ("generic-marshaller-1",
+                G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST,
+                0,
+                NULL, NULL,
+                NULL,
+                G_TYPE_NONE,
+                7,
+                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,
+                0,
+                NULL, NULL,
+                NULL,
+                G_TYPE_NONE,
+                5,
+                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,
+                0,
+                NULL, NULL,
+                NULL,
+                test_enum_get_type(),
+                0);
+  g_signal_new ("generic-marshaller-enum-return-unsigned",
+                G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST,
+                0,
+                NULL, NULL,
+                NULL,
+                test_unsigned_enum_get_type(),
+                0);
+  g_signal_new ("generic-marshaller-int-return",
+                G_TYPE_FROM_CLASS (klass),
+                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,
+                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,
@@ -44,6 +197,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
@@ -75,6 +366,437 @@ test_variant_signal (void)
   g_object_unref (test);
 }
 
+static void
+on_generic_marshaller_1 (Test *obj,
+                        gint8 v_schar,
+                        guint8 v_uchar,
+                        gint v_int,
+                        glong v_long,
+                        gpointer v_pointer,
+                        gdouble v_double,
+                        gfloat v_float,
+                        gpointer user_data)
+{
+  g_assert_cmpint (v_schar, ==, 42);
+  g_assert_cmpint (v_uchar, ==, 43);
+  g_assert_cmpint (v_int, ==, 4096);
+  g_assert_cmpint (v_long, ==, 8192);
+  g_assert (v_pointer == NULL);
+  g_assert_cmpfloat (v_double, >, 0.0);
+  g_assert_cmpfloat (v_double, <, 1.0);
+  g_assert_cmpfloat (v_float, >, 5.0);
+  g_assert_cmpfloat (v_float, <, 6.0);
+}
+                        
+static void
+test_generic_marshaller_signal_1 (void)
+{
+  Test *test;
+  test = g_object_new (test_get_type (), NULL);
+
+  g_signal_connect (test, "generic-marshaller-1", G_CALLBACK (on_generic_marshaller_1), NULL);
+
+  g_signal_emit_by_name (test, "generic-marshaller-1", 42, 43, 4096, 8192, NULL, 0.5, 5.5);
+
+  g_object_unref (test);
+}
+
+static void
+on_generic_marshaller_2 (Test *obj,
+                        gint        v_int1,
+                        TestEnum    v_enum,
+                        gint        v_int2,
+                        TestUnsignedEnum v_uenum,
+                        gint        v_int3)
+{
+  g_assert_cmpint (v_int1, ==, 42);
+  g_assert_cmpint (v_enum, ==, TEST_ENUM_BAR);
+  g_assert_cmpint (v_int2, ==, 43);
+  g_assert_cmpint (v_uenum, ==, TEST_UNSIGNED_ENUM_BAR);
+  g_assert_cmpint (v_int3, ==, 44);
+}
+
+static void
+test_generic_marshaller_signal_2 (void)
+{
+  Test *test;
+  test = g_object_new (test_get_type (), NULL);
+
+  g_signal_connect (test, "generic-marshaller-2", G_CALLBACK (on_generic_marshaller_2), NULL);
+
+  g_signal_emit_by_name (test, "generic-marshaller-2", 42, TEST_ENUM_BAR, 43, TEST_UNSIGNED_ENUM_BAR, 44);
+
+  g_object_unref (test);
+}
+
+static TestEnum
+on_generic_marshaller_enum_return_signed_1 (Test *obj)
+{
+  return TEST_ENUM_NEGATIVE;
+}
+
+static TestEnum
+on_generic_marshaller_enum_return_signed_2 (Test *obj)
+{
+  return TEST_ENUM_BAR;
+}
+
+static void
+test_generic_marshaller_signal_enum_return_signed (void)
+{
+  Test *test;
+  guint id;
+  TestEnum retval = 0;
+
+  test = g_object_new (test_get_type (), NULL);
+
+  /* Test return value NEGATIVE */
+  id = g_signal_connect (test,
+                         "generic-marshaller-enum-return-signed",
+                         G_CALLBACK (on_generic_marshaller_enum_return_signed_1),
+                         NULL);
+  g_signal_emit_by_name (test, "generic-marshaller-enum-return-signed", &retval);
+  g_assert_cmpint (retval, ==, TEST_ENUM_NEGATIVE);
+  g_signal_handler_disconnect (test, id);
+
+  /* Test return value BAR */
+  retval = 0;
+  id = g_signal_connect (test,
+                         "generic-marshaller-enum-return-signed",
+                         G_CALLBACK (on_generic_marshaller_enum_return_signed_2),
+                         NULL);
+  g_signal_emit_by_name (test, "generic-marshaller-enum-return-signed", &retval);
+  g_assert_cmpint (retval, ==, TEST_ENUM_BAR);
+  g_signal_handler_disconnect (test, id);
+
+  g_object_unref (test);
+}
+
+static TestUnsignedEnum
+on_generic_marshaller_enum_return_unsigned_1 (Test *obj)
+{
+  return TEST_UNSIGNED_ENUM_FOO;
+}
+
+static TestUnsignedEnum
+on_generic_marshaller_enum_return_unsigned_2 (Test *obj)
+{
+  return TEST_UNSIGNED_ENUM_BAR;
+}
+
+static void
+test_generic_marshaller_signal_enum_return_unsigned (void)
+{
+  Test *test;
+  guint id;
+  TestUnsignedEnum retval = 0;
+
+  test = g_object_new (test_get_type (), NULL);
+
+  /* Test return value FOO */
+  id = g_signal_connect (test,
+                         "generic-marshaller-enum-return-unsigned",
+                         G_CALLBACK (on_generic_marshaller_enum_return_unsigned_1),
+                         NULL);
+  g_signal_emit_by_name (test, "generic-marshaller-enum-return-unsigned", &retval);
+  g_assert_cmpint (retval, ==, TEST_UNSIGNED_ENUM_FOO);
+  g_signal_handler_disconnect (test, id);
+
+  /* Test return value BAR */
+  retval = 0;
+  id = g_signal_connect (test,
+                         "generic-marshaller-enum-return-unsigned",
+                         G_CALLBACK (on_generic_marshaller_enum_return_unsigned_2),
+                         NULL);
+  g_signal_emit_by_name (test, "generic-marshaller-enum-return-unsigned", &retval);
+  g_assert_cmpint (retval, ==, TEST_UNSIGNED_ENUM_BAR);
+  g_signal_handler_disconnect (test, id);
+
+  g_object_unref (test);
+}
+
+/**********************/
+
+static gint
+on_generic_marshaller_int_return_signed_1 (Test *obj)
+{
+  return -30;
+}
+
+static gint
+on_generic_marshaller_int_return_signed_2 (Test *obj)
+{
+  return 2;
+}
+
+static void
+test_generic_marshaller_signal_int_return (void)
+{
+  Test *test;
+  guint id;
+  gint retval = 0;
+
+  test = g_object_new (test_get_type (), NULL);
+
+  /* Test return value -30 */
+  id = g_signal_connect (test,
+                         "generic-marshaller-int-return",
+                         G_CALLBACK (on_generic_marshaller_int_return_signed_1),
+                         NULL);
+  g_signal_emit_by_name (test, "generic-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,
+                         "generic-marshaller-int-return",
+                         G_CALLBACK (on_generic_marshaller_int_return_signed_2),
+                         NULL);
+  g_signal_emit_by_name (test, "generic-marshaller-int-return", &retval);
+  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);
+}
+
+static guint
+on_generic_marshaller_uint_return_1 (Test *obj)
+{
+  return 1;
+}
+
+static guint
+on_generic_marshaller_uint_return_2 (Test *obj)
+{
+  return G_MAXUINT;
+}
+
+static void
+test_generic_marshaller_signal_uint_return (void)
+{
+  Test *test;
+  guint id;
+  guint retval = 0;
+
+  test = g_object_new (test_get_type (), NULL);
+
+  id = g_signal_connect (test,
+                         "generic-marshaller-uint-return",
+                         G_CALLBACK (on_generic_marshaller_uint_return_1),
+                         NULL);
+  g_signal_emit_by_name (test, "generic-marshaller-uint-return", &retval);
+  g_assert_cmpint (retval, ==, 1);
+  g_signal_handler_disconnect (test, id);
+
+  retval = 0;
+  id = g_signal_connect (test,
+                         "generic-marshaller-uint-return",
+                         G_CALLBACK (on_generic_marshaller_uint_return_2),
+                         NULL);
+  g_signal_emit_by_name (test, "generic-marshaller-uint-return", &retval);
+  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);
+}
+
+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);
+}
+
 /* --- */
 
 int
@@ -85,7 +807,15 @@ main (int argc,
 
   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/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);
 
   return g_test_run ();
 }