1 files changed, 237 insertions, 139 deletions

diff --git a/tests/repository/gitypelibtest.c b/tests/repository/gitypelibtest.c
index 7068ef3d..565c95c3 100644
--- a/tests/repository/gitypelibtest.c
+++ b/tests/repository/gitypelibtest.c
@@ -1,5 +1,5 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * vim: tabstop=4 shiftwidth=4 expandtab
+/* -*- Mode: C; c-basic-offset: 2 -*-
+ * vim: shiftwidth=2 expandtab
  */
 
 #include "girepository.h"
@@ -9,191 +9,289 @@
 #include <unistd.h>
 
 static void
-test_enum_and_flags_cidentifier(GIRepository *repo)
+test_enum_and_flags_cidentifier (GIRepository * repo)
 {
-    GITypelib *ret;
-    GError *error = NULL;
-    gint n_infos, i;
+  GITypelib *ret;
+  GError *error = NULL;
+  gint n_infos, i;
 
-    ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error);
-    if (!ret)
-        g_error ("%s", error->message);
+  ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error);
+  if (!ret)
+    g_error ("%s", error->message);
 
-    n_infos = g_irepository_get_n_infos (repo, "GIMarshallingTests");
+  n_infos = g_irepository_get_n_infos (repo, "GIMarshallingTests");
 
