Commit ac5cdd28 authored by Simon McVittie's avatar Simon McVittie

Merge branch 'break-out-more-tests' into 'master'

Break out more tests from libdbus

See merge request !121
parents f73b40b8 95db6470
Pipeline #46374 passed with stage
in 8 minutes and 27 seconds
......@@ -2,7 +2,9 @@
/* dbus-address.c Server address parser.
*
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2004,2005 Red Hat, Inc.
* Copyright (C) 2004-2007 Red Hat, Inc.
* Copyright (C) 2007 Ralf Habacker
* Copyright (C) 2013 Chengwei Yang / Intel
*
* Licensed under the Academic Free License version 2.1
*
......@@ -648,182 +650,3 @@ dbus_address_unescape_value (const char *value,
}
/** @} */ /* End of public API */
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#ifndef DOXYGEN_SHOULD_SKIP_THIS
#include "dbus-test.h"
#include <stdlib.h>
typedef struct
{
const char *escaped;
const char *unescaped;
} EscapeTest;
static const EscapeTest escape_tests[] = {
{ "abcde", "abcde" },
{ "", "" },
{ "%20%20", " " },
{ "%24", "$" },
{ "%25", "%" },
{ "abc%24", "abc$" },
{ "%24abc", "$abc" },
{ "abc%24abc", "abc$abc" },
{ "/", "/" },
{ "-", "-" },
{ "_", "_" },
{ "A", "A" },
{ "I", "I" },
{ "Z", "Z" },
{ "a", "a" },
{ "i", "i" },
{ "z", "z" },
/* Bug: https://bugs.freedesktop.org/show_bug.cgi?id=53499 */
{ "%c3%b6", "\xc3\xb6" }
};
static const char* invalid_escaped_values[] = {
"%a",
"%q",
"%az",
"%%",
"%$$",
"abc%a",
"%axyz",
"%",
"$",
" ",
};
dbus_bool_t
_dbus_address_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
{
DBusAddressEntry **entries;
int len;
DBusError error = DBUS_ERROR_INIT;
int i;
i = 0;
while (i < _DBUS_N_ELEMENTS (escape_tests))
{
const EscapeTest *test = &escape_tests[i];
char *escaped;
char *unescaped;
escaped = dbus_address_escape_value (test->unescaped);
if (escaped == NULL)
_dbus_test_fatal ("oom");
if (strcmp (escaped, test->escaped) != 0)
{
_dbus_warn ("Escaped '%s' as '%s' should have been '%s'",
test->unescaped, escaped, test->escaped);
exit (1);
}
dbus_free (escaped);
unescaped = dbus_address_unescape_value (test->escaped, &error);
if (unescaped == NULL)
{
_dbus_warn ("Failed to unescape '%s': %s",
test->escaped, error.message);
dbus_error_free (&error);
exit (1);
}
if (strcmp (unescaped, test->unescaped) != 0)
{
_dbus_warn ("Unescaped '%s' as '%s' should have been '%s'",
test->escaped, unescaped, test->unescaped);
exit (1);
}
dbus_free (unescaped);
++i;
}
i = 0;
while (i < _DBUS_N_ELEMENTS (invalid_escaped_values))
{
char *unescaped;
unescaped = dbus_address_unescape_value (invalid_escaped_values[i],
&error);
if (unescaped != NULL)
{
_dbus_warn ("Should not have successfully unescaped '%s' to '%s'",
invalid_escaped_values[i], unescaped);
dbus_free (unescaped);
exit (1);
}
_dbus_assert (dbus_error_is_set (&error));
dbus_error_free (&error);
++i;
}
if (!dbus_parse_address ("unix:path=/tmp/foo;debug:name=test,sliff=sloff;",
&entries, &len, &error))
_dbus_test_fatal ("could not parse address");
_dbus_assert (len == 2);
_dbus_assert (strcmp (dbus_address_entry_get_value (entries[0], "path"), "/tmp/foo") == 0);
_dbus_assert (strcmp (dbus_address_entry_get_value (entries[1], "name"), "test") == 0);
_dbus_assert (strcmp (dbus_address_entry_get_value (entries[1], "sliff"), "sloff") == 0);
dbus_address_entries_free (entries);
/* Different possible errors */
if (dbus_parse_address ("", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:bar", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:bar,baz", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:bar=foo,baz", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:bar=foo;baz", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:=foo", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:foo=", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:foo,bar=baz", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
return TRUE;
}
#endif /* !DOXYGEN_SHOULD_SKIP_THIS */
#endif
......@@ -136,8 +136,7 @@ void _dbus_connection_get_stats (DBusConnection *connection,
dbus_uint32_t *out_peak_fds);
/* if DBUS_ENABLE_EMBEDDED_TESTS */
DBUS_PRIVATE_EXPORT
DBUS_EMBEDDED_TESTS_EXPORT
const char* _dbus_connection_get_address (DBusConnection *connection);
/* This _dbus_bus_* stuff doesn't really belong here, but dbus-bus-internal.h seems
......
......@@ -35,6 +35,12 @@
DBUS_BEGIN_DECLS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#define DBUS_EMBEDDED_TESTS_EXPORT DBUS_PRIVATE_EXPORT
#else
#define DBUS_EMBEDDED_TESTS_EXPORT /* nothing */
#endif
DBUS_PRIVATE_EXPORT
void _dbus_warn (const char *format,
...) _DBUS_GNUC_PRINTF (1, 2);
......
......@@ -2,6 +2,8 @@
/* dbus-mempool.h Memory pools
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2011-2012 Collabora Ltd.
*
* Licensed under the Academic Free License version 2.1
*
......@@ -448,200 +450,3 @@ _dbus_mem_pool_get_stats (DBusMemPool *pool,
#endif /* DBUS_ENABLE_STATS */
/** @} */
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <stdio.h>
#include <time.h>
static void
time_for_size (int size)
{
int i;
int j;
#ifdef DBUS_ENABLE_VERBOSE_MODE
clock_t start;
clock_t end;
#endif
#define FREE_ARRAY_SIZE 512
#define N_ITERATIONS FREE_ARRAY_SIZE * 512
void *to_free[FREE_ARRAY_SIZE];
DBusMemPool *pool;
_dbus_verbose ("Timings for size %d\n", size);
_dbus_verbose (" malloc\n");
#ifdef DBUS_ENABLE_VERBOSE_MODE
start = clock ();
#endif
i = 0;
j = 0;
while (i < N_ITERATIONS)
{
to_free[j] = dbus_malloc (size);
_dbus_assert (to_free[j] != NULL); /* in a real app of course this is wrong */
++j;
if (j == FREE_ARRAY_SIZE)
{
j = 0;
while (j < FREE_ARRAY_SIZE)
{
dbus_free (to_free[j]);
++j;
}
j = 0;
}
++i;
}
#ifdef DBUS_ENABLE_VERBOSE_MODE
end = clock ();
_dbus_verbose (" created/destroyed %d elements in %g seconds\n",
N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
_dbus_verbose (" mempools\n");
start = clock ();
#endif
pool = _dbus_mem_pool_new (size, FALSE);
i = 0;
j = 0;
while (i < N_ITERATIONS)
{
to_free[j] = _dbus_mem_pool_alloc (pool);
_dbus_assert (to_free[j] != NULL); /* in a real app of course this is wrong */
++j;
if (j == FREE_ARRAY_SIZE)
{
j = 0;
while (j < FREE_ARRAY_SIZE)
{
_dbus_mem_pool_dealloc (pool, to_free[j]);
++j;
}
j = 0;
}
++i;
}
_dbus_mem_pool_free (pool);
#ifdef DBUS_ENABLE_VERBOSE_MODE
end = clock ();
_dbus_verbose (" created/destroyed %d elements in %g seconds\n",
N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
_dbus_verbose (" zeroed malloc\n");
start = clock ();
#endif
i = 0;
j = 0;
while (i < N_ITERATIONS)
{
to_free[j] = dbus_malloc0 (size);
_dbus_assert (to_free[j] != NULL); /* in a real app of course this is wrong */
++j;
if (j == FREE_ARRAY_SIZE)
{
j = 0;
while (j < FREE_ARRAY_SIZE)
{
dbus_free (to_free[j]);
++j;
}
j = 0;
}
++i;
}
#ifdef DBUS_ENABLE_VERBOSE_MODE
end = clock ();
_dbus_verbose (" created/destroyed %d elements in %g seconds\n",
N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
_dbus_verbose (" zeroed mempools\n");
start = clock ();
#endif
pool = _dbus_mem_pool_new (size, TRUE);
i = 0;
j = 0;
while (i < N_ITERATIONS)
{
to_free[j] = _dbus_mem_pool_alloc (pool);
_dbus_assert (to_free[j] != NULL); /* in a real app of course this is wrong */
++j;
if (j == FREE_ARRAY_SIZE)
{
j = 0;
while (j < FREE_ARRAY_SIZE)
{
_dbus_mem_pool_dealloc (pool, to_free[j]);
++j;
}
j = 0;
}
++i;
}
_dbus_mem_pool_free (pool);
#ifdef DBUS_ENABLE_VERBOSE_MODE
end = clock ();
_dbus_verbose (" created/destroyed %d elements in %g seconds\n",
N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
#endif
}
/**
* @ingroup DBusMemPoolInternals
* Unit test for DBusMemPool
* @returns #TRUE on success.
*/
dbus_bool_t
_dbus_mem_pool_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
{
int i;
int element_sizes[] = { 4, 8, 16, 50, 124 };
i = 0;
while (i < _DBUS_N_ELEMENTS (element_sizes))
{
time_for_size (element_sizes[i]);
++i;
}
return TRUE;
}
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
This diff is collapsed.
......@@ -47,6 +47,7 @@ void _dbus_sha_update (DBusSHAContext *context,
const DBusString *data);
dbus_bool_t _dbus_sha_final (DBusSHAContext *context,
DBusString *results);
DBUS_EMBEDDED_TESTS_EXPORT
dbus_bool_t _dbus_sha_compute (const DBusString *data,
DBusString *ascii_output);
......
......@@ -40,24 +40,12 @@
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_marshal_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_mem_pool_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_address_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_sha_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_keyring_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_data_slot_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_userdb_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_memory_test (const char *test_data_dir);
......
......@@ -399,56 +399,3 @@ _dbus_groups_from_uid (dbus_uid_t uid,
return TRUE;
}
/** @} */
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include <stdio.h>
/**
* Unit test for dbus-userdb.c.
*
* @returns #TRUE on success.
*/
dbus_bool_t
_dbus_userdb_test (const char *test_data_dir)
{
const DBusString *username;
const DBusString *homedir;
dbus_uid_t uid;
unsigned long *group_ids;
int n_group_ids, i;
DBusError error;
if (!_dbus_username_from_current_process (&username))
_dbus_test_fatal ("didn't get username");
if (!_dbus_homedir_from_current_process (&homedir))
_dbus_test_fatal ("didn't get homedir");
if (!_dbus_get_user_id (username, &uid))
_dbus_test_fatal ("didn't get uid");
if (!_dbus_groups_from_uid (uid, &group_ids, &n_group_ids))
_dbus_test_fatal ("didn't get groups");
_dbus_test_diag (" Current user: %s homedir: %s gids:",
_dbus_string_get_const_data (username),
_dbus_string_get_const_data (homedir));
for (i=0; i<n_group_ids; i++)
_dbus_test_diag ("- %ld", group_ids[i]);
dbus_error_init (&error);
_dbus_test_diag ("Is Console user: %i",
_dbus_is_console_user (uid, &error));
_dbus_test_diag ("Invocation was OK: %s", error.message ? error.message : "yes");
dbus_error_free (&error);
_dbus_test_diag ("Is Console user 4711: %i",
_dbus_is_console_user (4711, &error));
_dbus_test_diag ("Invocation was OK: %s", error.message ? error.message : "yes");
dbus_error_free (&error);
dbus_free (group_ids);
return TRUE;
}
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
......@@ -116,6 +116,7 @@ if(DBUS_ENABLE_EMBEDDED_TESTS)
set_target_properties(test-message-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
set(SOURCES
internals/address.c
internals/dbus-auth-script.c
internals/dbus-auth-script.h
internals/dbus-auth-util.c
......@@ -126,8 +127,10 @@ if(DBUS_ENABLE_EMBEDDED_TESTS)
internals/dbus-marshal-validate-util.c
internals/dbus-string-util.c
internals/dbus-sysdeps-util.c
internals/mempool.c
internals/misc-internals.c
internals/misc-internals.h
internals/sha.c
)
add_test_executable(test-misc-internals "${SOURCES}" dbus-testutils)
set_target_properties(test-misc-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
......
......@@ -237,6 +237,7 @@ test_message_internals_SOURCES = \
test_message_internals_LDADD = libdbus-testutils.la
test_misc_internals_SOURCES = \
internals/address.c \
internals/dbus-auth-script.c \
internals/dbus-auth-script.h \
internals/dbus-auth-util.c \
......@@ -247,8 +248,10 @@ test_misc_internals_SOURCES = \
internals/dbus-marshal-validate-util.c \
internals/dbus-string-util.c \
internals/dbus-sysdeps-util.c \
internals/mempool.c \
internals/misc-internals.c \
internals/misc-internals.h \
internals/sha.c \
$(NULL)
test_misc_internals_LDADD = libdbus-testutils.la
......
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* dbus-address.c Server address parser.
*
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2004-2006 Red Hat, Inc.
* Copyright (C) 2007 Ralf Habacker
* Copyright (C) 2013 Chengwei Yang / Intel
*
* 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
*
*/
#include <config.h>
#include "misc-internals.h"
#include <stdlib.h>
#include <string.h>
#include <dbus/dbus.h>
#include "dbus/dbus-internals.h"
#include "dbus/dbus-test-tap.h"
typedef struct
{
const char *escaped;
const char *unescaped;
} EscapeTest;
static const EscapeTest escape_tests[] = {
{ "abcde", "abcde" },
{ "", "" },
{ "%20%20", " " },
{ "%24", "$" },
{ "%25", "%" },
{ "abc%24", "abc$" },
{ "%24abc", "$abc" },
{ "abc%24abc", "abc$abc" },
{ "/", "/" },
{ "-", "-" },
{ "_", "_" },
{ "A", "A" },
{ "I", "I" },
{ "Z", "Z" },
{ "a", "a" },
{ "i", "i" },
{ "z", "z" },
/* Bug: https://bugs.freedesktop.org/show_bug.cgi?id=53499 */
{ "%c3%b6", "\xc3\xb6" }
};
static const char* invalid_escaped_values[] = {
"%a",
"%q",
"%az",
"%%",
"%$$",
"abc%a",
"%axyz",
"%",
"$",
" ",
};
dbus_bool_t
_dbus_address_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
{
DBusAddressEntry **entries;
int len;
DBusError error = DBUS_ERROR_INIT;
int i;
i = 0;
while (i < _DBUS_N_ELEMENTS (escape_tests))
{
const EscapeTest *test = &escape_tests[i];
char *escaped;
char *unescaped;
escaped = dbus_address_escape_value (test->unescaped);
if (escaped == NULL)
_dbus_test_fatal ("oom");
if (strcmp (escaped, test->escaped) != 0)
{
_dbus_warn ("Escaped '%s' as '%s' should have been '%s'",
test->unescaped, escaped, test->escaped);
exit (1);
}
dbus_free (escaped);
unescaped = dbus_address_unescape_value (test->escaped, &error);
if (unescaped == NULL)
{
_dbus_warn ("Failed to unescape '%s': %s",
test->escaped, error.message);
dbus_error_free (&error);
exit (1);
}
if (strcmp (unescaped, test->unescaped) != 0)
{
_dbus_warn ("Unescaped '%s' as '%s' should have been '%s'",
test->escaped, unescaped, test->unescaped);
exit (1);
}
dbus_free (unescaped);
++i;
}
i = 0;
while (i < _DBUS_N_ELEMENTS (invalid_escaped_values))
{
char *unescaped;
unescaped = dbus_address_unescape_value (invalid_escaped_values[i],
&error);
if (unescaped != NULL)
{
_dbus_warn ("Should not have successfully unescaped '%s' to '%s'",
invalid_escaped_values[i], unescaped);
dbus_free (unescaped);
exit (1);
}
_dbus_assert (dbus_error_is_set (&error));
dbus_error_free (&error);
++i;
}
if (!dbus_parse_address ("unix:path=/tmp/foo;debug:name=test,sliff=sloff;",
&entries, &len, &error))
_dbus_test_fatal ("could not parse address");
_dbus_assert (len == 2);
_dbus_assert (strcmp (dbus_address_entry_get_value (entries[0], "path"), "/tmp/foo") == 0);
_dbus_assert (strcmp (dbus_address_entry_get_value (entries[1], "name"), "test") == 0);
_dbus_assert (strcmp (dbus_address_entry_get_value (entries[1], "sliff"), "sloff") == 0);
dbus_address_entries_free (entries);
/* Different possible errors */
if (dbus_parse_address ("", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:bar", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:bar,baz", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:bar=foo,baz", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:bar=foo;baz", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");
else
dbus_error_free (&error);
if (dbus_parse_address ("foo:=foo", &entries, &len, &error))
_dbus_test_fatal ("Parsed incorrect address.");