mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-04 07:07:59 +02:00
0ccef79d7e
* test/glib/test-service-glib.xml:
* test/glib/test-service-glib.c:
* test/glib/test-dbus-glib.c: Test a{sv}.
* glib/examples/statemachine/statemachine.c:
* glib/examples/statemachine/statemachine-server.c:
* glib/examples/statemachine/statemachine-client.c: Fix some bugs,
add progress bar, etc.
* glib/dbus-gvalue.c (register_array, register_dict): Delete; not
needed anymore due to generic array/map marshalling.
(dbus_g_value_types_init): Don't register basic arrays or the
string/string hash.
(dbus_gtype_from_signature_iter): Don't try to recurse into
variants.
(dbus_gtype_to_signature): Check collection/map before type
metadata.
(demarshal_garray_basic): Renamed to demarshal_collection_array.
(demarshal_ghashtable): Renamed to demarshal_map; fix to use new
generic map creation/append functions instead of hash table
specifically.
(get_type_demarshaller): Handle maps.
(demarshal_collection): Dispatch on collection type to either
demarshal_collection_ptrarray or demarshal_collection_array.
(get_type_marshaller): Handle maps.
(marshal_collection): Dispatch collection type to either
marshal_collection_ptrarray or marshal_collection_array.
(_dbus_gvalue_test): New test.
* glib/dbus-gvalue-utils.c (unset_and_free_g_value): New function.
(hash_free_from_gtype): Use it to free GValues.
(hashtable_append): New function.
(ptrarray_append): Fix prototype.
(slist_append): Ditto.
(_dbus_gvalue_utils_test): Extend tests.
* glib/dbus-gtype-specialized.c
(dbus_g_type_specialized_init_append): Renamed from
dbus_g_type_specialized_collection_init_append. Remove const from
value, since we steal it.
(dbus_g_type_specialized_map_append): New function.
* glib/dbus-gtype-specialized.h: Update prototypes.
Add DBusGTypeSpecializedMapAppendFunc.
* glib/dbus-gtest.c (dbus_glib_internal_do_not_use_run_tests): Run
_dbus_gvalue_test.
* glib/dbus-gtest.h: Prototype it.
92 lines
2.6 KiB
C
92 lines
2.6 KiB
C
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
/* dbus-test.c Program to run all tests
|
|
*
|
|
* Copyright (C) 2002, 2003 Red Hat Inc.
|
|
*
|
|
* Licensed under the Academic Free License version 2.1
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include "dbus-gtest.h"
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <glib.h>
|
|
|
|
#ifdef DBUS_BUILD_TESTS
|
|
static void
|
|
die (const char *failure)
|
|
{
|
|
fprintf (stderr, "Unit test failed: %s\n", failure);
|
|
exit (1);
|
|
}
|
|
#endif /* DBUS_BUILD_TESTS */
|
|
|
|
/**
|
|
* An exported symbol to be run in order to execute
|
|
* unit tests. Should not be used by
|
|
* any app other than our test app, this symbol
|
|
* won't exist in some builds of the library.
|
|
* (with --enable-tests=no)
|
|
*
|
|
* @param test_data_dir the directory with test data (test/data normally)
|
|
*/
|
|
void
|
|
dbus_glib_internal_do_not_use_run_tests (const char *test_data_dir)
|
|
{
|
|
#ifdef DBUS_BUILD_TESTS
|
|
if (test_data_dir == NULL)
|
|
test_data_dir = g_getenv ("DBUS_TEST_DATA");
|
|
|
|
if (test_data_dir != NULL)
|
|
printf ("Test data in %s\n", test_data_dir);
|
|
else
|
|
printf ("No test data!\n");
|
|
|
|
g_type_init ();
|
|
|
|
printf ("%s: running GValue util tests\n", "dbus-glib-test");
|
|
if (!_dbus_gvalue_utils_test (test_data_dir))
|
|
die ("gvalue utils");
|
|
|
|
printf ("%s: running GValue tests\n", "dbus-glib-test");
|
|
if (!_dbus_gvalue_test (test_data_dir))
|
|
die ("gvalue utils");
|
|
|
|
printf ("%s: running glib tests\n", "dbus-glib-test");
|
|
if (!_dbus_glib_test (test_data_dir))
|
|
die ("glib");
|
|
|
|
printf ("%s: running utils tests\n", "dbus-glib-test");
|
|
if (!_dbus_gutils_test (test_data_dir))
|
|
die ("gutils");
|
|
|
|
printf ("%s: running mainloop integration tests\n", "dbus-glib-test");
|
|
if (!_dbus_gmain_test (test_data_dir))
|
|
die ("gmain");
|
|
|
|
printf ("%s: running GObject tests\n", "dbus-glib-test");
|
|
if (!_dbus_gobject_test (test_data_dir))
|
|
die ("gobject");
|
|
|
|
printf ("%s: completed successfully\n", "dbus-glib-test");
|
|
#else
|
|
printf ("Not compiled with unit tests, not running any\n");
|
|
#endif
|
|
}
|
|
|
|
|