-    for (i = 0; i < n_infos; i++) {
-        GIBaseInfo *info;
+  for (i = 0; i < n_infos; i++)
+    {
+      GIBaseInfo *info;
 
-        info = g_irepository_get_info (repo, "GIMarshallingTests", i);
+      info = g_irepository_get_info (repo, "GIMarshallingTests", i);
 
-        /* both GI_INFO_TYPE_ENUM and GI_INFO_TYPE_FLAGS use GIEnumInfo */
-        if (GI_IS_ENUM_INFO (info)) {
-            gint n_values, j;
+      /* both GI_INFO_TYPE_ENUM and GI_INFO_TYPE_FLAGS use GIEnumInfo */
+      if (GI_IS_ENUM_INFO (info))
+        {
+          gint n_values, j;
 
-            n_values = g_enum_info_get_n_values ((GIEnumInfo *) info);
-            for (j = 0; j < n_values; j++) {
-                GIValueInfo *value_info;
-                const gchar *c_identifier = NULL;
+          n_values = g_enum_info_get_n_values ((GIEnumInfo *) info);
+          for (j = 0; j < n_values; j++)
+            {
+              GIValueInfo *value_info;
+              const gchar *c_identifier = NULL;
 
-                value_info = g_enum_info_get_value ((GIEnumInfo *) info, j);
-                c_identifier = g_base_info_get_attribute ((GIBaseInfo *) value_info, "c:identifier");
+              value_info = g_enum_info_get_value ((GIEnumInfo *) info, j);
+              c_identifier = g_base_info_get_attribute ((GIBaseInfo *) value_info, "c:identifier");
 
-                if (c_identifier == NULL) {
-                    g_error ("Error: no 'c:identifier' attribute on GIMarshallingTests.%s.%s\n",
-                             g_base_info_get_name (info),
-                             g_base_info_get_name ((GIBaseInfo *) value_info));
+              if (c_identifier == NULL)
+                {
+                  g_error
+                    ("Error: no 'c:identifier' attribute on GIMarshallingTests.%s.%s\n",
+                     g_base_info_get_name (info), g_base_info_get_name ((GIBaseInfo *) value_info));
                 }
 
-                g_base_info_unref ((GIBaseInfo *) value_info);
+              g_base_info_unref ((GIBaseInfo *) value_info);
             }
         }
 
-        g_base_info_unref (info);
+      g_base_info_unref (info);
     }
 }
 
 static void
-_check_enum_methods (GIBaseInfo *info, const gchar *name, const gchar *prefix)
+_check_enum_methods (GIBaseInfo * info, const gchar * name, const gchar * prefix)
 {
-    gint n_methods, i;
-
-    n_methods = g_enum_info_get_n_methods ((GIEnumInfo *) info);
-    if (n_methods <= 0)
-        g_error ("%s should have methods", name);
-
-    for (i = 0; i < n_methods; i += n_methods-1) {
-        GIBaseInfo *function_info;
-        GIFunctionInfoFlags flags;
-        const gchar *symbol;
-        function_info = g_enum_info_get_method ((GIEnumInfo *) info, i);
-        if (!function_info)
-            g_error ("Could not find %s method nr. %d", name, i+1);
-        flags = g_function_info_get_flags ((GIFunctionInfo *) function_info);
-        if (flags != 0)
-            g_error ("%s methods should be static", name);
-        symbol = g_function_info_get_symbol ((GIFunctionInfo *) function_info);
-        if (!symbol || !g_str_has_prefix (symbol, prefix))
-            g_error ("Could not find valid function symbol");
-        g_base_info_unref (function_info);
+  gint n_methods, i;
+
+  n_methods = g_enum_info_get_n_methods ((GIEnumInfo *) info);
+  if (n_methods <= 0)
+    g_error ("%s should have methods", name);
+
+  for (i = 0; i < n_methods; i += n_methods - 1)
+    {
+      GIBaseInfo *function_info;
+      GIFunctionInfoFlags flags;
+      const gchar *symbol;
+      function_info = g_enum_info_get_method ((GIEnumInfo *) info, i);
+      if (!function_info)
+        g_error ("Could not find %s method nr. %d", name, i + 1);
+      flags = g_function_info_get_flags ((GIFunctionInfo *) function_info);
+      if (flags != 0)
+        g_error ("%s methods should be static", name);
+      symbol = g_function_info_get_symbol ((GIFunctionInfo *) function_info);
+      if (!symbol || !g_str_has_prefix (symbol, prefix))
+        g_error ("Could not find valid function symbol");
+      g_base_info_unref (function_info);
     }
 }
 
 static void
-test_enum_and_flags_static_methods(GIRepository *repo)
+test_enum_and_flags_static_methods (GIRepository * repo)
 {
-    GITypelib *ret;
-    GError *error = NULL;
-    GIBaseInfo *enum_info;
-
-    ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error);
-    if (!ret)
-        g_error ("%s", error->message);
-
-    enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "GEnum");
-    if (!enum_info)
-        g_error ("Could not find GIMarshallingTests.GEnum");
-    _check_enum_methods (enum_info,
-                         "GIMarshallingTests.GEnum",
-                         "gi_marshalling_tests_genum_");
-    g_base_info_unref (enum_info);
-
-    enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "Flags");
-    if (!enum_info)
-        g_error ("Could not find GIMarshallingTests.Flags");
-    _check_enum_methods (enum_info,
-                         "GIMarshallingTests.Flags",
-                         "gi_marshalling_tests_flags_");
-    g_base_info_unref (enum_info);
+  GITypelib *ret;
+  GError *error = NULL;
+  GIBaseInfo *enum_info;
+
+  ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error);
+  if (!ret)
+    g_error ("%s", error->message);
+
+  enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "GEnum");
+  if (!enum_info)
+    g_error ("Could not find GIMarshallingTests.GEnum");
+  _check_enum_methods (enum_info, "GIMarshallingTests.GEnum", "gi_marshalling_tests_genum_");
+  g_base_info_unref (enum_info);
+
+  enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "Flags");
+  if (!enum_info)
+    g_error ("Could not find GIMarshallingTests.Flags");
+  _check_enum_methods (enum_info, "GIMarshallingTests.Flags", "gi_marshalling_tests_flags_");
+  g_base_info_unref (enum_info);
 }
 
 static void
-test_size_of_gvalue(GIRepository *repo)
+test_size_of_gvalue (GIRepository * repo)
 {
-    GIBaseInfo *struct_info;
+  GIBaseInfo *struct_info;
 
-    struct_info = g_irepository_find_by_name (repo, "GObject", "Value");
-    if (!struct_info)
-        g_error ("Could not find GObject.Value");
-    g_assert_cmpuint (g_struct_info_get_size (struct_info), ==, sizeof (GValue));
-    g_base_info_unref (struct_info);
+  struct_info = g_irepository_find_by_name (repo, "GObject", "Value");
+  if (!struct_info)
+    g_error ("Could not find GObject.Value");
+  g_assert_cmpuint (g_struct_info_get_size (struct_info), ==, sizeof (GValue));
+  g_base_info_unref (struct_info);
 }
 
 static void
