fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-04 20:00:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Move marshalling tests into test/

Browse source 
dbus-marshal-recursive-util.c contains utility functions used by the
other two, as well as tests. The others are purely test code.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2018-09-28 16:36:49 +01:00
parent 5424eb2b0d
commit 8ead2011ac
12 changed files with 88 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmake/dbus/CMakeLists.txt
View file

@ -153,9 +153,6 @@ set (DBUS_SHARED_HEADERS
set (DBUS_UTIL_SOURCES
${DBUS_DIR}/dbus-asv-util.c
${DBUS_DIR}/dbus-mainloop.c
${DBUS_DIR}/dbus-marshal-byteswap-util.c
${DBUS_DIR}/dbus-marshal-recursive-util.c
${DBUS_DIR}/dbus-marshal-validate-util.c
${DBUS_DIR}/dbus-message-util.c
${DBUS_DIR}/dbus-shell.c
${DBUS_DIR}/dbus-pollable-set.c

13
cmake/test/CMakeLists.txt
View file

@ -96,10 +96,15 @@ if(DBUS_ENABLE_EMBEDDED_TESTS)
add_test_executable(test-hash ${TEST_DIR}/internals/hash.c dbus-testutils)
set_target_properties(test-hash PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
add_test_executable(test-marshal-recursive ${TEST_DIR}/internals/marshal-recursive.c dbus-testutils)
set(SOURCES ${TEST_DIR}/internals/dbus-marshal-recursive-util.c
${TEST_DIR}/internals/dbus-marshal-recursive-util.h
${TEST_DIR}/internals/marshal-recursive.c)
add_test_executable(test-marshal-recursive "${SOURCES}" dbus-testutils)
set_target_properties(test-marshal-recursive PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
set(SOURCES ${TEST_DIR}/internals/dbus-message-factory.c
set(SOURCES ${TEST_DIR}/internals/dbus-marshal-recursive-util.c
${TEST_DIR}/internals/dbus-marshal-recursive-util.h
${TEST_DIR}/internals/dbus-message-factory.c
${TEST_DIR}/internals/dbus-message-factory.h
${TEST_DIR}/internals/dbus-message-util.c
${TEST_DIR}/internals/dbus-message-util.h
@ -111,6 +116,10 @@ if(DBUS_ENABLE_EMBEDDED_TESTS)
${TEST_DIR}/internals/dbus-auth-script.h
${TEST_DIR}/internals/dbus-auth-util.c
${TEST_DIR}/internals/dbus-credentials-util.c
${TEST_DIR}/internals/dbus-marshal-byteswap-util.c
${TEST_DIR}/internals/dbus-marshal-recursive-util.c
${TEST_DIR}/internals/dbus-marshal-recursive-util.h
${TEST_DIR}/internals/dbus-marshal-validate-util.c
${TEST_DIR}/internals/misc-internals.c
${TEST_DIR}/internals/misc-internals.h)
add_test_executable(test-misc-internals "${SOURCES}" dbus-testutils)

3
dbus/Makefile.am
View file

@ -247,9 +247,6 @@ DBUS_UTIL_SOURCES= \
dbus-asv-util.h \
dbus-mainloop.c \
dbus-mainloop.h \
dbus-marshal-byteswap-util.c \
dbus-marshal-recursive-util.c \
dbus-marshal-validate-util.c \
dbus-message-util.c \
dbus-shell.c \
dbus-shell.h \

9
dbus/dbus-test.h
View file

@ -43,10 +43,6 @@ dbus_bool_t _dbus_list_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_marshal_test (const char *test_data_dir);
dbus_bool_t _dbus_marshal_recursive_test (const char *test_data_dir);
dbus_bool_t _dbus_marshal_byteswap_test (const char *test_data_dir);
dbus_bool_t _dbus_marshal_validate_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_misc_test (const char *test_data_dir);
@ -87,9 +83,4 @@ dbus_bool_t _dbus_memory_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_object_tree_test (const char *test_data_dir);
dbus_bool_t _dbus_test_generate_bodies (int sequence,
int byte_order,
DBusString *signature,
DBusString *body);
#endif /* DBUS_TEST_H */

12
test/Makefile.am
View file

@ -203,10 +203,16 @@ test_bus_dispatch_sha1_LDADD = \
test_hash_SOURCES = internals/hash.c
test_hash_LDADD = libdbus-testutils.la
test_marshal_recursive_SOURCES = internals/marshal-recursive.c
test_marshal_recursive_SOURCES = \
internals/dbus-marshal-recursive-util.c \
internals/dbus-marshal-recursive-util.h \
internals/marshal-recursive.c \
$(NULL)
test_marshal_recursive_LDADD = libdbus-testutils.la
test_message_internals_SOURCES = \
internals/dbus-marshal-recursive-util.c \
internals/dbus-marshal-recursive-util.h \
internals/dbus-message-factory.c \
internals/dbus-message-factory.h \
internals/dbus-message-util.c \
@ -220,6 +226,10 @@ test_misc_internals_SOURCES = \
internals/dbus-auth-script.h \
internals/dbus-auth-util.c \
internals/dbus-credentials-util.c \
internals/dbus-marshal-byteswap-util.c \
internals/dbus-marshal-recursive-util.c \
internals/dbus-marshal-recursive-util.h \
internals/dbus-marshal-validate-util.c \
internals/misc-internals.c \
internals/misc-internals.h \
$(NULL)

8
dbus/dbus-marshal-byteswap-util.c → test/internals/dbus-marshal-byteswap-util.c
View file

@ -23,12 +23,16 @@
#include <config.h>
#include "misc-internals.h"
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-marshal-byteswap.h"
#include "dbus-test.h"
#include "dbus/dbus-marshal-byteswap.h"
#include "dbus/dbus-test.h"
#include <dbus/dbus-test-tap.h>
#include <stdio.h>
#include "dbus-marshal-recursive-util.h"
static void
do_byteswap_test (int byte_order)
{

14
dbus/dbus-marshal-recursive-util.c → test/internals/dbus-marshal-recursive-util.c
View file

@ -23,12 +23,14 @@
#include <config.h>
#include "dbus-marshal-recursive-util.h"
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-marshal-recursive.h"
#include "dbus-marshal-basic.h"
#include "dbus-signature.h"
#include "dbus-internals.h"
#include "dbus/dbus-marshal-recursive.h"
#include "dbus/dbus-marshal-basic.h"
#include "dbus/dbus-signature.h"
#include "dbus/dbus-internals.h"
#include <dbus/dbus-test-tap.h>
#include <string.h>
@ -124,8 +126,8 @@ _dbus_type_reader_equal_values (const DBusTypeReader *lhs,
#ifndef DOXYGEN_SHOULD_SKIP_THIS
#include "dbus-test.h"
#include "dbus-list.h"
#include "dbus/dbus-test.h"
#include "dbus/dbus-list.h"
#include <stdio.h>
#include <stdlib.h>

36
test/internals/dbus-marshal-recursive-util.h Normal file
View file

@ -0,0 +1,36 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* dbus-marshal-recursive-util.c Would be in dbus-marshal-recursive.c, but only used in bus/tests
*
* Copyright (C) 2004, 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#ifndef TEST_INTERNALS_DBUS_MARSHAL_RECURSIVE_UTIL_H
#define TEST_INTERNALS_DBUS_MARSHAL_RECURSIVE_UTIL_H
#include <dbus/dbus-string.h>
#include <dbus/dbus-types.h>
dbus_bool_t _dbus_marshal_recursive_test (const char *test_data_dir);
dbus_bool_t _dbus_test_generate_bodies (int sequence,
int byte_order,
DBusString *signature,
DBusString *body);
#endif

14
dbus/dbus-marshal-validate-util.c → test/internals/dbus-marshal-validate-util.c
View file

@ -22,16 +22,22 @@
*/
#include <config.h>
#include "misc-internals.h"
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#ifndef DOXYGEN_SHOULD_SKIP_THIS
#include "dbus-internals.h"
#include "dbus-marshal-validate.h"
#include "dbus-marshal-recursive.h"
#include "dbus/dbus-internals.h"
#include "dbus/dbus-marshal-validate.h"
#include "dbus/dbus-marshal-recursive.h"
#include <dbus/dbus-test-tap.h>
#include "dbus-test.h"
#include "dbus/dbus-test.h"
#include "dbus-marshal-recursive-util.h"
#include <stdio.h>
typedef struct

2
test/internals/dbus-message-factory.c
View file

@ -32,6 +32,8 @@
#include "dbus/dbus-test.h"
#include "dbus/dbus-test-tap.h"
#include "dbus-marshal-recursive-util.h"
#include <stdio.h>
typedef enum

2
test/internals/marshal-recursive.c
View file

@ -27,6 +27,8 @@
#include "dbus/dbus-test.h"
#include "test/test-utils.h"
#include "dbus-marshal-recursive-util.h"
static DBusTestCase test = { "marshal-recursive", _dbus_marshal_recursive_test };
int

2
test/internals/misc-internals.h
View file

@ -28,5 +28,7 @@
dbus_bool_t _dbus_auth_test (const char *test_data_dir);
dbus_bool_t _dbus_credentials_test (const char *test_data_dir);
dbus_bool_t _dbus_marshal_byteswap_test (const char *test_data_dir);
dbus_bool_t _dbus_marshal_validate_test (const char *test_data_dir);
#endif