diff --git a/.gitignore b/.gitignore
index 8a8216c..70c0b42 100644
--- a/.gitignore
+++ b/.gitignore
test/ipctest
test/btiotest
test/test-textfile
-test/uuidtest
test/mpris-player
test/sap_client.pyc
test/bluezutils.pyc
unit/test-eir
+unit/test-uuid
tools/btattach
tools/btmgmt
tools/btsnoop
diff --git a/Makefile.am b/Makefile.am
index 34ee442..d4a5601 100644
--- a/Makefile.am
+++ b/Makefile.am
-I$(srcdir)/gdbus -I$(srcdir)/btio
-unit_tests = unit/test-eir
+unit_tests = unit/test-eir unit/test-uuid
unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
+unit_test_uuid_SOURCES = unit/test-uuid.c
+unit_test_uuid_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
+
unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \
unit/test-gobex-transfer unit/test-gobex-apparam
diff --git a/Makefile.tools b/Makefile.tools
index c11fd86..9f6bc5a 100644
--- a/Makefile.tools
+++ b/Makefile.tools
noinst_PROGRAMS += test/gaptest test/sdptest test/scotest test/avtest \
test/lmptest test/bdaddr test/agent \
test/btiotest test/test-textfile \
- test/uuidtest test/mpris-player
+ test/mpris-player
test_hciemu_LDADD = lib/libbluetooth-private.la
test_btiotest_SOURCES = test/btiotest.c btio/btio.h btio/btio.c
test_btiotest_LDADD = @GLIB_LIBS@ lib/libbluetooth-private.la
-test_uuidtest_SOURCES = test/uuidtest.c
-test_uuidtest_LDADD = lib/libbluetooth-private.la
-
test_mpris_player_SOURCES = test/mpris-player.c
test_mpris_player_LDADD = @DBUS_LIBS@ @GLIB_LIBS@
diff --git a/test/uuidtest.c b/test/uuidtest.c
deleted file mode 100644
index a8b46d7..0000000
--- a/test/uuidtest.c
+++ /dev/null
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
-
-const char *base = "00000000-0000-1000-8000-00805F9B34FB";
-
-uint8_t xbase[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
- 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb};
-
-uint16_t sixteen = 0x1234;
-const char *uuidsixteen128 = "00001234-0000-1000-8000-00805F9B34FB";
-const char *uuidsixteen16 = "0x1234";
-const char *uuidsixteen16a = "1234";
-
-uint8_t xuuidsixteen[] = {0x00, 0x00, 0x12, 0x34, 0x00, 0x00, 0x10, 0x00,
- 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb};
-
-uint32_t thirtytwo = 0x12345678;
-const char *uuidthirtytwo32 = "0x12345678";
-const char *uuidthirtytwo32a = "12345678";
-const char *uuidthirtytwo128 = "12345678-0000-1000-8000-00805F9B34FB";
-
-uint8_t xuuidthirtytwo[] = {0x12, 0x34, 0x56, 0x78, 0x00, 0x00, 0x10, 0x00,
- 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb};
-
-const char *malformed[] = {
- "0",
- "01",
- "012",
- "xxxx",
- "xxxxx",
- "0xxxxx",
- "0123456",
- "012g4567",
- "012345678",
- "0x234567u9",
- "01234567890",
- "00001234-0000-1000-8000-00805F9B34F",
- "00001234-0000-1000-8000 00805F9B34FB",
- "00001234-0000-1000-8000-00805F9B34FBC",
- "00001234-0000-1000-800G-00805F9B34FB",
- NULL,
- };
-
-int main(int argc, char *argv[])
-{
- bt_uuid_t u, u2, u3, u4, u5, ub, u128;
- uint128_t n, i;
- char buf[512];
- int s;
-
- memcpy(&n, xbase, 16);
- ntoh128(&n, &i);
-
- if (bt_string_to_uuid(&u, base)) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_string_to_uuid(&ub, base)) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u.type != 128) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (ub.type != 128) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (memcmp(&u.value.u128, &i, 16) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (memcmp(&ub.value.u128, &i, 16) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (memcmp(&ub.value.u128, &u.value.u128, 16) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u, &ub) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- bt_uuid_to_string(&u, buf, sizeof(buf));
- /* printf("%s\n", buf); */
-
- if (strcasecmp(buf, base) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- memcpy(&n, xuuidsixteen, 16);
- ntoh128(&n, &i);
-
- bt_uuid16_create(&u, sixteen);
- bt_uuid_to_uuid128(&u, &u128);
-
- if (bt_string_to_uuid(&u2, uuidsixteen16)) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_string_to_uuid(&u3, uuidsixteen16a)) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_string_to_uuid(&u4, uuidsixteen128)) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- bt_uuid128_create(&u5, i);
-
- if (u.type != 16) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u128.type != 128) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u.value.u16 != sixteen) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u2.type != 16) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u3.type != 16) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u4.type != 128) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u5.type != 128) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u, &u2) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u2, &u3) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u, &u3) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u3, &u4) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u4, &u5) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u5, &u) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u, &ub) == 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u5, &ub) == 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u, &u128) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&ub, &u128) == 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- memcpy(&n, xuuidthirtytwo, 16);
- ntoh128(&n, &i);
-
- bt_uuid32_create(&u, thirtytwo);
- bt_uuid_to_uuid128(&u, &u128);
- bt_string_to_uuid(&u2, uuidthirtytwo32);
- bt_string_to_uuid(&u3, uuidthirtytwo32a);
- bt_string_to_uuid(&u4, uuidthirtytwo128);
- bt_uuid128_create(&u5, i);
-
- /*
- bt_uuid_to_string(&u2, buf, sizeof(buf));
- printf("%s\n", buf);
-
- bt_uuid_to_string(&u3, buf, sizeof(buf));
- printf("%s\n", buf);
-
- bt_uuid_to_string(&u4, buf, sizeof(buf));
- printf("%s\n", buf);
- */
-
- if (u.type != 32) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u128.type != 128) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u.value.u32 != thirtytwo) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u2.type != 32) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u3.type != 32) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u4.type != 128) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (u5.type != 128) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u, &u2) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u2, &u3) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u3, &u4) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u4, &u5) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u5, &u) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u, &ub) == 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u5, &ub) == 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&u, &u128) != 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- if (bt_uuid_cmp(&ub, &u128) == 0) {
- printf("Fail %d\n", __LINE__);
- return 1;
- }
-
- for (s = 0; malformed[s]; ++s) {
- if (bt_string_to_uuid(&u3, malformed[s]) == 0) {
- printf("Fail %s %d\n", malformed[s], __LINE__);
- return 1;
- }
- }
-
- return 0;
-}
diff --git a/unit/test-uuid.c b/unit/test-uuid.c
new file mode 100644
index 0000000..cbccc82
--- /dev/null
+++ b/unit/test-uuid.c
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2011 Intel Corporation
+ *
+ *
+ * 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 <glib.h>
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/uuid.h>
+
+struct uuid_test_data {
+ const char *str;
+ uint16_t val16;
+ uint32_t val32;
+ unsigned char *binary;
+ uint8_t type;
+ const char *str128;
+ unsigned char *binary128;
+};
+
+static unsigned char uuid_base_binary[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
+ 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb };
+
+static struct uuid_test_data uuid_base = {
+ .str = "00000000-0000-1000-8000-00805F9B34FB",
+ .binary = uuid_base_binary,
+ .type = BT_UUID128,
+ .str128 = "00000000-0000-1000-8000-00805F9B34FB",
+ .binary128 = uuid_base_binary,
+};
+
+static unsigned char uuid_sixteen_binary[] = {
+ 0x00, 0x00, 0x12, 0x34, 0x00, 0x00, 0x10, 0x00,
+ 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb };
+
+static struct uuid_test_data uuid_sixteen1 = {
+ .str = "0x1234",
+ .val16 = 0x1234,
+ .type = BT_UUID16,
+ .str128 = "00001234-0000-1000-8000-00805F9B34FB",
+ .binary128 = uuid_sixteen_binary,
+};
+
+static struct uuid_test_data uuid_sixteen2 = {
+ .str = "1234",
+ .val16 = 0x1234,
+ .type = BT_UUID16,
+ .str128 = "00001234-0000-1000-8000-00805F9B34FB",
+ .binary128 = uuid_sixteen_binary,
+};
+
+static unsigned char uuid_32_binary[] = {
+ 0x12, 0x34, 0x56, 0x78, 0x00, 0x00, 0x10, 0x00,
+ 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb };
+
+static struct uuid_test_data uuid_32_1 = {
+ .str = "0x12345678",
+ .val32 = 0x12345678,
+ .type = BT_UUID32,
+ .str128 = "12345678-0000-1000-8000-00805F9B34FB",
+ .binary128 = uuid_32_binary,
+};
+
+static struct uuid_test_data uuid_32_2 = {
+ .str = "12345678",
+ .val32 = 0x12345678,
+ .type = BT_UUID32,
+ .str128 = "12345678-0000-1000-8000-00805F9B34FB",
+ .binary128 = uuid_32_binary,
+};
+
+static void test_uuid(gconstpointer data)
+{
+ const struct uuid_test_data *test_data = data;
+ bt_uuid_t uuid;
+ uint128_t n128, u128;
+
+ g_assert(bt_string_to_uuid(&uuid, test_data->str) == 0);
+ g_assert(uuid.type == test_data->type);
+
+ switch (uuid.type) {
+ case BT_UUID16:
+ g_assert(uuid.value.u16 == test_data->val16);
+ break;
+ case BT_UUID32:
+ g_assert(uuid.value.u32 == test_data->val32);
+ break;
+ case BT_UUID128:
+ memcpy(&n128, test_data->binary, 16);
+ ntoh128(&n128, &u128);
+ g_assert(memcmp(&uuid.value.u128, &u128, 16) == 0);
+ break;
+ default:
+ return;
+ }
+}
+
+static void test_str(gconstpointer data)
+{
+ const struct uuid_test_data *test_data = data;
+ const char *str;
+ char buf[128];
+ bt_uuid_t uuid;
+
+ if (g_str_has_prefix(test_data->str, "0x") == TRUE)
+ str = test_data->str + 2;
+ else
+ str = test_data->str;
+
+ g_assert(bt_string_to_uuid(&uuid, test_data->str) == 0);
+
+ bt_uuid_to_string(&uuid, buf, sizeof(buf));
+ g_assert(strcasecmp(buf, str) == 0);
+
+ switch (test_data->type) {
+ case BT_UUID16:
+ bt_uuid16_create(&uuid, test_data->val16);
+ break;
+ case BT_UUID32:
+ bt_uuid32_create(&uuid, test_data->val32);
+ break;
+ default:
+ return;
+ }
+
+ bt_uuid_to_string(&uuid, buf, sizeof(buf));
+ g_assert(strcasecmp(buf, str) == 0);
+}
+
+static void test_cmp(gconstpointer data)
+{
+ const struct uuid_test_data *test_data = data;
+ bt_uuid_t uuid1, uuid2;
+
+ g_assert(bt_string_to_uuid(&uuid1, test_data->str) == 0);
+ g_assert(bt_string_to_uuid(&uuid2, test_data->str128) == 0);
+
+ g_assert(bt_uuid_cmp(&uuid1, &uuid2) == 0);
+}
+
+static const char *malformed[] = {
+ "0",
+ "01",
+ "012",
+ "xxxx",
+ "xxxxx",
+ "0xxxxx",
+ "0123456",
+ "012g4567",
+ "012345678",
+ "0x234567u9",
+ "01234567890",
+ "00001234-0000-1000-8000-00805F9B34F",
+ "00001234-0000-1000-8000 00805F9B34FB",
+ "00001234-0000-1000-8000-00805F9B34FBC",
+ "00001234-0000-1000-800G-00805F9B34FB",
+ NULL,
+};
+
+static void test_malformed(gconstpointer data)
+{
+ const char *str = data;
+ bt_uuid_t uuid;
+
+ g_assert(bt_string_to_uuid(&uuid, str) != 0);
+}
+
+int main(int argc, char *argv[])
+{
+ int i;
+
+ g_test_init(&argc, &argv, NULL);
+
+ g_test_add_data_func("/uuid/base", &uuid_base, test_uuid);
+ g_test_add_data_func("/uuid/base/str", &uuid_base, test_str);
+ g_test_add_data_func("/uuid/base/cmp", &uuid_base, test_cmp);
+
+ g_test_add_data_func("/uuid/sixteen1", &uuid_sixteen1, test_uuid);
+ g_test_add_data_func("/uuid/sixteen1/str", &uuid_sixteen1, test_str);
+ g_test_add_data_func("/uuid/sixteen1/cmp", &uuid_sixteen1, test_cmp);
+
+ g_test_add_data_func("/uuid/sixteen2", &uuid_sixteen2, test_uuid);
+ g_test_add_data_func("/uuid/sixteen2/str", &uuid_sixteen2, test_str);
+ g_test_add_data_func("/uuid/sixteen2/cmp", &uuid_sixteen2, test_cmp);
+
+ g_test_add_data_func("/uuid/thirtytwo1", &uuid_32_1, test_uuid);
+ g_test_add_data_func("/uuid/thirtytwo1/str", &uuid_32_1, test_str);
+ g_test_add_data_func("/uuid/thirtytwo1/cmp", &uuid_32_1, test_cmp);
+
+ g_test_add_data_func("/uuid/thirtytwo2", &uuid_32_2, test_uuid);
+ g_test_add_data_func("/uuid/thritytwo2/str", &uuid_32_2, test_str);
+ g_test_add_data_func("/uuid/thirtytwo2/cmp", &uuid_32_2, test_cmp);
+
+ for (i = 0; malformed[i]; i++) {
+ char *testpath;
+
+ testpath = g_strdup_printf("/uuid/malformed/%s", malformed[i]);
+ g_test_add_data_func(testpath, malformed[i], test_malformed);
+ g_free(testpath);
+ }
+
+ return g_test_run();
+}