-test_is_pointer_for_struct_arg (GIRepository *repo)
+test_is_pointer_for_struct_arg (GIRepository * repo)
 {
-    GITypelib *ret;
-    GError *error = NULL;
-    GIStructInfo *variant_info;
-    GIFunctionInfo *equal_info;
-    GIArgInfo *arg_info;
-    GITypeInfo *type_info;
-
-    ret = g_irepository_require (repo, "GLib", NULL, 0, &error);
-    if (!ret)
-        g_error ("%s", error->message);
-
-    variant_info = g_irepository_find_by_name (repo, "GLib", "Variant");
-    if (!variant_info)
-	g_error ("Could not find GLib.Variant");
-
-    equal_info = g_struct_info_find_method (variant_info, "equal");
-    if (!equal_info)
-	g_error ("Could not find GLib.Variant.equal()");
-
-    arg_info = g_callable_info_get_arg (equal_info, 0);
-    if (!arg_info)
-	g_error ("Could not find 1st arg of GLib.Variant.equal()");
-
-    type_info = g_arg_info_get_type (arg_info);
-    if (!type_info)
-	g_error ("Could not find typeinfo of 1st arg of GLib.Variant.equal()");
-
-    g_assert (g_type_info_is_pointer (type_info));
-
-    g_base_info_unref (type_info);
-    g_base_info_unref (arg_info);
-    g_base_info_unref (equal_info);
-    g_base_info_unref (variant_info);
+  GITypelib *ret;
+  GError *error = NULL;
+  GIStructInfo *variant_info;
+  GIFunctionInfo *equal_info;
+  GIArgInfo *arg_info;
+  GITypeInfo *type_info;
+
+  ret = g_irepository_require (repo, "GLib", NULL, 0, &error);
+  if (!ret)
+    g_error ("%s", error->message);
+
+  variant_info = g_irepository_find_by_name (repo, "GLib", "Variant");
+  if (!variant_info)
+    g_error ("Could not find GLib.Variant");
+
+  equal_info = g_struct_info_find_method (variant_info, "equal");
+  if (!equal_info)
+    g_error ("Could not find GLib.Variant.equal()");
+
+  arg_info = g_callable_info_get_arg (equal_info, 0);
+  if (!arg_info)
+    g_error ("Could not find 1st arg of GLib.Variant.equal()");
+
+  type_info = g_arg_info_get_type (arg_info);
+  if (!type_info)
+    g_error ("Could not find typeinfo of 1st arg of GLib.Variant.equal()");
+
+  g_assert (g_type_info_is_pointer (type_info));
+
+  g_base_info_unref (type_info);
+  g_base_info_unref (arg_info);
+  g_base_info_unref (equal_info);
+  g_base_info_unref (variant_info);
 }
 
 static void
-test_fundamental_get_ref_function_pointer (GIRepository *repo)
+test_fundamental_get_ref_function_pointer (GIRepository * repo)
 {
-    GIObjectInfo *info;
+  GIObjectInfo *info;
 
-    g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
-    info = g_irepository_find_by_name (repo, "Regress",
-                                       "TestFundamentalObject");
-    g_object_info_get_ref_function_pointer (info);
-    g_base_info_unref (info);
+  g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
+  info = g_irepository_find_by_name (repo, "Regress", "TestFundamentalObject");
+  g_object_info_get_ref_function_pointer (info);
+  g_base_info_unref (info);
 }
 
 static void
-test_hash_with_cairo_typelib (GIRepository *repo)
+test_hash_with_cairo_typelib (GIRepository * repo)
 {
-    GIBaseInfo *info;
+  GIBaseInfo *info;
 
-    g_assert (g_irepository_require (repo, "cairo", NULL, 0, NULL));
-    info = g_irepository_find_by_name (repo, "cairo", "region");
-    g_assert (info == NULL);
+  g_assert (g_irepository_require (repo, "cairo", NULL, 0, NULL));
+  info = g_irepository_find_by_name (repo, "cairo", "region");
+  g_assert (info == NULL);
 }
 
