diff --git a/.gitignore b/.gitignore
index ff2d6d4..04c9862 100644
--- a/.gitignore
+++ b/.gitignore
unit/test-uuid
unit/test-textfile
unit/test-gdbus-client
+unit/test-mgmt
tools/mgmt-tester
tools/gap-tester
tools/btattach
diff --git a/Makefile.am b/Makefile.am
index aff19fb..7344d71 100644
--- a/Makefile.am
+++ b/Makefile.am
unit_test_textfile_SOURCES = unit/test-textfile.c src/textfile.h src/textfile.c
unit_test_textfile_LDADD = @GLIB_LIBS@
+unit_tests += unit/test-mgmt
+
+unit_test_mgmt_SOURCES = unit/test-mgmt.c \
+ src/shared/util.h src/shared/util.c \
+ src/shared/mgmt.h src/shared/mgmt.c
+unit_test_mgmt_LDADD = @GLIB_LIBS@
+
unit_tests += unit/test-gdbus-client
unit_test_gdbus_client_SOURCES = $(gdbus_sources) unit/test-gdbus-client.c
diff --git a/unit/test-mgmt.c b/unit/test-mgmt.c
new file mode 100644
index 0000000..2d1a5d6
--- /dev/null
+++ b/unit/test-mgmt.c
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
+ *
+ *
+ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdbool.h>
+#include <unistd.h>
+#include <sys/socket.h>
+
+#include <glib.h>
+
+#include "lib/bluetooth.h"
+#include "lib/mgmt.h"
+
+#include "src/shared/mgmt.h"
+
+struct context {
+ GMainLoop *main_loop;
+ struct mgmt *mgmt_client;
+ guint server_source;
+ GList *handler_list;
+};
+
+enum action {
+ ACTION_PASSED,
+ ACTION_IGNORE,
+};
+
+struct handler {
+ const void *cmd_data;
+ uint16_t cmd_size;
+ bool match_prefix;
+ enum action action;
+};
+
+static void mgmt_debug(const char *str, void *user_data)
+{
+ const char *prefix = user_data;
+
+ g_print("%s%s\n", prefix, str);
+}
+
+static void context_quit(struct context *context)
+{
+ g_main_loop_quit(context->main_loop);
+}
+
+static void check_actions(struct context *context,
+ const void *data, uint16_t size)
+{
+ GList *list;
+
+ for (list = g_list_first(context->handler_list); list;
+ list = g_list_next(list)) {
+ struct handler *handler = list->data;
+
+ if (handler->match_prefix) {
+ if (size < handler->cmd_size)
+ continue;
+ } else {
+ if (size != handler->cmd_size)
+ continue;
+ }
+
+ if (memcmp(data, handler->cmd_data, handler->cmd_size))
+ continue;
+
+ switch (handler->action) {
+ case ACTION_PASSED:
+ context_quit(context);
+ return;
+ case ACTION_IGNORE:
+ return;
+ }
+ }
+
+ g_test_message("Command not handled\n");
+ g_test_fail();
+}
+
+static gboolean server_handler(GIOChannel *channel, GIOCondition cond,
+ gpointer user_data)
+{
+ struct context *context = user_data;
+ unsigned char buf[512];
+ ssize_t result;
+ int fd;
+
+ if (cond & (G_IO_NVAL | G_IO_ERR | G_IO_HUP))
+ return FALSE;
+
+ fd = g_io_channel_unix_get_fd(channel);
+
+ result = read(fd, buf, sizeof(buf));
+ if (result < 0)
+ return FALSE;
+
+ check_actions(context, buf, result);
+
+ return TRUE;
+}
+
+static struct context *create_context(void)
+{
+ struct context *context = g_new0(struct context, 1);
+ GIOChannel *channel;
+ int err, sv[2];
+
+ context->main_loop = g_main_loop_new(NULL, FALSE);
+ g_assert(context->main_loop);
+
+ err = socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sv);
+ g_assert(err == 0);
+
+ channel = g_io_channel_unix_new(sv[0]);
+
+ g_io_channel_set_close_on_unref(channel, TRUE);
+ g_io_channel_set_encoding(channel, NULL, NULL);
+ g_io_channel_set_buffered(channel, FALSE);
+
+ context->server_source = g_io_add_watch(channel,
+ G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+ server_handler, context);
+ g_assert(context->server_source > 0);
+
+ g_io_channel_unref(channel);
+
+ context->mgmt_client = mgmt_new(sv[1]);
+ g_assert(context->mgmt_client);
+
+ if (g_test_verbose() == TRUE)
+ mgmt_set_debug(context->mgmt_client,
+ mgmt_debug, "mgmt: ", NULL);
+
+ mgmt_set_close_on_unref(context->mgmt_client, true);
+
+ return context;
+}
+
+static void execute_context(struct context *context)
+{
+ g_main_loop_run(context->main_loop);
+
+ g_list_free_full(context->handler_list, g_free);
+
+ g_source_remove(context->server_source);
+
+ mgmt_unref(context->mgmt_client);
+
+ g_main_loop_unref(context->main_loop);
+
+ g_free(context);
+}
+
+static void add_action(struct context *context,
+ const void *cmd_data, uint16_t cmd_size,
+ bool match_prefix, enum action action)
+{
+ struct handler *handler = g_new0(struct handler, 1);
+
+ handler->cmd_data = cmd_data;
+ handler->cmd_size = cmd_size;
+ handler->match_prefix = match_prefix;
+ handler->action = action;
+
+ context->handler_list = g_list_append(context->handler_list, handler);
+}
+
+struct command_test_data {
+ uint16_t opcode;
+ uint16_t index;
+ uint16_t length;
+ const void *param;
+ const void *cmd_data;
+ uint16_t cmd_size;
+};
+
+static const unsigned char read_version_command[] =
+ { 0x01, 0x00, 0xff, 0xff, 0x00, 0x00 };
+
+static const struct command_test_data command_test_1 = {
+ .opcode = MGMT_OP_READ_VERSION,
+ .index = MGMT_INDEX_NONE,
+ .cmd_data = read_version_command,
+ .cmd_size = sizeof(read_version_command),
+};
+
+static const unsigned char read_info_command[] =
+ { 0x04, 0x00, 0x00, 0x02, 0x00, 0x00 };
+
+static const struct command_test_data command_test_2 = {
+ .opcode = MGMT_OP_READ_INFO,
+ .index = 512,
+ .cmd_data = read_info_command,
+ .cmd_size = sizeof(read_info_command),
+};
+
+static void test_command(gconstpointer data)
+{
+ const struct command_test_data *test = data;
+ struct context *context = create_context();
+
+ add_action(context, test->cmd_data, test->cmd_size,
+ false, ACTION_PASSED);
+
+ mgmt_send(context->mgmt_client, test->opcode, test->index,
+ test->length, test->param,
+ NULL ,NULL, NULL);
+
+ execute_context(context);
+}
+
+int main(int argc, char *argv[])
+{
+ g_test_init(&argc, &argv, NULL);
+
+ g_test_add_data_func("/mgmt/command/1", &command_test_1, test_command);
+ g_test_add_data_func("/mgmt/command/2", &command_test_2, test_command);
+
+ return g_test_run();
+}