[glib: 1/2] Merge tests/gobject/gvalue-test.c with gobject/tests/value.c

[Philip Withnall <pwithnall src gnome org>]

commit 86fedcfb93587a89010721dd1173f1802235d392
Author: Emmanuel Fleury <emmanuel fleury gmail com>
Date:   Wed Jan 12 16:20:11 2022 +0100

    Merge tests/gobject/gvalue-test.c with gobject/tests/value.c
    
    Helps issue #1434

 gobject/tests/value.c       | 386 +++++++++++++++++++++++++++++++++++++++++-
 tests/gobject/gvalue-test.c | 398 --------------------------------------------
 tests/gobject/meson.build   |   1 -
 3 files changed, 385 insertions(+), 400 deletions(-)
---
diff --git a/gobject/tests/value.c b/gobject/tests/value.c
index 2e7bdb06e..3c7e88137 100644
--- a/gobject/tests/value.c
+++ b/gobject/tests/value.c
@@ -1,5 +1,385 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GLib Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
 #define GLIB_VERSION_MIN_REQUIRED       GLIB_VERSION_2_30
+
+#include <glib.h>
 #include <glib-object.h>
+#include "gobject/gvaluecollector.h"
+
+static void
+test_enum_transformation (void)
+{
+  GType type;
+  GValue orig = G_VALUE_INIT;
+  GValue xform = G_VALUE_INIT;
+  GEnumValue values[] = { {0,"0","0"}, {1,"1","1"}};
+
+ type = g_enum_register_static ("TestEnum", values);
+
+ g_value_init (&orig, type);
+ g_value_set_enum (&orig, 1);
+
+ memset (&xform, 0, sizeof (GValue));
+ g_value_init (&xform, G_TYPE_CHAR);
+ g_value_transform (&orig, &xform);
+ g_assert_cmpint (g_value_get_char (&xform), ==, 1);
+ g_assert_cmpint (g_value_get_schar (&xform), ==, 1);
+
+ memset (&xform, 0, sizeof (GValue));
+ g_value_init (&xform, G_TYPE_UCHAR);
+ g_value_transform (&orig, &xform);
+ g_assert_cmpint (g_value_get_uchar (&xform), ==, 1);
+
+ memset (&xform, 0, sizeof (GValue));
+ g_value_init (&xform, G_TYPE_INT);
+ g_value_transform (&orig, &xform);
+ g_assert_cmpint (g_value_get_int (&xform), ==, 1);
+
+ memset (&xform, 0, sizeof (GValue));
+ g_value_init (&xform, G_TYPE_UINT);
+ g_value_transform (&orig, &xform);
+ g_assert_cmpint (g_value_get_uint (&xform), ==, 1);
+
+ memset (&xform, 0, sizeof (GValue));
+ g_value_init (&xform, G_TYPE_LONG);
+ g_value_transform (&orig, &xform);
+ g_assert_cmpint (g_value_get_long (&xform), ==, 1);
+
+ memset (&xform, 0, sizeof (GValue));
+ g_value_init (&xform, G_TYPE_ULONG);
+ g_value_transform (&orig, &xform);
+ g_assert_cmpint (g_value_get_ulong (&xform), ==, 1);
+
+ memset (&xform, 0, sizeof (GValue));
+ g_value_init (&xform, G_TYPE_INT64);
+ g_value_transform (&orig, &xform);
+ g_assert_cmpint (g_value_get_int64 (&xform), ==, 1);
+
+ memset (&xform, 0, sizeof (GValue));
+ g_value_init (&xform, G_TYPE_UINT64);
+ g_value_transform (&orig, &xform);
+ g_assert_cmpint (g_value_get_uint64 (&xform), ==, 1);
+}
+
+
+static void
+test_gtype_value (void)
+{
+  GType type;
+  GValue value = G_VALUE_INIT;
+  GValue copy = G_VALUE_INIT;
+
+  g_value_init (&value, G_TYPE_GTYPE);
+
+  g_value_set_gtype (&value, G_TYPE_BOXED);
+  type = g_value_get_gtype (&value);
+  g_assert_true (type == G_TYPE_BOXED);
+
+  g_value_init (&copy, G_TYPE_GTYPE);
+  g_value_copy (&value, &copy);
+  type = g_value_get_gtype (&copy);
+  g_assert_true (type == G_TYPE_BOXED);
+}
+
+static gchar *
+collect (GValue *value, ...)
+{
+  gchar *error;
+  va_list var_args;
+
+  error = NULL;
+
+  va_start (var_args, value);
+  G_VALUE_COLLECT (value, var_args, 0, &error);
+  va_end (var_args);
+
+  return error;
+}
+
+static gchar *
+lcopy (GValue *value, ...)
+{
+  gchar *error;
+  va_list var_args;
+
+  error = NULL;
+
+  va_start (var_args, value);
+  G_VALUE_LCOPY (value, var_args, 0, &error);
+  va_end (var_args);
+
+  return error;
+}
+
+static void
+test_collection (void)
+{
+  GValue value = G_VALUE_INIT;
+  gchar *error;
+
+  g_value_init (&value, G_TYPE_CHAR);
+  error = collect (&value, 'c');
+  g_assert_null (error);
+  g_assert_cmpint (g_value_get_char (&value), ==, 'c');
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_UCHAR);
+  error = collect (&value, 129);
+  g_assert_null (error);
+  g_assert_cmpint (g_value_get_uchar (&value), ==, 129);
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_BOOLEAN);
+  error = collect (&value, TRUE);
+  g_assert_null (error);
+  g_assert_cmpint (g_value_get_boolean (&value), ==, TRUE);
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_INT);
+  error = collect (&value, G_MAXINT);
+  g_assert_null (error);
+  g_assert_cmpint (g_value_get_int (&value), ==, G_MAXINT);
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_UINT);
+  error = collect (&value, G_MAXUINT);
+  g_assert_null (error);
+  g_assert_cmpuint (g_value_get_uint (&value), ==, G_MAXUINT);
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_LONG);
+  error = collect (&value, G_MAXLONG);
+  g_assert_null (error);
+  g_assert_cmpint (g_value_get_long (&value), ==, G_MAXLONG);
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_ULONG);
+  error = collect (&value, G_MAXULONG);
+  g_assert_null (error);
+  g_assert_cmpuint (g_value_get_ulong (&value), ==, G_MAXULONG);
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_INT64);
+  error = collect (&value, G_MAXINT64);
+  g_assert_null (error);
+  g_assert_cmpint (g_value_get_int64 (&value), ==, G_MAXINT64);
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_UINT64);
+  error = collect (&value, G_MAXUINT64);
+  g_assert_null (error);
+  g_assert_cmpuint (g_value_get_uint64 (&value), ==, G_MAXUINT64);
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_FLOAT);
+  error = collect (&value, G_MAXFLOAT);
+  g_assert_null (error);
+  g_assert_cmpfloat (g_value_get_float (&value), ==, G_MAXFLOAT);
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_DOUBLE);
+  error = collect (&value, G_MAXDOUBLE);
+  g_assert_null (error);
+  g_assert_cmpfloat (g_value_get_double (&value), ==, G_MAXDOUBLE);
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_STRING);
+  error = collect (&value, "string ?");
+  g_assert_null (error);
+  g_assert_cmpstr (g_value_get_string (&value), ==, "string ?");
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_GTYPE);
+  error = collect (&value, G_TYPE_BOXED);
+  g_assert_null (error);
+  g_assert_true (g_value_get_gtype (&value) == G_TYPE_BOXED);
+
+  g_value_unset (&value);
+  g_value_init (&value, G_TYPE_VARIANT);
+  error = collect (&value, g_variant_new_uint32 (42));
+  g_assert_null (error);
+  g_assert_true (g_variant_is_of_type (g_value_get_variant (&value),
+                                       G_VARIANT_TYPE ("u")));
+  g_assert_cmpuint (g_variant_get_uint32 (g_value_get_variant (&value)), ==, 42);
+
+  g_value_unset (&value);
+}
+
+static void
+test_copying (void)
+{
+  GValue value = G_VALUE_INIT;
+  gchar *error;
+
+  {
+    gchar c = 0;
+
+    g_value_init (&value, G_TYPE_CHAR);
+    g_value_set_char (&value, 'c');
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert_cmpint (c, ==, 'c');
+  }
+
+  {
+    guchar c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_UCHAR);
+    g_value_set_uchar (&value, 129);
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert_cmpint (c, ==, 129);
+  }
+
+  {
+    gint c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_INT);
+    g_value_set_int (&value, G_MAXINT);
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert_cmpint (c, ==, G_MAXINT);
+  }
+
+  {
+    guint c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_UINT);
+    g_value_set_uint (&value, G_MAXUINT);
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert_cmpuint (c, ==, G_MAXUINT);
+  }
+
+  {
+    glong c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_LONG);
+    g_value_set_long (&value, G_MAXLONG);
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert (c == G_MAXLONG);
+  }
+
+  {
+    gulong c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_ULONG);
+    g_value_set_ulong (&value, G_MAXULONG);
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert (c == G_MAXULONG);
+  }
+
+  {
+    gint64 c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_INT64);
+    g_value_set_int64 (&value, G_MAXINT64);
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert (c == G_MAXINT64);
+  }
+
+  {
+    guint64 c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_UINT64);
+    g_value_set_uint64 (&value, G_MAXUINT64);
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert (c == G_MAXUINT64);
+  }
+
+  {
+    gfloat c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_FLOAT);
+    g_value_set_float (&value, G_MAXFLOAT);
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert (c == G_MAXFLOAT);
+  }
+
+  {
+    gdouble c = 0;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_DOUBLE);
+    g_value_set_double (&value, G_MAXDOUBLE);
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert (c == G_MAXDOUBLE);
+  }
+
+  {
+    gchar *c = NULL;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_STRING);
+    g_value_set_string (&value, "string ?");
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert_cmpstr (c, ==, "string ?");
+    g_free (c);
+  }
+
+  {
+    GType c = G_TYPE_NONE;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_GTYPE);
+    g_value_set_gtype (&value, G_TYPE_BOXED);
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert_true (c == G_TYPE_BOXED);
+  }
+
+  {
+    GVariant *c = NULL;
+
+    g_value_unset (&value);
+    g_value_init (&value, G_TYPE_VARIANT);
+    g_value_set_variant (&value, g_variant_new_uint32 (42));
+    error = lcopy (&value, &c);
+    g_assert_null (error);
+    g_assert_nonnull (c);
+    g_assert (g_variant_is_of_type (c, G_VARIANT_TYPE ("u")));
+    g_assert_cmpuint (g_variant_get_uint32 (c), ==, 42);
+    g_variant_unref (c);
+    g_value_unset (&value);
+  }
+}
 
 static void
 test_value_basic (void)
@@ -360,8 +740,12 @@ main (int argc, char *argv[])
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/value/basic", test_value_basic);
-  g_test_add_func ("/value/string", test_value_string);
   g_test_add_func ("/value/array/basic", test_valuearray_basic);
+  g_test_add_func ("/value/collection", test_collection);
+  g_test_add_func ("/value/copying", test_copying);
+  g_test_add_func ("/value/enum-transformation", test_enum_transformation);
+  g_test_add_func ("/value/gtype", test_gtype_value);
+  g_test_add_func ("/value/string", test_value_string);
   g_test_add_func ("/value/transform-object", test_value_transform_object);
 
   return g_test_run ();
diff --git a/tests/gobject/meson.build b/tests/gobject/meson.build
index 24ceda0d3..f39e3d788 100644
--- a/tests/gobject/meson.build
+++ b/tests/gobject/meson.build
@@ -27,7 +27,6 @@ testmarshal_c = custom_target('testmarshal_c',
 )
 
 gobject_tests = {
-  'gvalue-test' : {'tap' : true},
   'paramspec-test' : {'tap' : true},
   'deftype' : {},
   'defaultiface' : {