-int
-main(int argc, char **argv)
+static GIPropertyInfo *
+lookup_property (GIObjectInfo * info, const gchar * name)
+{
+  gssize n_props;
+  gssize i;
+  GIPropertyInfo *property_info;
+
+  n_props = g_object_info_get_n_properties (info);
+  for (i = 0; i < n_props; i++)
+    {
+      property_info = g_object_info_get_property (info, i);
+      if (strcmp (name, g_base_info_get_name (property_info)) == 0)
+        return property_info;
+      g_base_info_unref (property_info);
+    }
+
+  return NULL;
+}
+
+static void
+test_char_types (GIRepository * repo)
 {
-    GIRepository *repo;
+  GITypelib *ret;
+  GError *error = NULL;
+  GIBaseInfo *prop_obj;
+  GIPropertyInfo *prop_info;
+  GITypeInfo *type_info;
+
+  ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error);
+  if (!ret)
+    g_error ("%s", error->message);
+
+  prop_obj = g_irepository_find_by_name (repo, "GIMarshallingTests", "PropertiesObject");
+  g_assert (prop_obj != NULL);
+  g_assert (GI_IS_OBJECT_INFO (prop_obj));
+
+  /* unsigned char */
+  prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-uchar");
+  g_assert (prop_info != NULL);
+  type_info = g_property_info_get_type (prop_info);
+  g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_UINT8);
+  g_base_info_unref (type_info);
+  g_base_info_unref (prop_info);
+
+  /* signed char */
+  prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-char");
+  g_assert (prop_info != NULL);
+  type_info = g_property_info_get_type (prop_info);
+  g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_INT8);
+  g_base_info_unref (type_info);
+  g_base_info_unref (prop_info);
+
+  g_base_info_unref (prop_obj);
+}
 
-    g_type_init ();
+static void
+test_signal_array_len (GIRepository * repo)
+{
+  GIObjectInfo *testobj_info;
+  GISignalInfo *sig_info;
+  GIArgInfo arg_info;
+  GITypeInfo type_info;
+  int i;
+
+  g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
+  testobj_info = g_irepository_find_by_name (repo, "Regress", "TestObj");
+  g_assert (testobj_info != NULL);
+
+  /* find sig-with-array-len-prop signal */
+  for (i = g_object_info_get_n_signals (testobj_info) - 1; i >= 0; --i)
+    {
+      sig_info = g_object_info_get_signal (testobj_info, i);
+      g_assert (sig_info != NULL);
+      if (strcmp (g_base_info_get_name (sig_info), "sig-with-array-len-prop") == 0)
+        break;
+      g_base_info_unref (sig_info);
+    }
+  g_assert (i >= 0);
+
+  g_assert_cmpint (g_callable_info_get_n_args (sig_info), ==, 2);
+
+  /* verify array argument */
+  g_callable_info_load_arg (sig_info, 0, &arg_info);
+  g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "arr");
+  g_arg_info_load_type (&arg_info, &type_info);
+  g_assert_cmpint (g_type_info_get_tag (&type_info), ==, GI_TYPE_TAG_ARRAY);
+  g_assert_cmpint (g_type_info_get_array_type (&type_info), ==, GI_ARRAY_TYPE_C);
+  g_assert (!g_type_info_is_zero_terminated (&type_info));
+  g_assert_cmpint (g_type_info_get_array_length (&type_info), ==, 1);
+
+  /* verify array length argument */
+  g_callable_info_load_arg (sig_info, 1, &arg_info);
+  g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "len");
+
+  g_base_info_unref (sig_info);
+  g_base_info_unref (testobj_info);
+}
+
+int
+main (int argc, char **argv)
+{
+  GIRepository *repo;
 
-    repo = g_irepository_get_default ();
+  repo = g_irepository_get_default ();
 
-    /* do tests */
-    test_enum_and_flags_cidentifier (repo);
-    test_enum_and_flags_static_methods (repo);
-    test_size_of_gvalue (repo);
-    test_is_pointer_for_struct_arg (repo);
-    test_fundamental_get_ref_function_pointer (repo);
-    test_hash_with_cairo_typelib (repo);
+  /* do tests */
+  test_enum_and_flags_cidentifier (repo);
+  test_enum_and_flags_static_methods (repo);
+  test_size_of_gvalue (repo);
+  test_is_pointer_for_struct_arg (repo);
+  test_fundamental_get_ref_function_pointer (repo);
+  test_hash_with_cairo_typelib (repo);
+  test_char_types (repo);
+  test_signal_array_len (repo);
 
-    exit(0);
+  exit (0);
 }